mirror of https://git.48k.eu/ogcp
views: select default live when it is the most used live
Select the default live entry instead of the entry of the live that corresponds to the default live in the "Set ogLive" view.master
parent
a241ce1bcd
commit
f02c899e3e
|
@ -2510,13 +2510,7 @@ def action_oglive():
|
|||
return ogserver_error('commands')
|
||||
|
||||
oglive_list = r.json()['oglive']
|
||||
|
||||
most_used_live = max(oglives_set, key=lambda l: len(oglives_set[l]))
|
||||
default_idx = int(r.json()['default'])
|
||||
default_oglive_dir = oglive_list[default_idx].get('directory')
|
||||
|
||||
if most_used_live == OG_CLIENT_DEFAULT_LIVEDIR:
|
||||
most_used_live = default_oglive_dir
|
||||
|
||||
available_oglives = []
|
||||
for oglive in oglive_list:
|
||||
|
@ -2526,7 +2520,14 @@ def action_oglive():
|
|||
else:
|
||||
available_oglives.append(live_entry)
|
||||
|
||||
available_oglives.append(('default', f'ogLive ({default_oglive_dir})'))
|
||||
default_idx = int(r.json()['default'])
|
||||
default_oglive_dir = oglive_list[default_idx].get('directory')
|
||||
default_live_entry = ('default', f'ogLive ({default_oglive_dir})')
|
||||
|
||||
if most_used_live == OG_CLIENT_DEFAULT_LIVEDIR:
|
||||
available_oglives.insert(0, default_live_entry)
|
||||
else:
|
||||
available_oglives.append(default_live_entry)
|
||||
|
||||
form.oglive.choices = available_oglives
|
||||
|
||||
|
|
Loading…
Reference in New Issue