aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Remove invalid files from downloads list on startup

Browse source
This commit is contained in:
Tasos Boulis 2022-11-18 13:52:28 +02:00
parent 76f3c0649c
commit c75cf59576
2 changed files with 45 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/main/downloadsManager.test.js
View file

@ -193,5 +193,32 @@ describe('main/downloadsManager', () => {
dl.showFileInFolder(item1);
expect(shell.showItemInFolder).toHaveBeenCalledWith(locationMock1);
});
it('MM-48483 - should remove an invalid file from the list on startup', () => {
const dl = new DownloadsManager(JSON.stringify({
...downloadsJson,
'invalid_file1.txt': undefined,
'invalid_file2.txt': {},
'invalid_file3.txt': {invalidProperty: 'something'},
'invalid_file4.txt': {
state: 'completed',
type: 'file',
},
'invalid_file5.txt': {
filename: 'invalid_file5.txt',
type: 'file',
},
'invalid_file6.txt': {
filename: 'invalid_file5.txt',
state: 'completed',
},
}));
expect(Object.keys(dl.downloads).includes('invalid_file1.txt')).toBe(false);
expect(Object.keys(dl.downloads).includes('invalid_file2.txt')).toBe(false);
expect(Object.keys(dl.downloads).includes('invalid_file3.txt')).toBe(false);
expect(Object.keys(dl.downloads).includes('invalid_file4.txt')).toBe(false);
expect(Object.keys(dl.downloads).includes('invalid_file5.txt')).toBe(false);
expect(Object.keys(dl.downloads).includes('invalid_file6.txt')).toBe(false);
});
});

20
src/main/downloadsManager.ts
View file

@ -174,16 +174,25 @@ export class DownloadsManager extends JsonFileManager<DownloadedItems> {
for (const fileId in downloads) {
if (Object.prototype.hasOwnProperty.call(downloads, fileId)) {
const file = downloads[fileId];
if (this.isInvalidFile(file)) {
delete downloads[fileId];
modified = true;
continue;
}
// Remove update if app was updated and restarted
if (fileId === APP_UPDATE_KEY) {
if (appVersionManager.lastAppVersion === downloads[APP_UPDATE_KEY].filename) {
if (appVersionManager.lastAppVersion === file.filename) {
delete downloads[APP_UPDATE_KEY];
modified = true;
continue;
} else {
continue;
}
}
const file = downloads[fileId];
if (file.state === 'completed') {
if (!file.location || !fs.existsSync(file.location)) {
downloads[fileId].state = 'deleted';
@ -632,6 +641,13 @@ export class DownloadsManager extends JsonFileManager<DownloadedItems> {
private isAppUpdate = (item: DownloadedItem): boolean => {
return item.type === DownloadItemTypeEnum.UPDATE;
};
private isInvalidFile(file: DownloadedItem) {
return (typeof file !== 'object') ||
!file.filename ||
!file.state ||
!file.type;
}
}
let downloadsManager = new DownloadsManager(downloadsJson);