andras/reconcile
1
0
Fork 0
Code Issues Pull requests 5 Projects Releases Packages Wiki Activity Actions

Add status bar

Browse source
This commit is contained in:
Andras Schmelczer 2024-12-19 21:44:57 +00:00
parent de8a7b607d
commit ec87a65e82
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
12 changed files with 80 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugin/src/sync-operations/apply-local-changes-remotely.ts
View file

@ -1,5 +1,5 @@
import { Database } from "../database/database";
import { SyncService } from "../services/sync_service";
import { SyncService } from "../services/sync-service";
import { Logger } from "../logger";
import { FileOperations } from "../file-operations/file-operations";
import { syncLocallyCreatedFile } from "./sync-locally-created-file";

4
plugin/src/sync-operations/apply-remote-changes-locally.ts
View file

@ -1,7 +1,7 @@
import { Database } from "src/database/database";
import { FileOperations } from "src/file-operations/file-operations";
import { Logger } from "src/logger";
import { SyncService } from "src/services/sync_service";
import { SyncService } from "src/services/sync-service";
import { syncRemotelyUpdatedFile } from "./sync-remotely-updated-file";
let isRunning = false;
@ -14,6 +14,8 @@ export async function applyRemoteChangesLocally(
if (isRunning) {
Logger.getInstance().info("Pull sync already in progress, skipping");
return;
} else {
Logger.getInstance().info("Starting pull sync");
}
isRunning = true;

2
plugin/src/sync-operations/sync-locally-created-file.ts
View file

@ -1,7 +1,7 @@
import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
import { Database } from "src/database/database";
import { Logger } from "src/logger";
import { SyncService } from "src/services/sync_service";
import { SyncService } from "src/services/sync-service";
import { hash } from "src/utils/hash";
import { unlockDocument, waitForDocumentLock } from "./locks";
import { FileOperations } from "src/file-operations/file-operations";

2
plugin/src/sync-operations/sync-locally-deleted-file.ts
View file

@ -1,7 +1,7 @@
import { Database } from "src/database/database";
import { RelativePath } from "src/database/document-metadata";
import { Logger } from "src/logger";
import { SyncService } from "src/services/sync_service";
import { SyncService } from "src/services/sync-service";
import { unlockDocument, waitForDocumentLock } from "./locks";
export async function syncLocallyDeletedFile({

2
plugin/src/sync-operations/sync-locally-updated-file.ts
View file

@ -1,7 +1,7 @@
import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
import { Database } from "src/database/database";
import { Logger } from "src/logger";
import { SyncService } from "src/services/sync_service";
import { SyncService } from "src/services/sync-service";
import { hash } from "src/utils/hash";
import { unlockDocument, waitForDocumentLock } from "./locks";
import { FileOperations } from "src/file-operations/file-operations";

2
plugin/src/sync-operations/sync-remotely-updated-file.ts
View file

@ -1,6 +1,6 @@
import { Database } from "src/database/database";
import { unlockDocument, waitForDocumentLock } from "./locks";
import { SyncService } from "src/services/sync_service";
import { SyncService } from "src/services/sync-service";
import * as lib from "../../../backend/sync_lib/pkg/sync_lib.js";
import { hash } from "src/utils/hash";
import { Logger } from "src/logger";