clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-23 20:24:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename :block/original-name to :block/title

Browse Source
This commit is contained in:
Tienson Qin
2024-07-10 21:29:39 +08:00
parent 2a48486ac1
commit a1f352773b
105 changed files with 559 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/src/logseq/tasks/db_graph/create_graph_with_large_sizes.cljs
View File

@@ -25,7 +25,7 @@
(map-indexed
(fn [idx id]
{:block/uuid id
:block/original-name (str "Page-" (+ start-idx idx))})
:block/title (str "Page-" (+ start-idx idx))})
ids)))
(defn build-blocks
@@ -69,7 +69,7 @@
conn (outliner-cli/init-conn dir db-name {:classpath (cp/get-classpath)})
_ (println "Building tx ...")
{:keys [init-tx]} (outliner-cli/build-blocks-tx (create-init-data options))]
(println "Built" (count init-tx) "tx," (count (filter :block/original-name init-tx)) "pages and"
(println "Built" (count init-tx) "tx," (count (filter :block/title init-tx)) "pages and"
(count (filter :block/content init-tx)) "blocks ...")
;; Vary the chunking with page size up to a max to avoid OOM
(let [tx-chunks (partition-all (min (:pages options) 30000) init-tx)]
@@ -77,7 +77,7 @@
chunk-num 1]
(when-let [chunk (first chunks)]
(println "Transacting chunk" chunk-num "of" (count tx-chunks)
"starting with block:" (pr-str (select-keys (first chunk) [:block/content :block/original-name])))
"starting with block:" (pr-str (select-keys (first chunk) [:block/content :block/title])))
(d/transact! conn chunk)
(recur (rest chunks) (inc chunk-num)))))
#_(d/transact! conn blocks-tx)

52
scripts/src/logseq/tasks/db_graph/create_graph_with_properties.cljs
View File

@@ -53,7 +53,7 @@
two-days-ago (subtract-days today 2)
closed-values-config (build-closed-values-config {:dates [today yesterday two-days-ago]})
page-values-tx (mapv #(hash-map :page
{:block/uuid (:uuid %) :block/original-name (:value %)})
{:block/uuid (:uuid %) :block/title (:value %)})
(:page-closed closed-values-config))
;; Stores random closed values for use with queries
closed-values (atom {})
@@ -69,9 +69,9 @@
page-values-tx
;; Objects
[{:page {:block/original-name "Page object"
[{:page {:block/title "Page object"
:build/tags [:TestClass]}}
{:page {:block/original-name "Blocks"}
{:page {:block/title "Blocks"}
:blocks
[{:block/content "block object"
:block/uuid object-uuid
@@ -88,7 +88,7 @@
{:page {:build/journal (date-time-util/date->int two-days-ago)}}
;; Block property blocks and queries
{:page {:block/original-name "Block Properties"}
{:page {:block/title "Block Properties"}
:blocks
[{:block/content "default property block" :build/properties {:default "haha"}}
{:block/content "default property block" :build/properties {:default-many #{"yee" "haw" "sir"}}}
@@ -110,7 +110,7 @@
{:block/content "date-many property block" :build/properties {:date-many #{[:page (date-journal-title today)]
[:page (date-journal-title yesterday)]}}}
#_{:block/content "date-closed property block" :build/properties {:date-closed (random-closed-value :date-closed)}}]}
{:page {:block/original-name "Block Property Queries"}
{:page {:block/title "Block Property Queries"}
:blocks
[{:block/content "{{query (property :default \"haha\")}}"}
{:block/content "{{query (property :default-many \"haw\")}}"}
@@ -132,26 +132,26 @@
#_{:block/content (str "{{query (property :date-closed " (page-ref/->page-ref (string/capitalize (get-closed-value :date-closed))) ")}}")}]}
;; Page property pages and queries
{:page {:block/original-name "default page" :build/properties {:default "yolo"}}}
{:page {:block/original-name "default-many page" :build/properties {:default-many #{"yee" "haw" "sir"}}}}
{:page {:block/original-name "default-closed page" :build/properties {:default-closed (random-closed-value :default-closed)}}}
{:page {:block/original-name "url page" :build/properties {:url "https://logseq.com"}}}
{:page {:block/original-name "url-many page" :build/properties {:url-many #{"https://logseq.com" "https://docs.logseq.com"}}}}
{:page {:block/original-name "url-closed page" :build/properties {:url-closed (random-closed-value :url-closed)}}}
{:page {:block/original-name "checkbox page" :build/properties {:checkbox true}}}
{:page {:block/original-name "number page" :build/properties {:number 5}}}
{:page {:block/original-name "number-many page" :build/properties {:number-many #{5 10}}}}
{:page {:block/original-name "number-closed page" :build/properties {:number-closed (random-closed-value :number-closed)}}}
{:page {:block/original-name "object page" :build/properties {:object [:block/uuid object-uuid]}}}
{:page {:block/original-name "object-many page" :build/properties {:object-many #{[:block/uuid object-uuid] [:page "Page object"]}}}}
{:page {:block/original-name "page page" :build/properties {:page [:page "Page 1"]}}}
{:page {:block/original-name "page-many page" :build/properties {:page-many #{[:page "Page 1"] [:page "Page 2"]}}}}
;; #_{:page {:block/original-name "page-closed page" :build/properties {:page-closed (random-closed-value :page-closed)}}}
{:page {:block/original-name "date page" :build/properties {:date [:page (date-journal-title today)]}}}
{:page {:block/original-name "date-many page" :build/properties {:date-many #{[:page (date-journal-title today)]
{:page {:block/title "default page" :build/properties {:default "yolo"}}}
{:page {:block/title "default-many page" :build/properties {:default-many #{"yee" "haw" "sir"}}}}
{:page {:block/title "default-closed page" :build/properties {:default-closed (random-closed-value :default-closed)}}}
{:page {:block/title "url page" :build/properties {:url "https://logseq.com"}}}
{:page {:block/title "url-many page" :build/properties {:url-many #{"https://logseq.com" "https://docs.logseq.com"}}}}
{:page {:block/title "url-closed page" :build/properties {:url-closed (random-closed-value :url-closed)}}}
{:page {:block/title "checkbox page" :build/properties {:checkbox true}}}
{:page {:block/title "number page" :build/properties {:number 5}}}
{:page {:block/title "number-many page" :build/properties {:number-many #{5 10}}}}
{:page {:block/title "number-closed page" :build/properties {:number-closed (random-closed-value :number-closed)}}}
{:page {:block/title "object page" :build/properties {:object [:block/uuid object-uuid]}}}
{:page {:block/title "object-many page" :build/properties {:object-many #{[:block/uuid object-uuid] [:page "Page object"]}}}}
{:page {:block/title "page page" :build/properties {:page [:page "Page 1"]}}}
{:page {:block/title "page-many page" :build/properties {:page-many #{[:page "Page 1"] [:page "Page 2"]}}}}
;; #_{:page {:block/title "page-closed page" :build/properties {:page-closed (random-closed-value :page-closed)}}}
{:page {:block/title "date page" :build/properties {:date [:page (date-journal-title today)]}}}
{:page {:block/title "date-many page" :build/properties {:date-many #{[:page (date-journal-title today)]
[:page (date-journal-title yesterday)]}}}}
#_{:page {:block/original-name "date-closed page" :build/properties {:date-closed (random-closed-value :date-closed)}}}
{:page {:block/original-name "Page Property Queries"}
#_{:page {:block/title "date-closed page" :build/properties {:date-closed (random-closed-value :date-closed)}}}
{:page {:block/title "Page Property Queries"}
:blocks
[{:block/content "{{query (page-property :default \"yolo\")}}"}
{:block/content "{{query (page-property :default-many \"haw\")}}"}
@@ -212,8 +212,8 @@
conn (outliner-cli/init-conn dir db-name {:additional-config (:config options)
:classpath (cp/get-classpath)})
{:keys [init-tx block-props-tx]} (outliner-cli/build-blocks-tx (create-init-data))
existing-names (set (map :v (d/datoms @conn :avet :block/original-name)))
conflicting-names (set/intersection existing-names (set (keep :block/original-name init-tx)))]
existing-names (set (map :v (d/datoms @conn :avet :block/title)))
conflicting-names (set/intersection existing-names (set (keep :block/title init-tx)))]
(when (seq conflicting-names)
(println "Error: Following names conflict -" (string/join "," conflicting-names))
(js/process.exit 1))

22
scripts/src/logseq/tasks/db_graph/create_graph_with_schema_org.cljs
View File

@@ -63,7 +63,7 @@
inverted-renamed-classes (set/map-invert renamed-classes)
class-name (strip-schema-prefix (class-m "@id"))
url (str "https://schema.org/" (get inverted-renamed-classes class-name class-name))]
(cond-> {:block/original-name class-name
(cond-> {:block/title class-name
:build/properties (cond-> {:url url}
(class-m "rdfs:comment")
(assoc :description (get-comment-string (class-m "rdfs:comment") renamed-pages)))}
@@ -241,7 +241,7 @@
(->class-page % class-to-properties options)))
(into {}))]
(assert (= ["Thing"] (keep #(when-not (:build/class-parent %)
(:block/original-name %))
(:block/title %))
(vals classes)))
"Thing is the only class that doesn't have a schema.org parent class")
classes))
@@ -355,10 +355,10 @@
(defn- write-debug-file [db]
(let [ents (remove #(db-malli-schema/internal-ident? (:db/ident %))
(d/q '[:find [(pull ?b [*
{:class/schema.properties [:block/original-name]}
{:property/schema.classes [:block/original-name]}
{:class/parent [:block/original-name]}
{:block/refs [:block/original-name]}]) ...]
{:class/schema.properties [:block/title]}
{:property/schema.classes [:block/title]}
{:class/parent [:block/title]}
{:block/refs [:block/title]}]) ...]
:in $
:where [?b :db/ident ?ident]]
db))]
@@ -367,7 +367,7 @@
(->> ents
(map (fn [m]
(let [props (db-property/properties m)]
(cond-> (select-keys m [:block/name :block/type :block/original-name :block/schema :db/ident
(cond-> (select-keys m [:block/name :block/type :block/title :block/schema :db/ident
:class/schema.properties :class/parent
:db/cardinality :property/schema.classes :block/refs])
(seq props)
@@ -377,13 +377,13 @@
(db-property/property-value-content (d/entity db (:db/id v)))
v)))))
(seq (:class/schema.properties m))
(update :class/schema.properties #(set (map :block/original-name %)))
(update :class/schema.properties #(set (map :block/title %)))
(some? (:class/parent m))
(update :class/parent :block/original-name)
(update :class/parent :block/title)
(seq (:property/schema.classes m))
(update :property/schema.classes #(set (map :block/original-name %)))
(update :property/schema.classes #(set (map :block/title %)))
(seq (:block/refs m))
(update :block/refs #(set (map :block/original-name %)))))))
(update :block/refs #(set (map :block/title %)))))))
set)))))
(defn -main [args]