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

Merge branch '112-batch-id' into 'develop' 

Fix #112: missing batch ID in import output

Closes #112

See merge request funkwhale/funkwhale!80
This commit is contained in:
Eliot Berriot 2018-03-06 19:48:45 +00:00
parent 55a93c71e3 dd61dd7416
commit 88ea79ab0b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,13 +81,12 @@ class Command(BaseCommand):
raise CommandError("Import cancelled.") raise CommandError("Import cancelled.")
batch = self.do_import(matching, user=user, options=options) batch = self.do_import(matching, user=user, options=options)
message = 'Successfully imported {} tracks' message = 'Successfully imported {} tracks'
if options['async']: if options['async']:
message = 'Successfully launched import for {} tracks' message = 'Successfully launched import for {} tracks'
self.stdout.write(message.format(len(matching))) self.stdout.write(message.format(len(matching)))
self.stdout.write( self.stdout.write(
"For details, please refer to import batch #".format(batch.pk)) "For details, please refer to import batch #{}".format(batch.pk))
@transaction.atomic @transaction.atomic
def do_import(self, matching, user, options): def do_import(self, matching, user, options):

1
changes/changelog.d/112.bugfix Normal file
View File

@ -0,0 +1 @@
Added missing batch id in output during import (#112)