danvics/metube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(ytdl): skip file deletion for cleared downloads with no filename

Browse source 
When DELETE_FILE_ON_TRASHCAN is enabled and a download that never produced a file
is cleared, dl.info.filename is unset, so os.remove(...) raises AttributeError.
It is caught and logged as a misleading 'deleting file ... failed' warning even
though there is nothing on disk to remove. Guard with getattr and skip deletion
when there is no filename.
This commit is contained in:
Helmut 2026-06-13 22:00:32 +02:00
parent 5429200fba
commit eb3e4b15ee
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/ytdl.py
View file

@ -1387,11 +1387,18 @@ class DownloadQueue:
continue
if self.config.DELETE_FILE_ON_TRASHCAN:
dl = self.done.get(id)
try:
dldirectory, _ = self.__calc_download_path(dl.info.download_type, dl.info.folder)
os.remove(os.path.join(dldirectory, dl.info.filename))
except Exception as e:
log.warning(f'deleting file for download {id} failed with error message {e!r}')
# `filename` is only set once a download has produced a file; a
# download that errored (or was cleared) before that point never
# gets one. Skip deletion instead of dereferencing a missing
# attribute, which otherwise logs a misleading
# "deleting file ... failed: AttributeError" warning.
filename = getattr(dl.info, 'filename', None)
if filename:
try:
dldirectory, _ = self.__calc_download_path(dl.info.download_type, dl.info.folder)
os.remove(os.path.join(dldirectory, filename))
except Exception as e:
log.warning(f'deleting file for download {id} failed with error message {e!r}')
self.done.delete(id)
await self.notifier.cleared(id)
return {'status': 'ok'}