Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-23 15:09:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: remove migrated property

Browse Source
This commit is contained in:
thecodrr
2022-07-20 08:33:50 +05:00
parent 0ca7b768e0
commit d3e77a9063
6 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/api/sync/collector.js
View File

@@ -64,7 +64,7 @@ class Collector {
deleted: true, deleted: true,
dateModified: Date.now(), dateModified: Date.now(),
}); });
} else if ((isUnsynced && isSyncable) || item.migrated) { } else if (isUnsynced && isSyncable) {
prev.push({ ...item, type }); prev.push({ ...item, type });
} }
@@ -91,8 +91,7 @@ class Collector {
async _map(item) { async _map(item) {
// in case of resolved content // in case of resolved content
delete item.resolved; delete item.resolved;
// turn the migrated flag off so we don't keep syncing this item repeated // synced is a local only property
delete item.migrated;
delete item.synced; delete item.synced;
return { return {

2
packages/core/collections/content.js
View File

@@ -16,7 +16,7 @@ export default class Content extends Collection {
)}</p>`; )}</p>`;
} }
if (content.remote || content.deleted || content.migrated) if (content.remote || content.deleted)
return await this._collection.addItem( return await this._collection.addItem(
await this.extractAttachments(content) await this.extractAttachments(content)
); );

2
packages/core/collections/tags.js
View File

@@ -15,7 +15,7 @@ export default class Tags extends Collection {
} }
async merge(tag) { async merge(tag) {
if (!tag.migrated) return; if (!tag) return;
await this._collection.addItem(tag); await this._collection.addItem(tag);
} }

4
packages/core/collections/trash.js
View File

@@ -45,9 +45,7 @@ export default class Trash {
async add(item) { async add(item) {
const collection = collectionNameFromItem(item); const collection = collectionNameFromItem(item);
if (!item || !item.type || !collection) return; if (!item || !item.type || !collection) return;
// if (item.dateDeleted || item.deleted || item.migrated) {
// return await this._collection.addItem(item);
// }
await this.collections[collection]._collection.updateItem({ await this.collections[collection]._collection.updateItem({
...item, ...item,
id: item.itemId || item.id, id: item.itemId || item.id,

2
packages/core/database/indexed-collection.js
View File

@@ -38,7 +38,6 @@ export default class IndexedCollection {
} }
// the item has become local now, so remove the flags // the item has become local now, so remove the flags
delete item.remote; delete item.remote;
delete item.migrated;
// if (await this.getEncryptionKey()) { // if (await this.getEncryptionKey()) {
// const encrypted = await this.indexer.encrypt( // const encrypted = await this.indexer.encrypt(
@@ -47,7 +46,6 @@ export default class IndexedCollection {
// ); // );
// encrypted.dateModified = item.dateModified; // encrypted.dateModified = item.dateModified;
// encrypted.localOnly = item.localOnly; // encrypted.localOnly = item.localOnly;
// encrypted.migrated = item.migrated;
// encrypted.id = item.id; // encrypted.id = item.id;
// await this.indexer.write(item.id, encrypted); // await this.indexer.write(item.id, encrypted);
// } else // } else

1
packages/core/database/migrator.js
View File

@@ -17,7 +17,6 @@ class Migrator {
} }
const migrate = migrations[version][item.type || collection.type]; const migrate = migrations[version][item.type || collection.type];
if (migrate) item = migrate(item); if (migrate) item = migrate(item);
item.migrated = true;
if (collection.dbCollection.merge) { if (collection.dbCollection.merge) {
await collection.dbCollection.merge(item); await collection.dbCollection.merge(item);