fix: export zip file

src/main/frontend/handler/export.cljs

@@ -18,8 +18,8 @@
    [lambdaisland.glogi :as log]
    [promesa.core :as p]
    [frontend.persist-db :as persist-db]
-   [frontend.persist-db.browser :as db-browser]
-   [cljs-bean.core :as bean])
+   [cljs-bean.core :as bean]
+   [frontend.handler.export.common :as export-common-handler])
   (:import
    [goog.string StringBuffer]))
 
@@ -48,21 +48,12 @@
           (.setAttribute anchor "download" "index.html")
           (.click anchor))))))
 
-(defn- <get-all-page->content
-  [repo]
-  (when-let [^object worker @db-browser/*worker]
-    (.get-all-page->content worker repo)))
-
 (defn export-repo-as-zip!
   [repo]
-  (p/let [page->content (<get-all-page->content repo)
+  (p/let [files (export-common-handler/<get-file-contents repo)
           [owner repo-name] (util/get-git-owner-and-repo repo)
           repo-name (str owner "-" repo-name)
-          files (map (fn [[title content]]
-                       [(str title "." (if (= :org (state/get-preferred-format))
-                                         "org"
-                                         "md"))
-                        content]) page->content)]
+          files (map (fn [{:keys [path content]}] [path content]) files)]
     (when (seq files)
       (p/let [zipfile (zip/make-zip repo-name files repo)]
         (when-let [anchor (gdom/getElement "download")]
@@ -106,14 +97,9 @@
        x))
    vec-tree))
 
-(defn- <get-all-pages
-  [repo]
-  (when-let [^object worker @db-browser/*worker]
-    (.get-all-pages worker repo)))
-
 (defn- <build-blocks
   [repo]
-  (p/let [pages (<get-all-pages repo)]
+  (p/let [pages (export-common-handler/<get-all-pages repo)]
     {:version 1
      :blocks
      (nested-select-keys pages
@@ -197,7 +183,7 @@
 ;; https://roamresearch.com/#/app/help/page/Nxz8u0vXU
 ;; export to roam json according to above spec
 (defn- <roam-data [repo]
-  (p/let [pages (<get-all-pages repo)]
+  (p/let [pages (export-common-handler/<get-all-pages repo)]
     (let [non-empty-pages (remove #(empty? (:block/children %)) pages)]
       (roam-export/traverse
        [:page/title

src/main/frontend/handler/export/common.cljs

@@ -11,12 +11,12 @@
             [frontend.modules.outliner.tree :as outliner-tree]
             [frontend.state :as state]
             [frontend.util :as util :refer [concatv mapcatv removev]]
-            [logseq.common.util :as common-util]
-            [frontend.handler.property.util :as pu]
             [malli.core :as m]
             [malli.util :as mu]
-            [frontend.db.async :as db-async]
-            [promesa.core :as p]))
+            [promesa.core :as p]
+            [frontend.persist-db.browser :as db-browser]
+            [cljs-bean.core :as bean]
+            [frontend.worker.export :as worker-export]))
 
 ;;; TODO: split frontend.handler.export.text related states
 (def ^:dynamic *state*
@@ -90,20 +90,30 @@
                (mapv remove-block-ast-pos
                      (mldoc/->edn content format))))))
 
-(defn get-page-content
+(defn <get-page-content
   ([page-name]
-   (get-page-content (state/get-current-repo) page-name))
+   (<get-page-content (state/get-current-repo) page-name))
   ([repo page-name]
-   (when-let [page-uuid (pu/get-page-uuid page-name)]
-     (get-blocks-contents repo page-uuid :init-level 0))))
+   (when-let [^object worker @db-browser/*worker]
+     (.block->content worker repo page-name nil
+                      (pr-str {:export-bullet-indentation (state/get-export-bullet-indentation)})))))
+
+(defn get-page-content
+  [page-name]
+  (let [repo (state/get-current-repo)
+        db (db/get-db repo)]
+    (worker-export/block->content repo db page-name
+                                  nil
+                                  {:export-bullet-indentation (state/get-export-bullet-indentation)})))
 
 (defn- page-name->ast
   [page-name]
   (when-let [content (get-page-content page-name)]
-    (let [format :markdown]
-      (removev Properties-block-ast?
-               (mapv remove-block-ast-pos
-                     (mldoc/->edn content format))))))
+    (when content
+      (let [format :markdown]
+        (removev Properties-block-ast?
+                 (mapv remove-block-ast-pos
+                       (mldoc/->edn content format)))))))
 
 (defn- update-level-in-block-ast-coll
   [block-ast-coll origin-level]
@@ -180,33 +190,27 @@
                  ast-content)))
            inline-coll)))
 
-(defn- <get-file-contents
+(defn <get-all-pages
   [repo]
-  (db-async/<q repo '[:find ?pn ?fp ?fc
-                      :where
-                      [?e :block/original-name ?pn]
-                      [?e :block/file ?f]
-                      [?f :file/path ?fp]
-                      [?f :file/content ?fc]]))
-
-(defn- <get-md-file-contents
+  (when-let [^object worker @db-browser/*worker]
+    (p/let [result (.get-all-pages worker repo)]
+      (bean/->clj result))))
+
+(defn <get-all-page->content
   [repo]
-  (p/let [result (<get-file-contents repo)]
-    (filterv (fn [[path _]]
-               (let [path (string/lower-case path)]
-                 (re-find #"\.(?:md|markdown)$" path)))
-             result)))
+  (when-let [^object worker @db-browser/*worker]
+    (p/let [result (.get-all-page->content worker repo)]
+      (bean/->clj result))))
 
-(defn <get-file-contents-with-suffix
+(defn <get-file-contents
   [repo]
-  (p/let [md-files (<get-md-file-contents repo)]
-    (->>
-     md-files
-     (mapv (fn [[page-title path content]]
-             {:path path
-              :content content
-              :title page-title
-              :format (common-util/get-format path)})))))
+  (p/let [page->content (<get-all-page->content repo)]
+    (clojure.core/map (fn [[page-title content]]
+                        {:path (str page-title ".md")
+                         :content content
+                         :title page-title
+                         :format :markdown})
+                      page->content)))
 
 ;;; utils (ends)
 

src/main/frontend/handler/export/opml.cljs

@@ -446,7 +446,7 @@
          format (or (:block/format first-block) (state/get-preferred-format))]
      (export-helper content format options :title title))))
 
-(defn export-files-as-opml
+(defn- export-files-as-opml
   "options see also `export-blocks-as-opml`"
   [files options]
   (mapv
@@ -458,7 +458,7 @@
 
 (defn export-repo-as-opml!
   [repo]
-  (p/let [files (common/<get-file-contents-with-suffix repo)]
+  (p/let [files (common/<get-file-contents repo)]
     (when (seq files)
       (let [files (export-files-as-opml files nil)
             zip-file-name (str repo "_opml_" (quot (util/time-ms) 1000))]

src/main/frontend/handler/export/text.cljs

@@ -504,7 +504,7 @@
 (defn export-repo-as-markdown!
   "TODO: indent-style and remove-options"
   [repo]
-  (p/let [files (util/profile :get-file-content (common/<get-file-contents-with-suffix repo))]
+  (p/let [files (util/profile :get-file-content (common/<get-file-contents repo))]
     (when (seq files)
       (let [files (export-files-as-markdown files nil)
             zip-file-name (str repo "_markdown_" (quot (util/time-ms) 1000))]