Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-11-11 10:12:00 +08:00
Code Issues Projects Releases Packages Wiki Activity

[local-sync] Still sync new mail during Gmail inbox UID prioritization

Browse source 
Summary: Fixes T7620

Test Plan: manual

Reviewers: mark, juan

Reviewed By: juan

Maniphest Tasks: T7620

Differential Revision: https://phab.nylas.com/D3765
This commit is contained in:
Christine Spang 2017-01-25 09:48:32 -08:00
parent 933ebdfebb
commit fba9ac0147
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
packages/local-sync/src/local-sync-worker/sync-tasks/fetch-messages-in-folder.imap.es6
View file

@ -28,7 +28,8 @@ class FetchMessagesInFolderIMAP extends SyncTask {
}
_isFirstSync() {
return this._folder.syncState.minUID == null || this._folder.syncState.fetchedmax == null;
return this._folder.syncState.minUID == null ||
(this._folder.syncState.fetchedmax == null && this._folder.syncState.fetchedmin == null);
}
async _recoverFromUIDInvalidity() {
@ -335,13 +336,25 @@ class FetchMessagesInFolderIMAP extends SyncTask {
// Gmail always returns UIDs in order from smallest to largest, so this
// gets us the most recent messages first.
inboxUids = inboxUids.slice(Math.max(inboxUids.length - GMAIL_INBOX_PRIORITIZE_COUNT, 0));
// Immediately persist to avoid issuing search again in case of interrupt
await this._folder.updateSyncState({
gmailInboxUIDsRemaining: inboxUids,
fetchedmax: this._box.uidnext,
});
} else {
inboxUids = this._folder.syncState.gmailInboxUIDsRemaining;
}
// continue fetching new mail first in the case that inbox uid download
// takes multiple batches
const fetchedmax = this._folder.syncState.fetchedmax || this._box.uidnext;
if (this._box.uidnext > fetchedmax) {
console.log(`🔃 📂 ${this._folder.name} new messages present; fetching ${fetchedmax}:${this._box.uidnext}`);
yield this._fetchAndProcessMessages({min: fetchedmax, max: this._box.uidnext});
}
const batchSplitIndex = Math.max(inboxUids.length - FETCH_MESSAGES_COUNT, 0);
const uidsFetchNow = inboxUids.slice(batchSplitIndex);
const uidsFetchLater = inboxUids.slice(0, batchSplitIndex);
// console.log(`FetchMessagesInFolderIMAP: Remaining Gmail Inbox UIDs to download: ${fetchLater.length}`);
// console.log(`FetchMessagesInFolderIMAP: Remaining Gmail Inbox UIDs to download: ${uidsFetchLater.length}`);
yield this._fetchAndProcessMessages({uids: uidsFetchNow});
await this._folder.updateSyncState({ gmailInboxUIDsRemaining: uidsFetchLater });
} else {