clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-04 10:56:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(electron): fix relative asset path from current page file path

Browse Source
This commit is contained in:
charlie
2021-02-08 16:36:08 +08:00
committed by Tienson Qin
parent 4875e5b367
commit 3981224616
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/frontend/handler/editor.cljs
View File

@@ -1565,14 +1565,14 @@
(if (util/electron?)
(let [from (.-path file)]
(p/then (js/window.apis.copyFileToAssets dir filename from)
#(p/resolved [filename (if (string? %) (js/File. #js[] %) file)])))
#(p/resolved [filename (if (string? %) (js/File. #js[] %) file) (.join util/node-path dir filename)])))
(p/then (fs/write-file! repo dir filename (.stream file) nil)
#(p/resolved [filename file]))))))))
(defonce *assets-url-cache (atom {}))
(defn make-asset-url
[path] ;; path start with "/assets" or compatible for "../assets"
[path] ;; path start with "/assets" or compatible for "../assets"
(let [repo-dir (config/get-repo-dir (state/get-current-repo))
path (string/replace path "../" "/")]
(if (util/electron?)
@@ -1622,11 +1622,11 @@
(-> (save-assets! block repo (js->clj files))
(p/then
(fn [res]
(when-let [[url file] (and (seq res) (first res))]
(let [image? (util/ext-of-image? url)]
(when-let [[asset-file-name file full-file-path] (and (seq res) (first res))]
(let [image? (util/ext-of-image? asset-file-name)]
(insert-command!
id
(get-asset-file-link format (resolve-relative-path url)
(get-asset-file-link format (resolve-relative-path (or full-file-path asset-file-name))
(if file (.-name file) (if image? "image" "asset"))
image?)
format