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

web interface beautify, add file path check

Browse Source
This commit is contained in:
Terry Geng 2020-02-05 10:34:33 +08:00
parent c25fad8be0
commit 011c0a8567
2 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
interface.py
View File

@ -102,13 +102,17 @@ def index():
if request.method == 'POST': if request.method == 'POST':
logging.debug("Post request: "+ str(request.form)) logging.debug("Post request: "+ str(request.form))
if 'add_file_bottom' in request.form and ".." not in request.form['add_file_bottom']: if 'add_file_bottom' in request.form and ".." not in request.form['add_file_bottom']:
path = var.config.get('bot', 'music_folder') + request.form['add_file_bottom']
if os.path.isfile(path):
item = {'type': 'file', item = {'type': 'file',
'path' : request.form['add_file_bottom'], 'path' : request.form['add_file_bottom'],
'title' : 'Unknown', 'title' : 'Unknown',
'user' : 'Web'} 'user' : 'Web'}
var.playlist.append(var.botamusique.get_music_tag_info(item, var.config.get('bot', 'music_folder') + item['path'])) var.playlist.append(var.botamusique.get_music_tag_info(item, path))
elif 'add_file_next' in request.form and ".." not in request.form['add_file_next']: elif 'add_file_next' in request.form and ".." not in request.form['add_file_next']:
path = var.config.get('bot', 'music_folder') + request.form['add_file_next']
if os.path.isfile(path):
item = {'type': 'file', item = {'type': 'file',
'path' : request.form['add_file_next'], 'path' : request.form['add_file_next'],
'title' : 'Unknown', 'title' : 'Unknown',
@ -128,6 +132,8 @@ def index():
folder += '/' folder += '/'
print('folder:', folder) print('folder:', folder)
if os.path.isdir(var.config.get('bot', 'music_folder') + folder):
if 'add_folder_recursively' in request.form: if 'add_folder_recursively' in request.form:
files = music_library.get_files_recursively(folder) files = music_library.get_files_recursively(folder)
else: else:
@ -168,11 +174,13 @@ def index():
elif 'delete_music_file' in request.form and ".." not in request.form['delete_music_file']: elif 'delete_music_file' in request.form and ".." not in request.form['delete_music_file']:
path = var.config.get('bot', 'music_folder') + request.form['delete_music_file'] path = var.config.get('bot', 'music_folder') + request.form['delete_music_file']
if os.path.isfile(path):
logging.info("web interface delete file " + path) logging.info("web interface delete file " + path)
os.remove(path) os.remove(path)
elif 'delete_folder' in request.form and ".." not in request.form['delete_folder']: elif 'delete_folder' in request.form and ".." not in request.form['delete_folder']:
path = var.config.get('bot', 'music_folder') + request.form['delete_folder'] path = var.config.get('bot', 'music_folder') + request.form['delete_folder']
if os.path.isdir(path):
logging.info("web interface delete folder " + path) logging.info("web interface delete folder " + path)
shutil.rmtree(path) shutil.rmtree(path)
time.sleep(0.1) time.sleep(0.1)

4
templates/index.html
View File

@ -73,7 +73,7 @@
</div> </div>
</div> </div>
<small><i class="fa fa-music" aria-hidden="true"></i> {{ filepath }}</small> <div class="btn-group lead"><div class="btn-space"><i class="fa fa-music" aria-hidden="true"></i></div> {{ filepath }}</div>
<div class="btn-group" style="float: right;"> <div class="btn-group" style="float: right;">
<form action="./download" method="get" class="file file_download"> <form action="./download" method="get" class="file file_download">
@ -106,7 +106,7 @@
<div class="container"> <div class="container">
<div class="bs-docs-section"> <div class="bs-docs-section">
<div class="page-header" id="banner"> <div class="page-header" id="banner">
<h1>botamusique Web Interface</h1> <h1><i class="fa fa-music" aria-hidden="true"></i> botamusique Web Interface</h1>
</div> </div>
</div> </div>
<div class="bs-docs-section"> <div class="bs-docs-section">