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

Fixed #37: do not pass recursive flag on import unless needed

This commit is contained in:
Eliot Berriot 2017-07-20 23:25:01 +02:00
parent ed613dcbf3
commit 6adc8f0cde
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,17 @@ class Command(BaseCommand):
def handle(self, *args, **options): def handle(self, *args, **options):
# self.stdout.write(self.style.SUCCESS('Successfully closed poll "%s"' % poll_id)) # self.stdout.write(self.style.SUCCESS('Successfully closed poll "%s"' % poll_id))
matching = glob.glob(options['path'], recursive=options['recursive'])
# Recursive is supported only on Python 3.5+, so we pass the option
# only if it's True to avoid breaking on older versions of Python
glob_kwargs = {}
if options['recursive']:
glob_kwargs['recursive'] = True
try:
matching = glob.glob(options['path'], **glob_kwargs)
except TypeError:
raise Exception('You need Python 3.5 to use the --recursive flag')
self.stdout.write('This will import {} files matching this pattern: {}'.format( self.stdout.write('This will import {} files matching this pattern: {}'.format(
len(matching), options['path'])) len(matching), options['path']))