Skip to content

Update compareLocalSave(): ignore sync conflict if only locale present #531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update compareLocalSave(): ignore sync conflict if only locale present #531

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/components/DataSync.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,12 @@
const localSave = await getLocalSaveJson();
const localSize = new Blob([localSave]).size / 1000;

const negligibleKeys = ['converted', 'locale'];
const localSaveKeys = Object.keys(JSON.parse(localSave));
const isLocalSaveNegligible = localSaveKeys.every(key => negligibleKeys.includes(key));

const remoteTime = dayjs(data[UPDATE_TIME_KEY]);
if ($updateTime !== null && remoteTime.diff($updateTime) !== 0) {
if ($updateTime !== null && !isLocalSaveNegligible && remoteTime.diff($updateTime) !== 0) {
console.log('DRIVE SYNC CONFLICT!');
openModal(
SyncConflictModal,
Expand Down