瀏覽代碼

fix: get default journal directory

Weihua Lu 4 年之前
父節點
當前提交
93ba737f84

+ 1 - 1
src/main/frontend/handler/external.cljs

@@ -21,7 +21,7 @@
                            journal? (date/valid-journal-title? title)]
                        (when-let [text (:text file)]
                          (let [path (str (if journal?
-                                           (config/default-journals-directory)
+                                           (config/get-journals-directory)
                                            (config/get-pages-directory))
                                          "/"
                                          (if journal?

+ 1 - 1
src/main/frontend/handler/page.cljs

@@ -33,7 +33,7 @@
 (defn- get-directory
   [journal?]
   (if journal?
-    (config/default-journals-directory)
+    (config/get-journals-directory)
     (config/get-pages-directory)))
 
 (defn- get-file-name

+ 2 - 2
src/main/frontend/handler/repo.cljs

@@ -110,7 +110,7 @@
 
                      :else
                      default-content)
-           path (str (config/default-journals-directory) "/" file-name "."
+           path (str (config/get-journals-directory) "/" file-name "."
                      (config/get-file-extension format))
            file-path (str "/" path)
            page-exists? (db/entity repo-url [:block/name (string/lower-case title)])
@@ -118,7 +118,7 @@
        (when (or empty-blocks?
                  (not page-exists?))
          (p/let [_ (nfs/check-directory-permission! repo-url)
-                 _ (fs/mkdir-if-not-exists (str repo-dir "/" (config/default-journals-directory)))
+                 _ (fs/mkdir-if-not-exists (str repo-dir "/" (config/get-journals-directory)))
                  file-exists? (fs/file-exists? repo-dir file-path)]
            (when-not file-exists?
              (file-handler/reset-file! repo-url path content)

+ 2 - 2
src/main/frontend/handler/web/nfs.cljs

@@ -136,8 +136,8 @@
                                                          (let [last-part (last (string/split path "/"))]
                                                            (contains? #{config/app-name
                                                                         config/default-draw-directory
-                                                                        (config/default-journals-directory)
-                                                                        (config/default-pages-directory)}
+                                                                        (config/get-journals-directory)
+                                                                        (config/get-pages-directory)}
                                                                       last-part)))))
                                               (into {})))))
 

+ 1 - 1
src/main/frontend/modules/file/core.cljs

@@ -109,7 +109,7 @@
           journal-page? (date/valid-journal-title? title)
           path (str
                 (if journal-page?
-                  (config/default-journals-directory)
+                  (config/get-journals-directory)
                   (config/get-pages-directory))
                 "/"
                 (if journal-page?