Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

CollectionModels reviveFromJson

Browse source
This commit is contained in:
djmaze 2020-10-18 11:46:22 +02:00
parent d747de7649
commit 7d89de2fdb
3 changed files with 69 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

22
dev/Model/AbstractCollection.js
View file

@ -2,6 +2,11 @@
export class AbstractCollectionModel extends Array
{
constructor(props) {
/*
if (new.target === Parent) {
throw new Error("Can't instantiate abstract class!");
}
*/
super();
props && Object.entries(props).forEach(([key, value]) => '@' !== key[0] && (this[key] = value));
// props[@Count]
@ -12,4 +17,21 @@ export class AbstractCollectionModel extends Array
? object['@Collection']
: null;
}
static reviveFromJson(object, itemCallback) {
// FolderCollectionModel => FolderCollection
// AttachmentCollectionModel => AttachmentCollection
// MessageCollectionModel => MessageCollection
const name = this.name.replace('Model', ''),
collection = this.getFromJSON(object, name);
if (collection) {
const result = new this(object);
collection.forEach(item => {
item && itemCallback && (item = itemCallback(item, result));
item && result.push(item);
});
return result;
}
}
}

28
dev/Model/FolderCollection.js
View file

@ -43,32 +43,20 @@ export class FolderCollectionModel extends AbstractCollectionModel
* @returns {FolderCollectionModel}
*/
static reviveFromJson(object) {
const collection = this.getFromJSON(object, 'FolderCollection');
if (collection) {
const result = new FolderCollectionModel(object),
expandedFolders = Local.get(ClientSideKeyName.ExpandedFolders),
const expandedFolders = Local.get(ClientSideKeyName.ExpandedFolders),
bDisplaySpecSetting = FolderStore.displaySpecSetting();
collection.forEach(oFolder => {
if (oFolder) {
return super.reviveFromJson(object, (oFolder, self) => {
let oCacheFolder = Cache.getFolderFromCacheList(oFolder.FullNameRaw);
if (!oCacheFolder) {
oCacheFolder = FolderModel.newInstanceFromJson(oFolder);
if (oCacheFolder) {
if (oFolder.FullNameRaw == result.SystemFolders[ServerFolderType.INBOX]) {
if (!oCacheFolder && (oCacheFolder = FolderModel.newInstanceFromJson(oFolder))) {
if (oFolder.FullNameRaw == self.SystemFolders[ServerFolderType.INBOX]) {
oCacheFolder.type(FolderType.Inbox);
Cache.setFolderInboxName(oFolder.FullNameRaw);
}
Cache.setFolder(oCacheFolder.fullNameHash, oFolder.FullNameRaw, oCacheFolder);
}
}
if (oCacheFolder) {
if (bDisplaySpecSetting) {
oCacheFolder.checkable(!!oFolder.Checkable);
} else {
oCacheFolder.checkable(true);
}
oCacheFolder.checkable(bDisplaySpecSetting ? !!oFolder.Checkable : true);
oCacheFolder.collapsed(!expandedFolders
|| !Array.isArray(expandedFolders)
@ -91,13 +79,9 @@ export class FolderCollectionModel extends AbstractCollectionModel
oFolder.SubFolders = FolderCollectionModel.reviveFromJson(oFolder.SubFolders);
oFolder.SubFolders && oCacheFolder.subFolders(oFolder.SubFolders);
result.push(oCacheFolder);
}
}
return oCacheFolder;
});
return result;
}
}
storeIt() {

12
dev/Model/MessageCollection.js
View file

@ -34,12 +34,8 @@ export class MessageCollectionModel extends AbstractCollectionModel
* @returns {MessageCollectionModel}
*/
static reviveFromJson(object, cached) {
const collection = this.getFromJSON(object, 'MessageCollection');
if (collection) {
const result = new MessageCollectionModel(object);
let newCount = 0;
collection.forEach(message => {
return super.reviveFromJson(object, message => {
if (message && 'Object/Message' === message['@Object']) {
message = MessageModel.newInstanceFromJson(message);
if (message) {
@ -51,13 +47,9 @@ export class MessageCollectionModel extends AbstractCollectionModel
message.deleted(false);
cached ? initMessageFlagsFromCache(message) : storeMessageFlagsToCache(message);
result.push(message);
return message;
}
}
});
return result;
}
}
}