mirror of
https://github.com/logseq/logseq.git
synced 2026-04-27 23:54:55 +00:00
Merge configs and create global config file if not present
- Cleanup repo and global config with system components - test merging - fix edge cases
This commit is contained in:
@@ -2,16 +2,13 @@
|
||||
(:require [cljs-bean.core :as bean]
|
||||
[cljs.reader :as reader]
|
||||
[clojure.string :as string]
|
||||
[frontend.config :as config]
|
||||
[frontend.date :as date]
|
||||
[frontend.db :as db]
|
||||
[frontend.state :as state]
|
||||
[frontend.util :as util]
|
||||
[frontend.util.property :as property]
|
||||
[goog.object :as gobj]
|
||||
["ignore" :as Ignore]
|
||||
[lambdaisland.glogi :as log]
|
||||
[borkdude.rewrite-edn :as rewrite]))
|
||||
[lambdaisland.glogi :as log]))
|
||||
|
||||
(defn copy-to-clipboard-without-id-property!
|
||||
[format raw-text html]
|
||||
@@ -50,15 +47,6 @@
|
||||
(hidden? path patterns))) files)
|
||||
files))
|
||||
|
||||
;; TODO: Rename to get-repo-config-content
|
||||
(defn get-config
|
||||
[repo-url]
|
||||
(db/get-file repo-url (config/get-config-path)))
|
||||
|
||||
(defn get-global-config-content
|
||||
[repo-url]
|
||||
(db/get-file repo-url (config/get-global-config-path)))
|
||||
|
||||
(defn safe-read-string
|
||||
[content error-message-or-handler]
|
||||
(try
|
||||
@@ -70,26 +58,6 @@
|
||||
(println error-message-or-handler))
|
||||
{})))
|
||||
|
||||
(defn read-config
|
||||
[content]
|
||||
(safe-read-string content
|
||||
(fn [_e]
|
||||
(state/pub-event! [:backup/broken-config (state/get-current-repo) content])
|
||||
(reader/read-string config/config-default-content))))
|
||||
|
||||
(defn reset-config!
|
||||
[repo-url content]
|
||||
(when-let [content (or content (get-config repo-url))]
|
||||
(let [config (read-config content)]
|
||||
(state/set-config! repo-url config)
|
||||
config)))
|
||||
|
||||
(defn reset-global-config!
|
||||
[content]
|
||||
(let [config (reader/read-string content)]
|
||||
(state/set-global-config! config)
|
||||
config))
|
||||
|
||||
(defn read-metadata!
|
||||
[content]
|
||||
(try
|
||||
@@ -129,16 +97,6 @@
|
||||
(let [position [(gobj/get e "clientX") (gobj/get e "clientY")]]
|
||||
(state/show-custom-context-menu! context-menu-content position)))
|
||||
|
||||
(defn parse-config
|
||||
"Parse configuration from file `content` such as from config.edn."
|
||||
[content]
|
||||
(try
|
||||
(rewrite/parse-string content)
|
||||
(catch :default e
|
||||
(log/error :parse/config-failed e)
|
||||
(state/pub-event! [:backup/broken-config (state/get-current-repo) content])
|
||||
(rewrite/parse-string config/config-default-content))))
|
||||
|
||||
(defn listen-to-scroll!
|
||||
[element]
|
||||
(let [*scroll-timer (atom nil)]
|
||||
|
||||
Reference in New Issue
Block a user