Переглянути джерело

fix(regression): paths of file graph exports

markdown + opml exports had zipped files several
directories deep because they used the full path of the graph
Gabriel Horner 6 місяців тому
батько
коміт
aa45b3fa6c

+ 6 - 5
src/main/frontend/handler/export/opml.cljs

@@ -15,6 +15,7 @@
             [frontend.util :as util :refer [concatv mapcatv removev]]
             [goog.dom :as gdom]
             [hiccups.runtime :as h]
+            [logseq.common.path :as path]
             [promesa.core :as p]))
 
 ;;; *opml-state*
@@ -462,13 +463,13 @@
   [repo]
   (p/let [files (common/<get-file-contents repo "opml")]
     (when (seq files)
-      (let [repo (-> repo
-                     (string/replace config/db-version-prefix "")
-                     (string/replace config/local-db-prefix ""))
+      (let [repo' (if (config/db-based-graph? repo)
+                    (string/replace repo config/db-version-prefix "")
+                    (path/basename repo))
             files (->> (export-files-as-opml files nil)
                        (clojure.core/remove nil?))
-            zip-file-name (str repo "_opml_" (quot (util/time-ms) 1000))]
-        (p/let [zipfile (zip/make-zip zip-file-name files repo)]
+            zip-file-name (str repo' "_opml_" (quot (util/time-ms) 1000))]
+        (p/let [zipfile (zip/make-zip zip-file-name files repo')]
           (when-let [anchor (gdom/getElement "export-as-opml")]
             (.setAttribute anchor "href" (js/window.URL.createObjectURL zipfile))
             (.setAttribute anchor "download" (.-name zipfile))

+ 6 - 5
src/main/frontend/handler/export/text.cljs

@@ -11,6 +11,7 @@
               simple-asts->string space]]
             [frontend.util :as util :refer [concatv mapcatv removev]]
             [goog.dom :as gdom]
+            [logseq.common.path :as path]
             [logseq.db :as ldb]
             [logseq.graph-parser.schema.mldoc :as mldoc-schema]
             [malli.core :as m]
@@ -547,11 +548,11 @@
   (p/let [files (util/profile :get-file-content (common/<get-file-contents repo "md"))]
     (when (seq files)
       (let [files (export-files-as-markdown files nil)
-            repo (-> repo
-                     (string/replace config/db-version-prefix "")
-                     (string/replace config/local-db-prefix ""))
-            zip-file-name (str repo "_markdown_" (quot (util/time-ms) 1000))]
-        (p/let [zipfile (zip/make-zip zip-file-name files repo)]
+            repo' (if (config/db-based-graph? repo)
+                    (string/replace repo config/db-version-prefix "")
+                    (path/basename repo))
+            zip-file-name (str repo' "_markdown_" (quot (util/time-ms) 1000))]
+        (p/let [zipfile (zip/make-zip zip-file-name files repo')]
           (when-let [anchor (gdom/getElement "export-as-markdown")]
             (.setAttribute anchor "href" (js/window.URL.createObjectURL zipfile))
             (.setAttribute anchor "download" (.-name zipfile))