feat(diff): Diff files download to local and persist mock folder.

Author: walkthunder

.github/workflows/release.yml

@@ -5,6 +5,7 @@ import ConflictDiffView from './conflict_diff_view';
 import { TDiffType } from './abstract_diff_view';
 import type InvioPlugin from '../main';
 import { diff_match_patch } from './effective_diff.js';
+import { log } from '../moreOnLog'
 
 export * from './abstract_diff_view';
 
@@ -21,20 +22,23 @@ export function openDiffModal(app: App, plugin: InvioPlugin, file: TFile, remote
   }
 }
 
-
-export async function getRemoteFileDiff(vault: Vault, filePath: string, remoteMD: string) {
+// For local files not exist or invalid, always return diff: true
+export async function isRemoteFileDiff(vault: Vault, filePath: string, remoteMD: string) {
+    const localExist = await vault.adapter.exists(filePath)
+    if (!localExist) {
+      log.info(`file ${filePath} not existed locally`)
+      return true;
+    }
     const file = vault.getAbstractFileByPath(filePath)
     if (!(file instanceof TFile)) {
-      new Notice('Not valid file');
-      return;
+      log.info(`file ${filePath} not a valid file`)
+      return true;
     }
     const localContent = await vault.adapter.readBinary(filePath).then(buf => new TextDecoder().decode(buf));
-    console.log('updated local contents: ', filePath, localContent);
     const dmp: any = new diff_match_patch();
     const uDiff = dmp.diff_main(localContent, remoteMD);
     dmp.diff_cleanupSemantic(uDiff);
 
     const diff = (uDiff?.filter((item: any) => item[0] !== 0)).length > 0
-    console.log('diff result: ', diff, uDiff);
     return !!diff;
   }

src/diff/index.ts

@@ -56,7 +56,7 @@ import { isInsideObsFolder, ObsConfigDirFileType } from "./obsFolderLister";
 import { Utils } from './utils/utils';
 import { Path } from './utils/path';
 import { log } from "./moreOnLog";
-import { getRemoteFileDiff } from './diff/index';
+import { isRemoteFileDiff } from './diff/index';
 
 export const RemoteSrcPrefix = 'op-remote-source-raw/'
 export const RemoteAttPrefix = 'op-remote-attach-p/'
@@ -443,14 +443,30 @@ export const pruneTouchedFiles = async (vault: Vault, client: RemoteClient, list
       if (!remoteMD) {
         return;
       }
-      const diff = await getRemoteFileDiff(vault, item.key, remoteMD.data);
+      const diff = await isRemoteFileDiff(vault, item.key, remoteMD.data);
       if (!diff) {
-        log.info('file contents diff nothing', attr, item)
+        log.info('file contents diff nothing', attr, item.key)
         list[attr] = null;
         delete list[attr];
         return attr;
       }
       return;
+    } else if (item.decision === 'downloadRemoteToLocal') {
+      const remoteMD = await fetchRemoteFileMD(
+        item.key,
+        client,
+        vault,
+      ).catch(err => {
+        log.info('remote empty ', err);
+        return null;
+      })
+      log.info('remote md: ', remoteMD);
+      if (!remoteMD || !(await isRemoteFileDiff(vault, item.key, remoteMD.data))) {
+        log.info('file contents diff nothing', attr, item.key)
+        list[attr] = null;
+        delete list[attr];
+        return attr;
+      }
     }
   })
   const result = await Promise.all(promises);

src/sync.ts

@@ -10,7 +10,7 @@ import { AppHostServerUrl } from './remoteForS3';
 import { loadGA } from './ga';
 import type InvioPlugin from './main';
 import { DEFAULT_DIR, DEFAULT_FILE_URL } from './settings';
-import { mkdirpInVault } from './misc'
+import { log } from './moreOnLog'
 
 const logger = console;
 logger.info = console.log;
@@ -84,38 +84,37 @@ const gotoMainSite = () => {
 }
 
 const mockLocaleFile = async (plugin:InvioPlugin) => {
-    let defaultFolder = DEFAULT_DIR
-    const existed = await plugin.app.vault.adapter.exists(defaultFolder)
-    if (existed) {
-        defaultFolder += `_${Math.random().toFixed(4).slice(2)}`
-    }
-    plugin.app.vault.adapter.mkdir(defaultFolder)
-    .then(() => {
+    try {
+        const defaultFolder = DEFAULT_DIR
+        const existed = await plugin.app.vault.adapter.exists(defaultFolder)
+        if (!existed) {
+            await plugin.app.vault.adapter.mkdir(defaultFolder)
+        }
         plugin.settings.localWatchDir = defaultFolder
-        return plugin.saveSettings()
-    })
-    .then(() => {
+        await plugin.saveSettings()
         plugin.ga.trace('boot_project', {
             dirname: plugin.settings.localWatchDir
         });
-        plugin.switchWorkingDir(plugin.settings.localWatchDir);
-    })
-    .then(async () => {
-      // Add a new file
-      const arrayBuffer = await requestUrl({
-        url: DEFAULT_FILE_URL
-      }).then(resp => resp.arrayBuffer)
-      return plugin.app.vault.adapter.writeBinary(`${defaultFolder}/Introduction.md`, arrayBuffer)
-    })
-    .then(async () => {
-        const created = await plugin.app.vault.adapter.exists(`${defaultFolder}/Introduction.md`);
-        if (created) {
-            let parentNode: any = document.querySelector(`[data-path="${defaultFolder}"]`);
-            parentNode?.click();
-            let node: any = document.querySelector(`[data-path="${defaultFolder}/Introduction.md"]`);
-            node?.click();
-        }
-    })
+        await plugin.switchWorkingDir(plugin.settings.localWatchDir)
+        
+        const arrayBuffer = await requestUrl({
+            url: DEFAULT_FILE_URL
+        }).then(resp => resp.arrayBuffer)
+        
+        const introFilePath = `${defaultFolder}/Introduction.md`
+        await plugin.app.vault.adapter.exists(introFilePath)
+        .then(existed => {
+            if (!existed) {
+                return plugin.app.vault.adapter.writeBinary(introFilePath, arrayBuffer)
+            }
+        })
+        let parentNode: any = document.querySelector(`[data-path="${defaultFolder}"]`);
+        parentNode?.click();
+        let node: any = document.querySelector(`[data-path="${introFilePath}"]`);
+        node?.click();
+    } catch (error) {
+        log.error('create mock folder failed: ', error);
+    }
 }
 const Utils = {
     md5Hash,