EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2495 from dpalou/MOBILE-3487 

MOBILE-3487 filepool: Fix invalidate unknown files query
main
Juan Leyva 2020-09-08 16:20:52 +02:00 committed by GitHub
parent 994120b3b9 edba91d5f4
commit 3fc4fa25d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/providers/filepool.ts
View File

@ -279,6 +279,8 @@ export class CoreFilepoolProvider {
protected ERR_QUEUE_IS_EMPTY = 'CoreFilepoolError:ERR_QUEUE_IS_EMPTY';
protected ERR_FS_OR_NETWORK_UNAVAILABLE = 'CoreFilepoolError:ERR_FS_OR_NETWORK_UNAVAILABLE';
protected ERR_QUEUE_ON_PAUSE = 'CoreFilepoolError:ERR_QUEUE_ON_PAUSE';
protected FILE_UPDATE_UNKNOWN_WHERE_CLAUSE =
'isexternalfile = 1 OR ((revision IS NULL OR revision = 0) AND (timemodified IS NULL OR timemodified = 0))';
// Variables for database.
protected QUEUE_TABLE = 'filepool_files_queue'; // Queue of files to download.
@ -2439,17 +2441,12 @@ export class CoreFilepoolProvider {
* It is advised to set it to true to reduce the performance and data usage of the app.
* @return Resolved on success.
*/
invalidateAllFiles(siteId: string, onlyUnknown: boolean = true): Promise<any> {
return this.sitesProvider.getSiteDb(siteId).then((db) => {
let where,
whereParams;
if (onlyUnknown) {
where = 'isexternalfile = ? OR (revision < ? AND timemodified = ?)';
whereParams = [0, 1, 0];
}
async invalidateAllFiles(siteId: string, onlyUnknown: boolean = true): Promise<void> {
const db = await this.sitesProvider.getSiteDb(siteId);
return db.updateRecordsWhere(this.FILES_TABLE, { stale: 1 }, where, whereParams);
});
const where = onlyUnknown ? this.FILE_UPDATE_UNKNOWN_WHERE_CLAUSE : null;
await db.updateRecordsWhere(this.FILES_TABLE, { stale: 1 }, where);
}
/**
@ -2484,25 +2481,28 @@ export class CoreFilepoolProvider {
* It is advised to set it to true to reduce the performance and data usage of the app.
* @return Resolved when done.
*/
invalidateFilesByComponent(siteId: string, component: string, componentId?: string | number, onlyUnknown: boolean = true)
: Promise<any> {
return this.sitesProvider.getSiteDb(siteId).then((db) => {
return this.getComponentFiles(db, component, componentId).then((items) => {
const fileIds = items.map((item) => {
return item.fileId;
}),
whereAndParams = db.getInOrEqual(fileIds);
async invalidateFilesByComponent(siteId: string, component: string, componentId?: string | number, onlyUnknown: boolean = true)
: Promise<void> {
const db = await this.sitesProvider.getSiteDb(siteId);
const items = await this.getComponentFiles(db, component, componentId);
if (!items.length) {
// Nothing to invalidate.
return;
}
const fileIds = items.map((item) => item.fileId);
const whereAndParams = db.getInOrEqual(fileIds);
whereAndParams[0] = 'fileId ' + whereAndParams[0];
if (onlyUnknown) {
whereAndParams[0] += ' AND (isexternalfile = ? OR (revision < ? AND timemodified = ?))';
whereAndParams[1] = whereAndParams[1].concat([0, 1, 0]);
whereAndParams[0] += ' AND (' + this.FILE_UPDATE_UNKNOWN_WHERE_CLAUSE + ')';
}
return db.updateRecordsWhere(this.FILES_TABLE, { stale: 1 }, whereAndParams[0], whereAndParams[1]);
});
});
await db.updateRecordsWhere(this.FILES_TABLE, { stale: 1 }, whereAndParams[0], whereAndParams[1]);
}
/**
@ -2567,7 +2567,7 @@ export class CoreFilepoolProvider {
* @return Whether it cannot determine updates.
*/
protected isFileUpdateUnknown(entry: CoreFilepoolFileEntry): boolean {
return !!entry.isexternalfile || (entry.revision < 1 && !entry.timemodified);
return !!entry.isexternalfile || (!entry.revision && !entry.timemodified);
}
/**