yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-05 20:01:54 +02:00
Code Issues Releases Wiki Activity

Ensure cache_cleaning only targets remote files

Browse source
This commit is contained in:
Eliot Berriot 2018-09-28 21:30:45 +02:00
parent 6572db3a83
commit 428de17817
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
api/funkwhale_api/federation/tasks.py
View file

@ -29,7 +29,8 @@ def clean_music_cache():
candidates = (
music_models.Upload.objects.filter(
Q(audio_file__isnull=False)
& (Q(accessed_date__lt=limit) | Q(accessed_date=None))
& (Q(accessed_date__lt=limit) | Q(accessed_date=None)),
# library__actor__user=None,
)
.local(False)
.exclude(audio_file="")
@ -55,8 +56,10 @@ def get_files(storage, *parts):
"""
if not parts:
raise ValueError("Missing path")
dirs, files = storage.listdir(os.path.join(*parts))
try:
dirs, files = storage.listdir(os.path.join(*parts))
except FileNotFoundError:
return []
for dir in dirs:
files += get_files(storage, *(list(parts) + [dir]))
return [os.path.join(parts[-1], path) for path in files]