Procházet zdrojové kódy

chore: remove unnecessary file content compare

Tienson Qin před 1 rokem
rodič
revize
a12fbfefc8
2 změnil soubory, kde provedl 28 přidání a 49 odebrání
  1. 15 26
      src/main/frontend/fs/capacitor_fs.cljs
  2. 13 23
      src/main/frontend/fs/node.cljs

+ 15 - 26
src/main/frontend/fs/capacitor_fs.cljs

@@ -231,34 +231,23 @@
                              "")
               disk-content (or disk-content "")
               repo-dir (config/get-local-dir repo)
-              ext (util/get-file-ext rpath)
               db-content (or old-content (db/get-file repo rpath) "")
               contents-matched? (contents-matched? disk-content db-content)]
-        (cond
-          (and
-           (not= stat :not-found)   ; file on the disk was deleted
-           (not contents-matched?)
-           (not (contains? #{"excalidraw" "edn" "css"} ext))
-           (not (string/includes? fpath "/.recycle/")))
-          (p/let [disk-content disk-content]
-            (state/pub-event! [:file/not-matched-from-disk rpath disk-content content]))
-
-          :else
-          (->
-           (p/let [result (<write-file-with-utf8 fpath content)
-                   mtime (-> (js->clj stat :keywordize-keys true)
-                             :mtime)]
-             (when-not contents-matched?
-               (backup-file repo-dir :backup-dir fpath disk-content))
-             (db/set-file-last-modified-at! repo rpath mtime)
-             (db/set-file-content! repo rpath content)
-             (when ok-handler
-               (ok-handler repo fpath result))
-             result)
-           (p/catch (fn [error]
-                      (if error-handler
-                        (error-handler error)
-                        (log/error :write-file-failed error))))))))))
+        (->
+         (p/let [result (<write-file-with-utf8 fpath content)
+                 mtime (-> (js->clj stat :keywordize-keys true)
+                           :mtime)]
+           (when-not contents-matched?
+             (backup-file repo-dir :backup-dir fpath disk-content))
+           (db/set-file-last-modified-at! repo rpath mtime)
+           (db/set-file-content! repo rpath content)
+           (when ok-handler
+             (ok-handler repo fpath result))
+           result)
+         (p/catch (fn [error]
+                    (if error-handler
+                      (error-handler error)
+                      (log/error :write-file-failed error)))))))))
 
 (defn ios-force-include-private
   "iOS sometimes return paths without the private part."

+ 13 - 23
src/main/frontend/fs/node.cljs

@@ -38,31 +38,21 @@
                                             (js/console.error error)
                                             nil))))
               disk-content (or disk-content "")
-              ext (string/lower-case (util/get-file-ext rpath))
               db-content (or old-content (db/get-file repo rpath) "")
               contents-matched? (contents-matched? disk-content db-content)]
-        (cond
-          (and
-           (not= stat :not-found)         ; file on the disk was deleted
-           (not contents-matched?)
-           (not (contains? #{"excalidraw" "edn" "css"} ext))
-           (not (string/includes? rpath "/.recycle/")))
-          (state/pub-event! [:file/not-matched-from-disk rpath disk-content content])
-
-          :else
-          (->
-           (p/let [result (ipc/ipc "writeFile" repo file-fpath content)
-                   mtime (gobj/get result "mtime")]
-             (when-not contents-matched?
-               (ipc/ipc "backupDbFile" (config/get-local-dir repo) rpath disk-content content))
-             (when-not skip-transact? (db/set-file-last-modified-at! repo rpath mtime))
-             (when ok-handler
-               (ok-handler repo rpath result))
-             result)
-           (p/catch (fn [error]
-                      (if error-handler
-                        (error-handler error)
-                        (log/error :write-file-failed error))))))))))
+        (->
+         (p/let [result (ipc/ipc "writeFile" repo file-fpath content)
+                 mtime (gobj/get result "mtime")]
+           (when-not contents-matched?
+             (ipc/ipc "backupDbFile" (config/get-local-dir repo) rpath disk-content content))
+           (when-not skip-transact? (db/set-file-last-modified-at! repo rpath mtime))
+           (when ok-handler
+             (ok-handler repo rpath result))
+           result)
+         (p/catch (fn [error]
+                    (if error-handler
+                      (error-handler error)
+                      (log/error :write-file-failed error)))))))))
 
 (defn- open-dir
   "Open a new directory"