소스 검색

Remove no longer needed backup/broken-config.edn

Users can no longer create broken configs in the app and are warned
if they do so outside of the app
Gabriel Horner 2 년 전
부모
커밋
2889c2e998

+ 1 - 1
src/electron/electron/utils.cljs

@@ -202,7 +202,7 @@
      (some #(string/includes? path (str "/" % "/"))
            ["." ".recycle" "node_modules" "logseq/bak" "version-files"])
      (some #(string/ends-with? path %)
-           [".DS_Store" "logseq/graphs-txid.edn" "logseq/broken-config.edn"])
+           [".DS_Store" "logseq/graphs-txid.edn"])
      ;; hidden directory or file
      (let [relpath (path/relative dir path)]
        (or (re-find #"/\.[^.]+" relpath)

+ 3 - 9
src/main/frontend/handler/config.cljs

@@ -5,24 +5,18 @@
             [frontend.handler.repo-config :as repo-config-handler]
             [frontend.config :as config]
             [frontend.db :as db]
-            [borkdude.rewrite-edn :as rewrite]
-            [lambdaisland.glogi :as log]))
+            [borkdude.rewrite-edn :as rewrite]))
 
 (defn parse-repo-config
   "Parse repo configuration file content"
   [content]
-  (try
-    (rewrite/parse-string content)
-    (catch :default e
-      (log/error :parse/config-failed e)
-      (state/pub-event! [:backup/broken-config (state/get-current-repo) content])
-      (rewrite/parse-string config/config-default-content))))
+  (rewrite/parse-string content))
 
 (defn- repo-config-set-key-value
   [path k v]
   (when-let [repo (state/get-current-repo)]
     (when-let [content (db/get-file path)]
-      (repo-config-handler/read-repo-config repo content)
+      (repo-config-handler/read-repo-config content)
       (let [result (parse-repo-config content)
             ks (if (vector? k) k [k])
             new-result (rewrite/assoc-in result ks v)

+ 0 - 12
src/main/frontend/handler/events.cljs

@@ -604,18 +604,6 @@
      (plugin/perf-tip-content (.-id o) (.-name opts) (.-url opts))
      :warning false (.-id o))))
 
-(defmethod handle :backup/broken-config [[_ repo content]]
-  (when (and repo content)
-    (let [path (config/get-repo-config-path)
-          broken-path (string/replace path "/config.edn" "/broken-config.edn")]
-      (p/let [_ (fs/write-file! repo (config/get-repo-dir repo) broken-path content {})
-              _ (file-handler/alter-file repo path config/config-default-content {:skip-compare? true})]
-        (notification/show!
-         [:p.content
-          "It seems that your config.edn is broken. We've restored it with the default content and saved the previous content to the file logseq/broken-config.edn."]
-         :warning
-         false)))))
-
 (defmethod handle :mobile-file-watcher/changed [[_ ^js event]]
   (let [type (.-event event)
         payload (-> event

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

@@ -261,7 +261,7 @@
   (state/set-parsing-state! {:graph-loading? true})
   (let [config (or (when-let [content (some-> (first (filter #(= (config/get-repo-config-path repo-url) (:file/path %)) nfs-files))
                                               :file/content)]
-                     (repo-config-handler/read-repo-config repo-url content))
+                     (repo-config-handler/read-repo-config content))
                    (state/get-config repo-url))
         ;; NOTE: Use config while parsing. Make sure it's the current journal title format
         _ (state/set-config! repo-url config)

+ 5 - 11
src/main/frontend/handler/repo_config.cljs

@@ -6,11 +6,10 @@
   (:require [frontend.db :as db]
             [frontend.config :as config]
             [frontend.state :as state]
-            [frontend.handler.common :as common-handler]
             [frontend.handler.common.file :as file-common-handler]
-            [cljs.reader :as reader]
             [frontend.fs :as fs]
             [promesa.core :as p]
+            [clojure.edn :as edn]
             [frontend.spec :as spec]))
 
 (defn- get-repo-config-content
@@ -18,19 +17,14 @@
   (db/get-file repo-url (config/get-repo-config-path)))
 
 (defn read-repo-config
-  "Converts file content to edn and handles read failure by backing up file and
-  reverting to a default file"
-  [repo content]
-  (common-handler/safe-read-string
-   content
-   (fn [_e]
-     (state/pub-event! [:backup/broken-config repo content])
-     (reader/read-string config/config-default-content))))
+  "Converts file content to edn"
+  [content]
+  (edn/read-string content))
 
 (defn set-repo-config-state!
   "Sets repo config state using given file content"
   [repo-url content]
-  (let [config (read-repo-config repo-url content)]
+  (let [config (read-repo-config content)]
     (state/set-config! repo-url config)
     config))
 

+ 1 - 1
src/main/frontend/util/fs.cljs

@@ -32,7 +32,7 @@
                                        (str "/" % "/")
                                        (str % "/"))) ignores)
        (some #(string/ends-with? path %)
-             [".DS_Store" "logseq/graphs-txid.edn" "logseq/broken-config.edn"])
+             [".DS_Store" "logseq/graphs-txid.edn"])
       ;; hidden directory or file
        (let [relpath (path/relative dir path)]
          (or (re-find #"/\.[^.]+" relpath)