소스 검색

refactor(frontend): remove utils

defclass 5 년 전
부모
커밋
f837d391a0
4개의 변경된 파일21개의 추가작업 그리고 25개의 파일을 삭제
  1. 18 1
      src/main/frontend/handler/common.cljs
  2. 2 2
      src/main/frontend/handler/file.cljs
  3. 1 1
      src/main/frontend/handler/repo.cljs
  4. 0 21
      src/main/frontend/handler/utils.cljs

+ 18 - 1
src/main/frontend/handler/common.cljs

@@ -7,7 +7,8 @@
             [frontend.text :as text]
             [frontend.git :as git]
             [frontend.db :as db]
-            [lambdaisland.glogi :as log]))
+            [lambdaisland.glogi :as log]
+            [cljs.reader :as reader]))
 
 (defn get-ref
   [repo-url]
@@ -64,3 +65,19 @@
                 :remote-oid remote-oid
                 :diffs diffs})))
   )
+
+(defn get-config
+  [repo-url]
+  (db/get-file repo-url (str config/app-name "/" config/config-file)))
+
+(defn reset-config!
+  [repo-url content]
+  (when-let [content (or content (get-config repo-url))]
+    (let [config (try
+                   (reader/read-string content)
+                   (catch js/Error e
+                     (println "Parsing config file failed: ")
+                     (js/console.dir e)
+                     {}))]
+      (state/set-config! repo-url config)
+      config)))

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

@@ -80,10 +80,10 @@
    (restore-config! repo-url nil project-changed-check?))
   ([repo-url config-content project-changed-check?]
    (let [config-content (if config-content config-content
-                            (h-utils/get-config repo-url))]
+                            (common-handler/get-config repo-url))]
      (when config-content
        (let [old-project (:project (state/get-config))
-             new-config (h-utils/reset-config! repo-url config-content)]
+             new-config (common-handler/reset-config! repo-url config-content)]
          (when (and (not (config/local-db? repo-url))
                     project-changed-check?)
            (let [new-project (:project new-config)

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

@@ -62,7 +62,7 @@
                               (db/get-file repo-url path))
                 content (or old-content default-content)]
             (file-handler/reset-file! repo-url path content)
-            (h-utils/reset-config! repo-url content)
+            (common-handler/reset-config! repo-url content)
             (when-not (= content old-content)
               (git-handler/git-add repo-url path))))))))
 

+ 0 - 21
src/main/frontend/handler/utils.cljs

@@ -1,21 +0,0 @@
-(ns frontend.handler.utils
-  (:require [frontend.state :as state]
-            [cljs.reader :as reader]
-            [frontend.config :as config]
-            [frontend.db :as db]))
-
-(defn get-config
-  [repo-url]
-  (db/get-file repo-url (str config/app-name "/" config/config-file)))
-
-(defn reset-config!
-  [repo-url content]
-  (when-let [content (or content (get-config repo-url))]
-    (let [config (try
-                   (reader/read-string content)
-                   (catch js/Error e
-                     (println "Parsing config file failed: ")
-                     (js/console.dir e)
-                     {}))]
-      (state/set-config! repo-url config)
-      config)))