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

Merge branch 'uif' into fix-HTTP-500-on-playlist-delete

Browse Source
This commit is contained in:
Fabian Würfl
2018-06-02 15:54:32 +02:00
committed by GitHub
parent 81d706e434 cbab69d200
commit 9215d993c6
10 changed files with 112 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
interface.py
View File

@ -71,7 +71,8 @@ def index():
if 'add_file' in request.form and ".." not in request.form['add_file']:
item = ('file', request.form['add_file'], datetime.now().timestamp())
var.playlist.append(item)
if ('add_folder' in request.form and ".." not in request.form['add_folder']) or ('add_folder_recursively' in request.form and ".." not in request.form['add_folder_recursively']) :
elif ('add_folder' in request.form and ".." not in request.form['add_folder']) or ('add_folder_recursively' in request.form and ".." not in request.form['add_folder_recursively']) :
try:
folder = request.form['add_folder']
except:
@ -88,6 +89,13 @@ def index():
files = list(map(lambda file: ('file', os.path.join(folder, file), datetime.now().timestamp()), files))
print('Adding to playlist: ', files)
var.playlist.extend(files)
elif 'add_url' in request.form :
var.playlist.append(['url', request.form['add_url']])
elif 'add_radio' in request.form:
var.playlist.append(['radio', request.form['add_radio']])
elif 'delete_music' in request.form:
for item in var.playlist:
if str(item[2]) == request.form['delete_music']:
@ -97,6 +105,7 @@ def index():
action = request.form['action']
if action == "randomize":
random.shuffle(var.playlist)
if var.current_music:
source = var.current_music[0]
# format for current_music below: