public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2025-12-22 14:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed:

Browse Source 
- Now `redflag3` can be run surely.
- Synchronisation can now be aborted.
This commit is contained in:
vorotamoroz
2023-03-14 19:02:57 +09:00
parent 3940260d42
commit 58196c2423
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib

Submodule src/lib updated: 8985fa74e9...a929ee40cc

22
src/main.ts
View File

@@ -298,10 +298,11 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
} else if (this.isRedFlag3Raised()) { } else if (this.isRedFlag3Raised()) {
Logger(`${FLAGMD_REDFLAG3} has been detected! Self-hosted LiveSync will discard the local database and fetch everything from the remote once again.`, LOG_LEVEL.NOTICE); Logger(`${FLAGMD_REDFLAG3} has been detected! Self-hosted LiveSync will discard the local database and fetch everything from the remote once again.`, LOG_LEVEL.NOTICE);
await this.resetLocalDatabase(); await this.resetLocalDatabase();
await delay(1000);
await this.markRemoteResolved(); await this.markRemoteResolved();
await this.openDatabase(); await this.openDatabase();
this.isReady = true; this.isReady = true;
await this.replicate(true); await this.replicateAllFromServer(true);
await this.deleteRedFlag3(); await this.deleteRedFlag3();
if (await askYesNo(this.app, "Do you want to disable Suspend file watching and restart obsidian now?") == "yes") { if (await askYesNo(this.app, "Do you want to disable Suspend file watching and restart obsidian now?") == "yes") {
this.settings.suspendFileWatching = false; this.settings.suspendFileWatching = false;
@@ -473,13 +474,13 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
this.usedPassphrase = ""; this.usedPassphrase = "";
await this.saveSettings(); await this.saveSettings();
if (keepLocalDB == "no") { if (keepLocalDB == "no") {
this.resetLocalDatabase(); await this.resetLocalDatabase();
this.localDatabase.initializeDatabase(); await this.localDatabase.initializeDatabase();
const rebuild = await askYesNo(this.app, "Rebuild the database?"); const rebuild = await askYesNo(this.app, "Rebuild the database?");
if (rebuild == "yes") { if (rebuild == "yes") {
initDB = this.initializeDatabase(true); initDB = this.initializeDatabase(true);
} else { } else {
this.markRemoteResolved(); await this.markRemoteResolved();
} }
} }
if (keepRemoteDB == "no") { if (keepRemoteDB == "no") {
@@ -730,6 +731,13 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
await this.applyBatchChange(); await this.applyBatchChange();
}, },
}) })
this.addCommand({
id: "livesync-abortsync",
name: "Abort synchronization immediately",
callback: () => {
this.localDatabase.terminateSync();
},
})
} }
@@ -1917,7 +1925,7 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
if (this.settings.syncInternalFiles && this.settings.syncInternalFilesBeforeReplication && !this.settings.watchInternalFileChanges) { if (this.settings.syncInternalFiles && this.settings.syncInternalFilesBeforeReplication && !this.settings.watchInternalFileChanges) {
await this.syncInternalFilesAndDatabase("push", showMessage); await this.syncInternalFilesAndDatabase("push", showMessage);
} }
await this.localDatabase.openReplication(this.settings, false, showMessage, this.parseReplicationResult); return await this.localDatabase.openReplication(this.settings, false, showMessage, this.parseReplicationResult);
} }
async initializeDatabase(showingNotice?: boolean, reopenDatabase = true) { async initializeDatabase(showingNotice?: boolean, reopenDatabase = true) {
@@ -1964,6 +1972,10 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
} }
return await this.localDatabase.replicateAllToServer(this.settings, showingNotice); return await this.localDatabase.replicateAllToServer(this.settings, showingNotice);
} }
async replicateAllFromServer(showingNotice?: boolean) {
if (!this.isReady) return false;
return await this.localDatabase.replicateAllFromServer(this.settings, this.parseReplicationResult, showingNotice);
}
async markRemoteLocked() { async markRemoteLocked() {
return await this.localDatabase.markRemoteLocked(this.settings, true); return await this.localDatabase.markRemoteLocked(this.settings, true);