mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-05-12 18:41:52 +00:00
Fixed:
- Internal documents are now ignored. - Merge dialogue now respond immediately to button pressing. - Periodic processing now works fine - The checking interval of detecting conflicted has got shorter - Replication is now cancelled while cleaning up - The database locking by the cleaning up is now carefully unlocked - Missing chunks message is correctly reported New feature: - Suspend database reflecting has been implemented - Now fetch suspends the reflecting database and storage changes temporarily to improve the performance. - We can choose the action when the remote database has been cleaned - Merge dialogue now show `↲` before the new line. Improved: - Now progress is reported while the cleaning up and fetch process - Cancelled replication is now detected
This commit is contained in:
@@ -7,7 +7,7 @@ import { Logger } from "./lib/src/logger";
|
||||
import { checkSyncInfo, isCloudantURI } from "./lib/src/utils_couchdb.js";
|
||||
import { testCrypt } from "./lib/src/e2ee_v2";
|
||||
import ObsidianLiveSyncPlugin from "./main";
|
||||
import { performRebuildDB, requestToCouchDB } from "./utils";
|
||||
import { askYesNo, performRebuildDB, requestToCouchDB, scheduleTask } from "./utils";
|
||||
|
||||
|
||||
export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
|
||||
@@ -1610,6 +1610,27 @@ ${stringifyYaml(pluginConfig)}`;
|
||||
toggle.setValue(this.plugin.settings.suspendFileWatching).onChange(async (value) => {
|
||||
this.plugin.settings.suspendFileWatching = value;
|
||||
await this.plugin.saveSettings();
|
||||
scheduleTask("configReload", 250, async () => {
|
||||
if (await askYesNo(this.app, "Do you want to restart and reload Obsidian now?") == "yes") {
|
||||
// @ts-ignore
|
||||
this.app.commands.executeCommandById("app:reload")
|
||||
}
|
||||
})
|
||||
})
|
||||
);
|
||||
new Setting(containerHatchEl)
|
||||
.setName("Suspend database reflecting")
|
||||
.setDesc("Stop reflecting database changes to storage files.")
|
||||
.addToggle((toggle) =>
|
||||
toggle.setValue(this.plugin.settings.suspendParseReplicationResult).onChange(async (value) => {
|
||||
this.plugin.settings.suspendParseReplicationResult = value;
|
||||
await this.plugin.saveSettings();
|
||||
scheduleTask("configReload", 250, async () => {
|
||||
if (await askYesNo(this.app, "Do you want to restart and reload Obsidian now?") == "yes") {
|
||||
// @ts-ignore
|
||||
this.app.commands.executeCommandById("app:reload")
|
||||
}
|
||||
})
|
||||
})
|
||||
);
|
||||
new Setting(containerHatchEl)
|
||||
@@ -1731,6 +1752,16 @@ ${stringifyYaml(pluginConfig)}`;
|
||||
)
|
||||
.setClass("wizardHidden");
|
||||
|
||||
|
||||
new Setting(containerHatchEl)
|
||||
.setName("Fetch database with previous behaviour")
|
||||
.setDesc("")
|
||||
.addToggle((toggle) =>
|
||||
toggle.setValue(this.plugin.settings.doNotSuspendOnFetching).onChange(async (value) => {
|
||||
this.plugin.settings.doNotSuspendOnFetching = value;
|
||||
await this.plugin.saveSettings();
|
||||
})
|
||||
);
|
||||
addScreenElement("50", containerHatchEl);
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user