public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-07-16 09:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed: The Fetch that was broken at 0.17.33 has been fixed.

Browse Source 
- Refactored again: Internal file sync, plug-in sync and Set up URI have been moved into each file.
This commit is contained in:
vorotamoroz
2023-03-23 16:48:30 +09:00
parent 4998e2ef0b
commit 6f33d23088
7 changed files with 1384 additions and 1245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObsidianLiveSyncSettingTab.ts
+7 -3
View File
@@ -464,8 +464,11 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
await delay(2000);
if (method == "localOnly") {
await this.plugin.resetLocalDatabase();
await delay(1000);
await this.plugin.markRemoteResolved();
await this.plugin.replicate(true);
await this.plugin.openDatabase();
this.plugin.isReady = true;
await this.plugin.replicateAllFromServer(true);
}
if (method == "remoteOnly") {
await this.plugin.markRemoteLocked();
@@ -475,6 +478,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
}
if (method == "rebuildBothByThisDevice") {
await this.plugin.resetLocalDatabase();
await delay(1000);
await this.plugin.initializeDatabase(true);
await this.plugin.markRemoteLocked();
await this.plugin.tryResetRemoteDatabase();
@@ -1150,7 +1154,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
.setWarning()
.setDisabled(false)
.onClick(async () => {
const filesAll = await this.plugin.scanInternalFiles();
const filesAll = await this.plugin.addOnHiddenFileSync.scanInternalFiles();
const targetFiles = await this.plugin.filterTargetFiles(filesAll);
const now = Date.now();
const newFiles = targetFiles.map(e => ({ ...e, mtime: now }));
@@ -1717,7 +1721,7 @@ ${stringifyYaml(pluginConfig)}`;
.setButtonText("Open")
.setDisabled(false)
.onClick(() => {
this.plugin.showPluginSyncModal();
this.plugin.addOnPluginAndTheirSettings.showPluginSyncModal();
});
});