From 097554719e893e22a43ec5c74ee0531ae5e8610a Mon Sep 17 00:00:00 2001 From: Gabriel Horner Date: Mon, 27 Nov 2023 12:27:25 -0500 Subject: [PATCH] fix: open another db graph url when in a db graph --- src/electron/electron/utils.cljs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/electron/electron/utils.cljs b/src/electron/electron/utils.cljs index f22a2713bf..b8b4467999 100644 --- a/src/electron/electron/utils.cljs +++ b/src/electron/electron/utils.cljs @@ -6,7 +6,9 @@ [clojure.string :as string] [electron.configs :as cfgs] [electron.logger :as logger] + [logseq.db.sqlite.util :as sqlite-util] [cljs-bean.core :as bean] + [electron.db :as db] [promesa.core :as p])) (defonce *win (atom nil)) ;; The main window @@ -250,13 +252,17 @@ (defn get-graph-dir "required by all internal state in the electron section" [graph-name] - (when (string/includes? graph-name "logseq_local_") - (string/replace-first graph-name "logseq_local_" ""))) + (cond (string/starts-with? graph-name sqlite-util/db-version-prefix) + (node-path/join (db/get-graphs-dir) (string/replace-first graph-name sqlite-util/db-version-prefix "")) + (string/includes? graph-name "logseq_local_") + (string/replace-first graph-name "logseq_local_" ""))) (defn get-graph-name - "reversing `get-graph-dir`" + "Reverse `get-graph-dir`" [graph-dir] - (str "logseq_local_" graph-dir)) + (if (= (db/get-graphs-dir) (node-path/dirname graph-dir)) + (str sqlite-util/db-version-prefix (node-path/basename graph-dir)) + (str "logseq_local_" graph-dir))) (defn decode-protected-assets-schema-path [schema-path]