MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not silent import errors

This commit is contained in:
Eliot Berriot 2018-09-26 19:23:15 +02:00
parent 6aab6369c0
commit 0d96e75eeb
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/funkwhale_api/music/tasks.py
View File

@ -236,7 +236,8 @@ def process_upload(upload):
except UploadImportError as e: except UploadImportError as e:
return fail_import(upload, e.code) return fail_import(upload, e.code)
except Exception: except Exception:
return fail_import(upload, "unknown_error") fail_import(upload, "unknown_error")
raise
# under some situations, we want to skip the import ( # under some situations, we want to skip the import (
# for instance if the user already owns the files) # for instance if the user already owns the files)

2
api/funkwhale_api/providers/audiofile/management/commands/import_files.py
View File

@ -130,7 +130,7 @@ class Command(BaseCommand):
except models.Library.DoesNotExist: except models.Library.DoesNotExist:
raise CommandError("Invalid library id") raise CommandError("Invalid library id")
if not library.actor.is_local: if not library.actor.get_user():
raise CommandError("Library {} is not a local library".format(library.uuid)) raise CommandError("Library {} is not a local library".format(library.uuid))
if options["recursive"]: if options["recursive"]: