From bd57a6ceb8cc81d39f8efc456a9bbe566034fea5 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Tue, 25 May 2021 16:21:38 +0800 Subject: [PATCH] fix: converter choke on filters --- src/main/frontend/format/mldoc.cljs | 2 +- src/main/frontend/handler/file.cljs | 3 ++- src/main/frontend/handler/page.cljs | 7 +++++-- src/main/frontend/handler/web/nfs.cljs | 6 ++++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/frontend/format/mldoc.cljs b/src/main/frontend/format/mldoc.cljs index 0052f2f9e4..5ecdb772d9 100644 --- a/src/main/frontend/format/mldoc.cljs +++ b/src/main/frontend/format/mldoc.cljs @@ -129,7 +129,7 @@ properties-ast (map (fn [[k v]] (let [k (keyword (string/lower-case k)) - v (if (contains? #{:title :description :roam_tags} k) + v (if (contains? #{:title :description :filters :roam_tags} k) v (text/split-page-refs-without-brackets v true))] [k v]))) diff --git a/src/main/frontend/handler/file.cljs b/src/main/frontend/handler/file.cljs index 7e9f964df9..b1b3a1de98 100644 --- a/src/main/frontend/handler/file.cljs +++ b/src/main/frontend/handler/file.cljs @@ -115,7 +115,8 @@ :file/content content})] (ok-handler file-contents)))) (p/catch (fn [error] - (log/error :load-files-error error)))))) + (log/error :nfs/load-files-error repo-url) + (log/error :exception error)))))) (defn reset-file! [repo-url file content] diff --git a/src/main/frontend/handler/page.cljs b/src/main/frontend/handler/page.cljs index 599f145708..5ed633dfae 100644 --- a/src/main/frontend/handler/page.cljs +++ b/src/main/frontend/handler/page.cljs @@ -394,8 +394,11 @@ (defn get-filters [page-name] - (let [properties (db/get-page-properties page-name)] - (reader/read-string (get properties :filters "{}")))) + (let [properties (db/get-page-properties page-name) + properties-str (get properties :filters "{}")] + (try (reader/read-string properties-str) + (catch js/Error e + (log/error :syntax/filters e))))) (defn save-filter! [page-name filter-state] diff --git a/src/main/frontend/handler/web/nfs.cljs b/src/main/frontend/handler/web/nfs.cljs index f71bd44cc6..c99879a9d7 100644 --- a/src/main/frontend/handler/web/nfs.cljs +++ b/src/main/frontend/handler/web/nfs.cljs @@ -164,7 +164,8 @@ (when (util/electron?) (fs/watch-dir! dir-name))))) (p/catch (fn [error] - (log/error :nfs/load-files-error error))))) + (log/error :nfs/load-files-error repo) + (log/error :exception error))))) (p/catch (fn [error] (if (contains? #{"AbortError" "Error"} (gobj/get error "name")) (state/set-loading-files! false) @@ -278,7 +279,8 @@ (set-files! @path-handles))] (handle-diffs! repo nfs? old-files new-files handle-path path-handles re-index?)))) (p/catch (fn [error] - (log/error :nfs/load-files-error error))) + (log/error :nfs/load-files-error repo) + (log/error :exception error))) (p/finally (fn [_] (state/set-graph-syncing? false))))))))