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

refactor: move volume part into a helper

Browse Source
This commit is contained in:
Terry Geng
2020-06-15 20:07:17 +08:00
parent 5f67517dc3
commit a6f8c459d0
4 changed files with 79 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
interface.py
View File

@@ -319,7 +319,7 @@ def status():
'empty': False,
'play': not var.bot.is_pause,
'mode': var.playlist.mode,
'volume': var.bot.get_displayed_volume(),
'volume': var.bot.volume_helper.plain_volume_set,
'playhead': var.bot.playhead
})
@@ -329,7 +329,7 @@ def status():
'empty': True,
'play': not var.bot.is_pause,
'mode': var.playlist.mode,
'volume': var.bot.get_displayed_volume(),
'volume': var.bot.volume_helper.plain_volume_set,
'playhead': 0
})
@@ -486,31 +486,31 @@ def post():
elif action == "clear":
var.bot.clear()
elif action == "volume_up":
if var.bot.get_displayed_volume() + 0.03 < 1.0:
var.bot.convert_set_volume(var.bot.unconverted_volume + 0.03)
if var.bot.volume_helper.plain_volume_set + 0.03 < 1.0:
var.bot.volume_helper.set_volume(var.bot.volume_helper.plain_volume_set + 0.03)
else:
var.bot.convert_set_volume(1.0)
var.db.set('bot', 'volume', str(var.bot.get_displayed_volume()))
log.info("web: volume up to %d" % (var.bot.get_displayed_volume() * 100))
var.bot.volume_helper.set_volume(1.0)
var.db.set('bot', 'volume', str(var.bot.volume_helper.plain_volume_set))
log.info("web: volume up to %d" % (var.bot.volume_helper.plain_volume_set * 100))
elif action == "volume_down":
if var.bot.get_displayed_volume() - 0.03 > 0:
var.bot.convert_set_volume(var.bot.unconverted_volume - 0.03)
if var.bot.volume_helper.plain_volume_set - 0.03 > 0:
var.bot.volume_helper.set_volume(var.bot.unconverted_volume - 0.03)
else:
var.bot.convert_set_volume(1.0)
var.db.set('bot', 'volume', str(var.bot.get_displayed_volume()))
log.info("web: volume down to %d" % (var.bot.get_displayed_volume() * 100))
var.bot.volume_helper.set_volume(1.0)
var.db.set('bot', 'volume', str(var.bot.volume_helper.plain_volume_set))
log.info("web: volume down to %d" % (var.bot.volume_helper.plain_volume_set * 100))
elif action == "volume_set_value":
if 'new_volume' in request.form:
if float(request.form['new_volume']) > 1:
var.bot.convert_set_volume(1.0)
var.bot.volume_helper.set_volume(1.0)
elif float(request.form['new_volume']) < 0:
var.bot.convert_set_volume(0)
var.bot.volume_helper.set_volume(0)
else:
# value for new volume is between 0 and 1, round to two decimal digits
var.bot.convert_set_volume(round(float(request.form['new_volume']), 2))
var.bot.volume_helper.set_volume(round(float(request.form['new_volume']), 2))
var.db.set('bot', 'volume', str(var.bot.get_displayed_volume()))
log.info("web: volume set to %d" % (var.bot.get_displayed_volume() * 100))
var.db.set('bot', 'volume', str(var.bot.volume_helper.plain_volume_set))
log.info("web: volume set to %d" % (var.bot.volume_helper.plain_volume_set * 100))
return status()