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

MOBILE-3799 filepool: Fix files considered outdated when they aren't

main
Dani Palou 2022-02-16 13:11:47 +01:00
parent 656f315655
commit 51b2174ef2
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/services/filepool.ts
View File

@ -386,10 +386,10 @@ export class CoreFilepoolProvider {
const file = await this.fixPluginfileURL(siteId, fileUrl); const file = await this.fixPluginfileURL(siteId, fileUrl);
fileUrl = CoreFileHelper.getFileUrl(file); fileUrl = CoreFileHelper.getFileUrl(file);
timemodified = file.timemodified || timemodified; timemodified = file.timemodified ?? timemodified;
} }
revision = revision || this.getRevisionFromUrl(fileUrl); revision = revision ?? this.getRevisionFromUrl(fileUrl);
const fileId = this.getFileIdByUrl(fileUrl); const fileId = this.getFileIdByUrl(fileUrl);
const primaryKey = { siteId, fileId }; const primaryKey = { siteId, fileId };
@ -1032,11 +1032,10 @@ export class CoreFilepoolProvider {
const file = await this.fixPluginfileURL(siteId, fileUrl); const file = await this.fixPluginfileURL(siteId, fileUrl);
fileUrl = CoreFileHelper.getFileUrl(file); fileUrl = CoreFileHelper.getFileUrl(file);
timemodified = file.timemodified || timemodified;
options = Object.assign({}, options); // Create a copy to prevent modifying the original object. options = Object.assign({}, options); // Create a copy to prevent modifying the original object.
options.timemodified = timemodified || 0; options.timemodified = file.timemodified ?? timemodified ?? 0;
options.revision = revision || this.getRevisionFromUrl(fileUrl); options.revision = revision ?? this.getRevisionFromUrl(fileUrl);
const fileId = this.getFileIdByUrl(fileUrl); const fileId = this.getFileIdByUrl(fileUrl);
const links = this.createComponentLinks(component, componentId); const links = this.createComponentLinks(component, componentId);
@ -1506,8 +1505,8 @@ export class CoreFilepoolProvider {
} }
fileUrl = CoreUrl.removeUrlAnchor(CoreFileHelper.getFileUrl(file)); fileUrl = CoreUrl.removeUrlAnchor(CoreFileHelper.getFileUrl(file));
timemodified = file.timemodified || timemodified; timemodified = file.timemodified ?? timemodified;
revision = revision || this.getRevisionFromUrl(fileUrl); revision = revision ?? this.getRevisionFromUrl(fileUrl);
const fileId = this.getFileIdByUrl(fileUrl); const fileId = this.getFileIdByUrl(fileUrl);
try { try {
@ -1592,8 +1591,8 @@ export class CoreFilepoolProvider {
const file = await this.fixPluginfileURL(siteId, fileUrl, timemodified); const file = await this.fixPluginfileURL(siteId, fileUrl, timemodified);
fileUrl = CoreFileHelper.getFileUrl(file); fileUrl = CoreFileHelper.getFileUrl(file);
timemodified = file.timemodified || timemodified; timemodified = file.timemodified ?? timemodified;
revision = revision || this.getRevisionFromUrl(fileUrl); revision = revision ?? this.getRevisionFromUrl(fileUrl);
const fileId = this.getFileIdByUrl(fileUrl); const fileId = this.getFileIdByUrl(fileUrl);
try { try {
@ -2566,10 +2565,10 @@ export class CoreFilepoolProvider {
const fileId = item.fileId; const fileId = item.fileId;
const fileUrl = item.url; const fileUrl = item.url;
const options = { const options = {
revision: item.revision || undefined, revision: item.revision ?? undefined,
timemodified: item.timemodified || undefined, timemodified: item.timemodified ?? undefined,
isexternalfile: item.isexternalfile || undefined, isexternalfile: item.isexternalfile ?? undefined,
repositorytype: item.repositorytype || undefined, repositorytype: item.repositorytype ?? undefined,
}; };
const filePath = item.path || undefined; const filePath = item.path || undefined;
const links = item.linksUnserialized || []; const links = item.linksUnserialized || [];