Fix issues with deleting files with DELETE_FILE_ON_TRASHCAN

Not being able to delete the file should not stop the clearance from the download list.

One error I encountered, is when failed downloads have no dl.info.filename attribute. It was impossible to delete these entries from the "Completed" section.
pull/284/head
guahki 2023-06-22 22:36:24 +02:00 committed by GitHub
parent 9dc5795fdb
commit 3a8bf001dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions

View File

@ -300,7 +300,10 @@ class DownloadQueue:
continue
if self.config.DELETE_FILE_ON_TRASHCAN:
dl = self.done.get(id)
os.remove(os.path.join(dl.download_dir, dl.info.filename))
try:
os.remove(os.path.join(dl.download_dir, dl.info.filename))
except Exception as e:
log.warn(f'deleting file for download {id} failed with error message {e}')
self.done.delete(id)
await self.notifier.cleared(id)
return {'status': 'ok'}