greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Temporal fix to catch missing journal file

pull/645/head
Tienson Qin 2020-08-29 01:39:24 +08:00
parent 1951431de1
commit 1787e52dda
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/src/main/frontend/handler.cljs
View File

@ -44,6 +44,7 @@
(file-handler/restore-config! repo false)
(when (and (state/logged?)
(not (db/get-today-journal repo)))
;; FIXME: check journal file exists
(repo-handler/read-repair-journals! repo)))))
(p/then
(fn []

43
web/src/main/frontend/handler/repo.cljs
View File

@ -545,23 +545,28 @@
(defn read-repair-journals!
[repo-url]
(let [repo-dir (util/get-repo-dir repo-url)
format (state/get-preferred-format)]
;; add missing dates if monthly basis
(if (= :monthly (state/get-journal-basis))
(let [path (date/current-journal-path format)
content (or (db/get-file repo-url path) "")]
(let [lines (set (string/split content #"\n"))
default-content (default-month-journal-content format)
default-lines (string/split default-content #"\n")
missing-dates (remove (fn [line] (contains? lines line)) default-lines)
missing-dates-content (if (seq missing-dates)
(string/join "\n" missing-dates))
content (str content "\n" missing-dates-content)]
(db/reset-file! repo-url path content)
(ui-handler/re-render-root!)
(git-handler/git-add repo-url path)))
(try
(let [repo-dir (util/get-repo-dir repo-url)
format (state/get-preferred-format)]
;; add missing dates if monthly basis
(if (= :monthly (state/get-journal-basis))
(let [path (date/current-journal-path format)
content (or (db/get-file repo-url path) "")]
(let [lines (set (string/split content #"\n"))
default-content (default-month-journal-content format)
default-lines (string/split default-content #"\n")
missing-dates (remove (fn [line] (contains? lines line)) default-lines)
missing-dates-content (if (seq missing-dates)
(string/join "\n" missing-dates))
content (str content "\n" missing-dates-content)]
;; daily basis, create the specific day journal file
;; (create-today-journal-if-not-exists repo-url)
)))
;; TODO: check whether file exists
(db/reset-file! repo-url path content)
(ui-handler/re-render-root!)
(git-handler/git-add repo-url path)))
;; daily basis, create the specific day journal file
;; (create-today-journal-if-not-exists repo-url)
))
(catch js/Error e
(prn e))))