fix iCloud files conflict

Files in iCloud will be downloaded at first by clicking New Graph/Re-index/Refresh.

But remember that if your file created on mobile or desktop is not
uploaded to cloud, you will never get your file synced correctly.
So please confirm if the file (with cloud icon at the top right
corner) in File/Finder at first if you failed to see you file's
update.
This commit is contained in:
leizhe
2022-01-05 16:13:27 +08:00
committed by Andelf
parent c7b3bc5fa1
commit 55fdfa6ae9
5 changed files with 38 additions and 12 deletions

View File

@@ -721,7 +721,9 @@
(config/get-file-extension format))
file-path (str "/" path)
repo-dir (config/get-repo-dir repo)]
(p/let [file-exists? (fs/file-exists? repo-dir file-path)
(p/let [_ (when (mobile-util/native-ios?)
(.downloadFilesFromiCloud mobile-util/download-icloud-files))
file-exists? (fs/file-exists? repo-dir file-path)
file-content (when file-exists?
(fs/read-file repo-dir file-path))]
(when (and (db/page-empty? repo today-page)