feat(diff): Diff view

Author: walkthunder

src/components/PendingStatsView.tsx

@@ -17,10 +17,8 @@ import { CheckSettingsModal } from './CheckSettingsModal';
 export const PendingStatsViewComponent = (props: { plugin: InvioPlugin }) => {
     const { record, toLocalSelected, toRemoteSelected, getToLocalFileList, getToRemoteFileList, updateSelectedToLocalFileList, updateSelectedToRemoteFileList } = useStore();
     const toLocalTouched = getToLocalFileList();
-    console.log('toLocaltouched - ', toLocalTouched)
 
     const toRemoteTouched = getToRemoteFileList();
-    console.log('toRemoteTouched - ', toRemoteTouched)
 
     const treeToLocalData: DataNode[] = toLocalTouched?.map((item: any) => {
         item.title = item.key
@@ -34,9 +32,14 @@ export const PendingStatsViewComponent = (props: { plugin: InvioPlugin }) => {
     })
 
     const onSelect = (selectedKeys: any, info: any, type: `ToLocal` | `ToRemote`) => {
-        console.log('selected', selectedKeys, info);
         const key = selectedKeys[0]
         props.plugin.viewFileDiff(key, type === 'ToLocal' ? 'RemoteToLocal' : 'LocalToRemote')
+        .then(file => {
+            log.info('diff file changed - ', file);
+            if (file) {
+                props.plugin.pendingView()
+            }
+          })
         setTimeout(() => {
             selectedKeys = []
         }, 300)
@@ -51,22 +54,18 @@ export const PendingStatsViewComponent = (props: { plugin: InvioPlugin }) => {
     }
 
     const onToLocalCheck: TreeProps['onCheck'] = (checkedKeys: string[], info: any) => {
-        console.log('onLocalCheck', checkedKeys, info);
         updateSelectedToLocalFileList(checkedKeys.filter(key => toLocalTouched.find(t => t.key === key)))
     };
 
     const onToRemoteCheck: TreeProps['onCheck'] = (checkedKeys: string[], info: any) => {
-        console.log('onToRemoteCheck', checkedKeys, info);
         updateSelectedToRemoteFileList(checkedKeys.filter(key => toRemoteTouched.find(t => t.key === key)))
     };
 
     const startSync = async () => {
-        console.log('start syncing...', [...toLocalSelected, ...toRemoteSelected])
         await props.plugin.syncRun('manual', [...toLocalSelected, ...toRemoteSelected])
     }
 
     const openSettings = () => {
-        console.log('open settings');
         const modal = new CheckSettingsModal(props.plugin.app, props.plugin);
         modal.open();
     }

src/diff/abstract_diff_view.ts

@@ -8,7 +8,12 @@ import type { LangType, LangTypeAndAuto, TransItemType } from "../i18n";
 
 type TviewOutputFormat = `side-by-side` | `line-by-line`
 export type TDiffType = `LocalToRemote` | `RemoteToLocal` | `Conflict`
-
+export interface IRemoteFile {
+    data: string;
+    ts: number;
+    path: string;
+	deleted?: boolean;
+}
 export default abstract class DiffView extends Modal {
 	plugin: InvioPlugin;
 	app: App;
@@ -161,8 +166,12 @@ export default abstract class DiffView extends Modal {
 		return this.plugin.i18n.t(x, vars);
 	}
 
-	public async changeFileAndCloseModal(contents: string) {
-		await this.app.vault.modify(this.file, contents);
+	public async changeFileAndCloseModal(contents: string, deleted?: boolean) {
+		if (deleted) {
+			await this.app.vault.adapter.trashLocal(this.file.path);
+		} else {
+			await this.app.vault.modify(this.file, contents);
+		}
 		this.fileChangedHook && this.fileChangedHook(this.file);
 		this.silentClose = true
 

src/diff/conflict_diff_view.ts

@@ -9,13 +9,13 @@ import {
 import type InvioPlugin from '../main';
 import type { recResult, vRecoveryItem } from './interfaces';
 import { FILE_REC_WARNING } from './constants';
-import DiffView, { TDiffType } from './abstract_diff_view';
+import DiffView, { IRemoteFile } from './abstract_diff_view';
 import { Diff2HtmlConfig, html } from 'diff2html';
 export default class ConflictDiffView extends DiffView {
-	remote: recResult
+	remote: IRemoteFile
 	versions: recResult[];
 	rightVList: vRecoveryItem[];
-	constructor(plugin: InvioPlugin, app: App, file: TFile, remoteFile: recResult, fileChangedHook: (f: TFile) => void, cancelHook: () => void) {
+	constructor(plugin: InvioPlugin, app: App, file: TFile, remoteFile: IRemoteFile, fileChangedHook: (f: TFile) => void, cancelHook: () => void) {
 		super(plugin, app, file, fileChangedHook, cancelHook);
 		this.versions = [];
 		this.rightVList = [];
@@ -52,6 +52,7 @@ export default class ConflictDiffView extends DiffView {
 								<table class="d2h-diff-table">
 									<tbody class="d2h-diff-tbody">
 									{{{diffs.left}}}
+									${this.remote.deleted ? '<div class="d2h-code-title">The file does not exist</div>' : ''}
 									</tbody>
 								</table>
 							</div>
@@ -92,7 +93,6 @@ export default class ConflictDiffView extends DiffView {
 	public basicHtml(diff: string): void {
 		// set title
 		this.titleEl.setText(this.t('diff_view_conflict_title'));
-		// set top action bar
 
 		const contentParent = this.syncHistoryContentContainer.parentElement;
 		const topAction = contentParent.createDiv({
@@ -108,7 +108,7 @@ export default class ConflictDiffView extends DiffView {
 		});
 		diffResetBtn.addEventListener('click', e => {
 			e.preventDefault();
-			this.changeFileAndCloseModal(this.leftContent);
+			this.changeFileAndCloseModal(this.leftContent, this.remote.deleted);
 
 			new Notice(
 				`The ${this.file.basename} file has been overwritten with the online remote version.`
@@ -162,7 +162,7 @@ export default class ConflictDiffView extends DiffView {
 				this.versions.push(version);
 			}
 		}
-		if (!(this.versions.length > 1)) {
+		if (!(this.versions.length > 0)) {
 			this.close();
 			new Notice(
 				'There is not at least on version in the file recovery.'

src/diff/index.ts

@@ -1,8 +1,8 @@
 import { App, TFile, Notice, Vault } from 'obsidian';
-import LocalToRemoteDiffView, { IRemoteFile } from './local_to_remote_diff_view';
+import LocalToRemoteDiffView from './local_to_remote_diff_view';
 import RemoteToLocalDiffView from './remote_to_local_diff_view';
 import ConflictDiffView from './conflict_diff_view';
-import { TDiffType } from './abstract_diff_view';
+import { TDiffType, IRemoteFile } from './abstract_diff_view';
 import type InvioPlugin from '../main';
 import { diff_match_patch } from './effective_diff.js';
 import { log } from '../moreOnLog'

src/diff/local_to_remote_diff_view.ts

@@ -10,12 +10,8 @@ import { Diff2HtmlConfig, html } from 'diff2html';
 import type InvioPlugin from '../main';
 import type { recResult, vRecoveryItem } from './interfaces';
 import { FILE_REC_WARNING } from './constants';
-import DiffView, { TDiffType } from './abstract_diff_view';
-export interface IRemoteFile {
-    data: string;
-    ts: number;
-    path: string;
-}
+import DiffView, { IRemoteFile } from './abstract_diff_view';
+
 export default class LocalToRemoteDiffView extends DiffView {
 	remote: IRemoteFile
 	versions: recResult[];
@@ -57,6 +53,7 @@ export default class LocalToRemoteDiffView extends DiffView {
 								<table class="d2h-diff-table">
 									<tbody class="d2h-diff-tbody">
 									{{{diffs.left}}}
+									${this.remote.deleted ? '<div class="d2h-code-title">The file does not exist</div>' : ''}
 									</tbody>
 								</table>
 							</div>
@@ -132,8 +129,7 @@ export default class LocalToRemoteDiffView extends DiffView {
 		});
 		diffResetBtn.addEventListener('click', e => {
 			e.preventDefault();
-			this.changeFileAndCloseModal(this.leftContent);
-
+			this.changeFileAndCloseModal(this.leftContent, this.remote.deleted);
 			new Notice(
 				`The ${this.file.basename} file has been overwritten with the online remote version.`
 			);
@@ -166,7 +162,7 @@ export default class LocalToRemoteDiffView extends DiffView {
 				this.versions.push(version);
 			}
 		}
-		if (!(this.versions.length > 1)) {
+		if (!(this.versions.length > 0)) {
 			this.close();
 			new Notice(
 				'There is not at least on version in the file recovery.'

src/diff/remote_to_local_diff_view.ts

@@ -5,12 +5,8 @@ import { Diff2HtmlConfig, html } from 'diff2html';
 import type InvioPlugin from '../main';
 import type { recResult, vRecoveryItem } from './interfaces';
 import { FILE_REC_WARNING } from './constants';
-import DiffView, { TDiffType } from './abstract_diff_view';
-export interface IRemoteFile {
-    data: string;
-    ts: number;
-    path: string;
-}
+import DiffView, { IRemoteFile } from './abstract_diff_view';
+
 export default class RemoteToLocalDiffView extends DiffView {
 	remote: IRemoteFile
 	versions: recResult[];
@@ -62,6 +58,7 @@ export default class RemoteToLocalDiffView extends DiffView {
 								<table class="d2h-diff-table">
 									<tbody class="d2h-diff-tbody">
 									{{{diffs.right}}}
+									${this.remote.deleted ? '<div class="d2h-code-title">The file does not exist</div>' : ''}
 									</tbody>
 								</table>
 							</div>

src/main.ts

@@ -130,14 +130,21 @@ export default class InvioPlugin extends Plugin {
       return null
     })
     log.info('remote md: ', remoteMD);
-    if (!remoteMD?.data) {
-      new Notice(`The file(${filePath}) does not exist remotely`)
-      return;
+
+    if (remoteMD.deleted) {
+      remoteMD.data = '';
+      remoteMD.lastModified = Date.valueOf();
+    }
+    let remoteData = remoteMD?.data || '';
+    let remoteModiDate = remoteMD?.lastModified || Date.valueOf(); 
+    if (!remoteData) {
+      // new Notice(`The file(${filePath}) does not exist remotely`)
     }
     return new Promise((resolve, reject) => {
       openDiffModal(this.app, this, file, {
-        data: remoteMD.data,
-        ts: remoteMD?.lastModified,
+        deleted: remoteMD.deleted,
+        data: remoteData,
+        ts: remoteModiDate,
         path: filePath
       }, diffType, (file: TFile) => {
         if (file) {
@@ -886,7 +893,7 @@ export default class InvioPlugin extends Plugin {
       await this.doSyncRunAbort(8000);
     }
     const { toRemoteFiles, toLocalFiles } = await this.syncRun('pre') || {};
-    log.info('to remote files: ', toRemoteFiles, toLocalFiles);
+    log.info('toughed files: ', toRemoteFiles, toLocalFiles);
     const touched = [ ...(toRemoteFiles || []), ...(toLocalFiles || []) ]
     await StatsView.activateStatsView(this);
     const view = StatsView.getStatsView(this, 'PendingStats');

src/sync.ts

@@ -339,15 +339,26 @@ export const fetchRemoteFileMD = async (
   }
 
   log.info('fetch remote file path: ', remoteFilePath);
-  const buf = await client.downloadFromRemote(
+  const buf: any = await client.downloadFromRemote(
     remoteFilePath,
     RemoteSrcPrefix,
     vault,
     null,
     password,
     '',
     true
-  );
+  ).catch(err => {
+    if (err?.status === 404) {
+      return {
+        deleted: true,
+        data: ''
+      }
+    }
+    throw err;
+  })
+  if (buf?.deleted) {
+    return buf;
+  }
   const resp: RemoteItem = await client.getRemoteMeta(RemoteSrcPrefix + remoteFilePath)
 
   let data;
@@ -440,7 +451,7 @@ export const pruneTouchedFiles = async (vault: Vault, client: RemoteClient, list
         return null;
       })
       log.info('remote md: ', remoteMD);
-      if (!remoteMD) {
+      if (!remoteMD || remoteMD.deleted) {
         return;
       }
       const diff = await isRemoteFileDiff(vault, item.key, remoteMD.data);