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

fix: strange web interface behavior, and fix attempt for #111

Browse Source
This commit is contained in:
Terry Geng 2020-03-23 13:04:43 +08:00
parent d24f1095a3
commit 55370e1ba9
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
interface.py
View File

@ -58,7 +58,7 @@ class ReverseProxied(object):
web = Flask(__name__) web = Flask(__name__)
web.config['TEMPLATES_AUTO_RELOAD'] = True #web.config['TEMPLATES_AUTO_RELOAD'] = True
log = logging.getLogger("bot") log = logging.getLogger("bot")
user = 'Remote Control' user = 'Remote Control'
@ -416,18 +416,8 @@ def library():
if not total_count: if not total_count:
abort(404) abort(404)
page_count = math.ceil(total_count / ITEM_PER_PAGE)
current_page = int(request.form['page']) if 'page' in request.form else 1
if current_page <= page_count:
condition.offset((current_page - 1) * ITEM_PER_PAGE)
else:
current_page = 1
condition.limit(ITEM_PER_PAGE)
items = dicts_to_items(var.bot, var.music_db.query_music(condition))
if request.form['action'] == 'add': if request.form['action'] == 'add':
items = dicts_to_items(var.bot, var.music_db.query_music(condition))
for item in items: for item in items:
music_wrapper = get_cached_wrapper(item, user) music_wrapper = get_cached_wrapper(item, user)
var.playlist.append(music_wrapper) var.playlist.append(music_wrapper)
@ -436,6 +426,7 @@ def library():
return redirect("./", code=302) return redirect("./", code=302)
elif request.form['action'] == 'delete': elif request.form['action'] == 'delete':
items = dicts_to_items(var.bot, var.music_db.query_music(condition))
for item in items: for item in items:
var.playlist.remove_by_id(item.id) var.playlist.remove_by_id(item.id)
item = var.cache.get_item_by_id(var.bot, item.id) item = var.cache.get_item_by_id(var.bot, item.id)
@ -452,6 +443,17 @@ def library():
time.sleep(0.1) time.sleep(0.1)
return redirect("./", code=302) return redirect("./", code=302)
else: else:
page_count = math.ceil(total_count / ITEM_PER_PAGE)
current_page = int(request.form['page']) if 'page' in request.form else 1
if current_page <= page_count:
condition.offset((current_page - 1) * ITEM_PER_PAGE)
else:
current_page = 1
condition.limit(ITEM_PER_PAGE)
items = dicts_to_items(var.bot, var.music_db.query_music(condition))
results = [] results = []
for item in items: for item in items:
result = {} result = {}