refactor(sync): start-sync loop

Bad3r · Sep 7, 2023 · c346116 · c346116
1 parent 0e4e42a
commit c346116
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/main/frontend/fs/sync.cljs b/src/main/frontend/fs/sync.cljs
@@ -3384,10 +3384,21 @@
   "Avoid running multiple sync instances simultaneously."
   (atom false))
 
+(defn- <should-start-sync?
+  []
+  (go
+    (and (state/enable-sync?)
+         @network-online-cursor     ;; is online
+         (user/has-refresh-token?)  ;; has refresh token, should bring up sync
+         (or (= ::stop (:state (state/get-file-sync-state))) ;; state=stopped
+             (nil? (state/get-file-sync-state)))  ;; the whole sync state not inited yet, happens when app starts without network
+         (<! (p->c (persist-var/-load graphs-txid))))))  ;; not a sync graph))
+
 (defn <sync-start
   []
   (go
-    (when-not @*sync-starting
+    (when (and (not @*sync-starting)
+               (<! (<should-start-sync?)))
       (reset! *sync-starting true)
       (if-not (and (state/enable-sync?)
                    (or (nil? (state/get-file-sync-state))
@@ -3508,11 +3519,7 @@
 ;; try to re-start sync when state=stopped every 1min
 (go-loop []
   (<! (timeout 60000))
-  (when (and (state/enable-sync?)
-             @network-online-cursor  ;; is online
-             (user/has-refresh-token?)  ;; has refresh token, user should be logged in
-             (or (= ::stop (:state (state/get-file-sync-state))) ;; state=stopped
-                 (nil? (state/get-file-sync-state)))) ;; the whole sync state not inited yet, happens when app starts without network
+  (when (<! (<should-start-sync?))
     (println "trying to restart sync..." (tc/to-string (t/now)))
     (<sync-start))
   (recur))