Răsfoiți Sursa

Fix electron code breaking db deps again

Introduced by last commit /cc @rcmerci. This has happened previously at
0c533a9032af28242a8a7e49289d7b0f813d4fb8 and
8a1c54173b40e6ce9b40e25d1397206077f5fc19. Please run `yarn test` in
deps/db to catch this
Gabriel Horner 2 ani în urmă
părinte
comite
84b80e8b76

+ 0 - 5
deps/db/src/logseq/db/sqlite/db.cljs

@@ -12,11 +12,6 @@
 ;; Reference same sqlite default class in cljs + nbb without needing .cljc
 (def sqlite (if (find-ns 'nbb.core) (aget sqlite3 "default") sqlite3))
 
-(defn get-graphs-dir
-  []
-  (let [path (.getPath ^object app "home")]
-    (node-path/join path "logseq" "graphs")))
-
 (defn close!
   []
   (when @databases

+ 2 - 3
deps/db/src/logseq/db/sqlite/rtc.cljs

@@ -17,9 +17,8 @@
     (.run ^object init-stmt (clj->js (ds-op->sqlite-op {:local-tx 0})))))
 
 (defn init!
-  [repo]
-  (let [graphs-dir (sqlite-db/get-graphs-dir)
-        [_db-sanitized-name db-full-path] (sqlite-db/get-db-full-path graphs-dir repo)
+  [graphs-dir repo]
+  (let [[_db-sanitized-name db-full-path] (sqlite-db/get-db-full-path graphs-dir repo)
         db (new sqlite-db/sqlite db-full-path nil)]
     (create-op-table! db repo)))
 

+ 6 - 1
src/electron/electron/db.cljs

@@ -4,10 +4,15 @@
             ["fs-extra" :as fs]
             ["electron" :refer [app]]
             [electron.logger :as logger]
-            [logseq.db.sqlite.db :as sqlite-db :refer [get-graphs-dir]]))
+            [logseq.db.sqlite.db :as sqlite-db]))
 
 (def close! sqlite-db/close!)
 
+(defn get-graphs-dir
+  []
+  (let [path (.getPath ^object app "home")]
+    (node-path/join path "logseq" "graphs")))
+
 (defn ensure-graphs-dir!
   []
   (fs/ensureDirSync (get-graphs-dir)))

+ 2 - 1
src/electron/electron/rtc_handler.cljs

@@ -1,10 +1,11 @@
 (ns electron.rtc-handler
   (:require [electron.handler-interface :refer [handle]]
+            [electron.db :as db]
             [cljs.reader :as reader]
             [logseq.db.sqlite.rtc :as sqlite-rtc]))
 
 (defmethod handle :rtc/init [_window [_ repo]]
-  (sqlite-rtc/init! repo))
+  (sqlite-rtc/init! (db/get-graphs-dir) repo))
 
 (defmethod handle :rtc/add-ops [_window [_ repo data-str]]
   (let [ops (reader/read-string data-str)]