linse/servicemanager
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

further fixes in FrappyManager

Browse Source
This commit is contained in:
zolliker 2023-10-27 08:05:26 +02:00
parent 64634bd790
commit 7f6a8b4187
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frappyman.py
View File

@ -104,9 +104,9 @@ def summarize_server_state(givencfgs, ourcfgs, sealist, sea_info, strict=False):
for seacfg, seacfgfile, key in zip_longest(sealist, seacfgfiles, ('main', 'stick')): for seacfg, seacfgfile, key in zip_longest(sealist, seacfgfiles, ('main', 'stick')):
if not seacfg: if not seacfg:
continue continue
available = sea_info[seacfg] available = sea_info[seacfg + SEAEXT.get(key, '.addon')]
if available: if available:
proposed = available[0] if len(available) == 1 else None proposed = list(available)[0] if len(available) == 1 else None
if not proposed: if not proposed:
running = None running = None
for item in available: for item in available:
@ -336,7 +336,6 @@ class FrappyManager(ServiceManager):
if cfg not in all_cfg: if cfg not in all_cfg:
if sea_cfg and sea_info is not None: if sea_cfg and sea_info is not None:
sea_info.setdefault(sea_cfg, set()).add(cfg) sea_info.setdefault(sea_cfg, set()).add(cfg)
sea_info[cfg] = sea_cfg
all_cfg.add(cfg) all_cfg.add(cfg)
if list_info is not None: if list_info is not None:
list_info.setdefault(cfgdir, {})[cfg] = desc.split('\n', 1)[0] list_info.setdefault(cfgdir, {})[cfg] = desc.split('\n', 1)[0]
@ -356,7 +355,7 @@ class FrappyManager(ServiceManager):
inverted_sea_info = {} inverted_sea_info = {}
for seacfg, cfgset in sea_info.items(): for seacfg, cfgset in sea_info.items():
for cfg in cfgset: for cfg in cfgset:
inverted_sea_info[seacfg] = cfg inverted_sea_info[cfg] = seacfg
ambiguous = 0 ambiguous = 0
keylen = max(max(len(k) for k in cfgs) for cfgs in list_info.values()) keylen = max(max(len(k) for k in cfgs) for cfgs in list_info.values())
for cfgdir, cfgs in list_info.items(): for cfgdir, cfgs in list_info.items():