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

Use new settings API exposed directly through SyncClient

Browse source
This commit is contained in:
Andras Schmelczer 2025-03-20 20:44:03 +00:00
parent a39e0886c7
commit d772cda164
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
7 changed files with 50 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

20
frontend/test-client/src/agent/mock-agent.ts
View file

@ -43,7 +43,7 @@ export class MockAgent extends MockClient {
};
this.client.logger.addOnMessageListener((logLine: LogLine) => {
const state = this.client.settings.getSettings().isSyncEnabled
const state = this.client.getSettings().isSyncEnabled
? "(online) "
: "(offline)";
const formatted = `[${this.name} ${state}] ${logLine.timestamp.toISOString()} ${logLine.level} ${logLine.message}`;
@ -91,7 +91,7 @@ export class MockAgent extends MockClient {
this.changeFetchChangesUpdateIntervalMsAction.bind(this)
];
if (this.client.settings.getSettings().isSyncEnabled) {
if (this.client.getSettings().isSyncEnabled) {
if (this.doNotTouchWhileOffline.length === 0) {
options.push(this.disableSyncAction.bind(this));
}
@ -131,7 +131,7 @@ export class MockAgent extends MockClient {
}
public async finish(): Promise<void> {
await this.client.settings.setSetting("isSyncEnabled", true);
await this.client.setSetting("isSyncEnabled", true);
await Promise.all(this.pendingActions);
this.client.stop();
await this.client.syncer.waitForSyncQueue();
@ -239,7 +239,7 @@ export class MockAgent extends MockClient {
const file = this.getFileName();
if (
(!this.client.settings.getSettings().isSyncEnabled &&
(!this.client.getSettings().isSyncEnabled &&
this.doNotTouchWhileOffline.includes(file)) ||
(await this.exists(file))
) {
@ -258,7 +258,7 @@ export class MockAgent extends MockClient {
this.client.logger.info(
`Decided to change fetchChangesUpdateIntervalMs`
);
return this.client.settings.setSetting(
return this.client.setSetting(
"fetchChangesUpdateIntervalMs",
Math.random() * 2000 + 100
);
@ -266,12 +266,12 @@ export class MockAgent extends MockClient {
private async disableSyncAction(): Promise<void> {
this.client.logger.info(`Decided to disable sync`);
await this.client.settings.setSetting("isSyncEnabled", false);
await this.client.setSetting("isSyncEnabled", false);
}
private async enableSyncAction(): Promise<void> {
this.client.logger.info(`Decided to enable sync`);
await this.client.settings.setSetting("isSyncEnabled", true);
await this.client.setSetting("isSyncEnabled", true);
}
private async renameFileAction(files: RelativePath[]): Promise<void> {
@ -280,7 +280,7 @@ export class MockAgent extends MockClient {
// We can't edit files offline that have been updated while offline.
// Otherwise, the resolution logic couldn't handle it.
if (
!this.client.settings.getSettings().isSyncEnabled &&
!this.client.getSettings().isSyncEnabled &&
this.doNotTouchWhileOffline.includes(file)
) {
this.client.logger.info(
@ -292,7 +292,7 @@ export class MockAgent extends MockClient {
const newName = this.getFileName();
if (
(!this.client.settings.getSettings().isSyncEnabled &&
(!this.client.getSettings().isSyncEnabled &&
this.doNotTouchWhileOffline.includes(newName)) ||
(await this.exists(newName))
) {
@ -311,7 +311,7 @@ export class MockAgent extends MockClient {
// We can't edit files offline that have been updated while offline.
// Otherwise, the resolution logic couldn't handle it.
if (
!this.client.settings.getSettings().isSyncEnabled &&
!this.client.getSettings().isSyncEnabled &&
this.doNotTouchWhileOffline.includes(file)
) {
this.client.logger.info(

2
frontend/test-client/src/agent/mock-client.ts
View file

@ -25,7 +25,7 @@ export class MockClient implements FileSystemOperations {
await Promise.all(
Object.keys(this.initialSettings).map(async (key) => {
const settingKey = key as keyof SyncSettings; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
return this.client.settings.setSetting(
return this.client.setSetting(
settingKey,
this.initialSettings[settingKey]! // eslint-disable-line @typescript-eslint/no-non-null-assertion
);