48k.eu-mirror
/
ogcp
mirror of https://git.48k.eu/ogcp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

views: list default oglive in Set ogLive form 

Show default oglive as "ogLive (live name)" as the last option
int the Set ogLive form.
The previous implementation defined the default oglive as the
most used when the default one is defined by /oglive/list.
master
Alejandro Sirgo Rica 2024-07-17 10:14:18 +02:00
parent 314a173b6c
commit cae11fb04e
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ogcp/views.py
View File

@ -2170,16 +2170,17 @@ def action_oglive():
if r.status_code != requests.codes.ok:
return ogserver_error('commands')
most_used_oglive = max(oglives_set, key=lambda l: len(oglives_set[l]))
available_oglives = [(oglive.get('directory'), oglive.get('directory'))
for oglive in r.json()['oglive']
if oglive.get('directory') == most_used_oglive]
if not available_oglives:
available_oglives.append(('default', 'default'))
available_oglives.extend([(oglive.get('directory'), oglive.get('directory'))
for oglive in r.json()['oglive']
if oglive.get('directory') != most_used_oglive])
form.oglive.choices = list(available_oglives)
oglive_list = r.json()['oglive']
available_oglives = []
for oglive in oglive_list:
available_oglives.append((oglive.get('directory'), oglive.get('directory')))
default_idx = int(r.json()['default'])
default_oglive_dir = oglive_list[default_idx].get('directory')
available_oglives.append(('default', f'ogLive ({default_oglive_dir})'))
form.oglive.choices = available_oglives
form.ok.render_kw = {'formaction': url_for('action_oglive')}
scopes, clients = get_scopes(set(ips))