storm/bragi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #50 from BafDyce/fix-double-slashes

Browse Source 
Remove double slashes from file paths (and other improvements in utils.py)
This commit is contained in:
Fabian Würfl 2018-05-31 10:55:54 +02:00 committed by GitHub
commit 535591c1ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
interface.py
View File

@ -84,7 +84,13 @@ def index():
files = music_library.get_files_recursively(folder) files = music_library.get_files_recursively(folder)
else: else:
files = music_library.get_files(folder) files = music_library.get_files(folder)
files = list(map(lambda file: ('file', folder + '/' + file), files)) files = list(map(
lambda file: (
'file',
os.path.join(folder, file)
),
files
))
print('Adding to playlist: ', files) print('Adding to playlist: ', files)
var.playlist.extend(files) var.playlist.extend(files)
elif 'delete_music' in request.form: elif 'delete_music' in request.form:

5
util.py
View File

@ -9,7 +9,7 @@ import zipfile
def get_recursive_filelist_sorted(path): def get_recursive_filelist_sorted(path):
filelist = [] filelist = []
for root, dirs, files in os.walk(path): for root, dirs, files in os.walk(path):
relroot = root.replace(path, '') relroot = root.replace(path, '', 1)
if relroot != '' and relroot in var.config.get('bot', 'ignored_folders'): if relroot != '' and relroot in var.config.get('bot', 'ignored_folders'):
continue continue
if len(relroot): if len(relroot):
@ -60,13 +60,12 @@ class Dir(object):
def __init__(self, path): def __init__(self, path):
self.name = os.path.basename(path.strip('/')) self.name = os.path.basename(path.strip('/'))
self.fullpath = path self.fullpath = path
print(self.name, self.fullpath)
self.subdirs = {} self.subdirs = {}
self.files = [] self.files = []
def add_file(self, file): def add_file(self, file):
if file.startswith(self.name + '/'): if file.startswith(self.name + '/'):
file = file.replace(self.name + '/', '') file = file.replace(self.name + '/', '', 1)
if '/' in file: if '/' in file:
# This file is in a subdir # This file is in a subdir