clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-24 14:14:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: pages starting with "@" fail to import from markdown

Browse Source 
related to https://github.com/logseq/db-test/issues/680
This commit is contained in:
Tienson Qin
2025-12-24 22:30:10 +08:00
parent a97fec165f
commit b2497c0cc5
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
deps/graph-parser/src/logseq/graph_parser/exporter.cljs vendored
View File

@@ -892,14 +892,15 @@
;; {:url ["Complex" {:protocol "zotero", :link "select/library/items/6VCW9QFJ"}], :label [["Plain" "Dechow and Struppa - 2015 - Intertwingled.pdf"]], :full_text "[Dechow and Struppa - 2015 - Intertwingled.pdf](zotero://select/library/items/6VCW9QFJ)", :metadata ""}
(defn- get-zotero-local-pdf-path
[config m]
(let [link (:link (second (:url m)))
label (second (first (:label m)))
id (last (string/split link #"/"))]
(when (and link id label)
(when-let [zotero-data-dir (get-in config [:zotero/settings-v2 "default" :zotero-data-directory])]
{:link (str "zotero://" link)
:path (node-path/join zotero-data-dir "storage" id label)
:base label}))))
(when (= "zotero" (:protocol (second (:url m))))
(let [link (:link (second (:url m)))
label (second (first (:label m)))
id (last (string/split link #"/"))]
(when (and link id label)
(when-let [zotero-data-dir (get-in config [:zotero/settings-v2 "default" :zotero-data-directory])]
{:link (str "zotero://" link)
:path (node-path/join zotero-data-dir "storage" id label)
:base label})))))
(defn- walk-ast-blocks
"Walks each ast block in order to its full depth. Saves multiple ast types for
@@ -1048,10 +1049,11 @@
"Given an asset's relative or full path, create a unique name for identifying an asset.
Must handle to paths as ../assets/*, assets/* and with subdirectories"
[path]
(or (re-find #"assets/.*$" path)
;; pdf outside logseq graphs
(when (string/ends-with? path ".pdf")
path)))
(when (string? path)
(or (re-find #"assets/.*$" path)
;; pdf outside logseq graphs
(when (string/ends-with? path ".pdf")
path))))
(defn- update-asset-links-in-block-title [block-title asset-name-to-uuids ignored-assets]
(reduce (fn [acc [asset-name asset-uuid]]
@@ -1213,11 +1215,13 @@
(p/let [asset-maps* (p/all (map
(fn [asset-link]
(p/let [path* (-> asset-link second :url second)
zotero-asset? (when (map? path*)
(= "zotero" (:protocol (second (:url (second asset-link))))))
{:keys [path link base]} (if (map? path*)
(get-zotero-local-pdf-path user-config (second asset-link))
{:path path*})
asset-name (-> path asset-path->name)
asset-link-or-name (or link (-> path asset-path->name))
asset-name (some-> path asset-path->name)
asset-link-or-name (or link (some-> path asset-path->name))
asset-data* (when asset-link-or-name (get @assets asset-link-or-name))
_ (when (and asset-link-or-name
(not asset-data*)
@@ -1261,7 +1265,7 @@
(swap! assets assoc-in [asset-link-or-name :asset-created?] true)
{:asset-name-uuid [asset-link-or-name (:block/uuid new-asset)]
:asset-tx asset-tx}))
(do
(when-not zotero-asset? ; no need to report warning for zotero managed pdf files
(swap! ignored-assets conj
{:reason "No asset data found for this asset path"
:path (-> asset-link second :url second)

2
src/main/frontend/components/imports.cljs
View File

@@ -363,7 +363,7 @@
bytes-array (js/Uint8Array. buffer)
checksum (db-asset/<get-file-array-buffer-checksum buffer)
asset-id (d/squuid)
asset-name (gp-exporter/asset-path->name (:path file))
asset-name (some-> (:path file) gp-exporter/asset-path->name)
assets-dir (path/path-join repo-dir common-config/local-assets-dir)
asset-type (db-asset/asset-path->type (:path file))
{:keys [with-edn-content pdf-annotation?]} (buffer-handler bytes-array)]