fix: error when loading $:/Import that don't have text and file

tiddly-gittly · Sep 11, 2023 · b342fc7 · b342fc7
1 parent 01d0661
commit b342fc7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/services/BackgroundSyncService/index.ts b/src/services/BackgroundSyncService/index.ts
@@ -155,9 +155,15 @@ export class BackgroundSyncService {
           if ('bag' in fieldsWithoutText) delete fieldsWithoutText.bag;
           if ('revision' in fieldsWithoutText) delete fieldsWithoutText.revision;
 
+          let text;
+          try {
+            text = skinnyTiddlerWithText.text ?? (await fs.readAsStringAsync(getWikiTiddlerPathByTitle(wiki, title)));
+          } catch (error) {
+            console.error(`Failed to load file ${title} in getChangeLogsSinceLastSync ${(error as Error).message}`);
+          }
           const fields = {
             ...fieldsWithoutText,
-            text: skinnyTiddlerWithText.text ?? (await fs.readAsStringAsync(getWikiTiddlerPathByTitle(wiki, title))),
+            text,
           } satisfies ITiddlerFieldsParam;
 
           result.fields = fields;

diff --git a/src/services/WikiStorageService/ignoredTiddler.ts b/src/services/WikiStorageService/ignoredTiddler.ts
@@ -5,7 +5,7 @@
  */
 export const getSyncIgnoredTiddlers = (
   title?: string,
-) => [...((title?.startsWith('Draft of ') || title?.startsWith('$:/temp') || title?.startsWith('$:/state')) ? [title] : []), '$:/StoryList', '$:/layout'];
+) => [...((title?.startsWith('Draft of ') || title?.startsWith('$:/temp') || title?.startsWith('$:/state')) ? [title] : []), '$:/StoryList', '$:/layout', '$:/Import'];
 /**
  * Tiddlers that should save to SQLite as full tiddlers. Like plugins that starts with `$:/`.
  *