YunoHost/tartiflette
1
0
Fork 0
mirror of https://github.com/YunoHost/tartiflette.git synced 2024-09-03 20:06:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Uncomited fixes for app history, state key may not always exist

Browse source
This commit is contained in:
Alexandre Aubin 2023-01-10 17:10:22 +01:00
parent 6bf6ce28bf
commit e1fca29669
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/scripts/appListsHistory/script.py
View file

@ -62,7 +62,10 @@ def get_lists_history():
merged.update(community) merged.update(community)
merged.update(official) merged.update(official)
else: else:
merged = json.loads(open("./.work/apps/apps.json").read()) try:
merged = json.loads(open("./.work/apps/apps.json").read())
except:
pass
# Save it # Save it
json.dump(merged, open('./.work/merged_lists.json.%s' % t.strftime("%y-%m-%d"), 'w')) json.dump(merged, open('./.work/merged_lists.json.%s' % t.strftime("%y-%m-%d"), 'w'))
@ -91,11 +94,11 @@ def make_count_summary():
summary = {} summary = {}
summary["date"] = d_label summary["date"] = d_label
for state in states: for state in states:
summary[state] = len([k for k, infos in j.items() if infos["state"] == state]) summary[state] = len([k for k, infos in j.items() if infos.get("state") == state])
for level in range(0, 10): for level in range(0, 10):
summary["level-%s" % level] = len([k for k, infos in j.items() summary["level-%s" % level] = len([k for k, infos in j.items()
if infos["state"] in ["working", "official"] if infos.get("state") in ["working", "official"]
and infos.get("level", None) == level]) and infos.get("level", None) == level])
history.append(summary) history.append(summary)
@ -151,11 +154,11 @@ def make_news():
# Load corresponding json # Load corresponding json
j = json.loads(open("./.work/merged_lists.json.%s" % d.strftime("%y-%m-%d")).read()) j = json.loads(open("./.work/merged_lists.json.%s" % d.strftime("%y-%m-%d")).read())
apps_current = set(k for k, infos in j.items() if infos["state"] in ["working", "official"] and level(infos) != -1) apps_current = set(k for k, infos in j.items() if infos.get("state") in ["working", "official"] and level(infos) != -1)
apps_current_good = set(k for k, infos in j.items() if k in apps_current and level(infos) > 4) apps_current_good = set(k for k, infos in j.items() if k in apps_current and level(infos) > 4)
apps_current_broken = set(k for k, infos in j.items() if k in apps_current and level(infos) <= 4) apps_current_broken = set(k for k, infos in j.items() if k in apps_current and level(infos) <= 4)
apps_previous = set(k for k, infos in previous_j.items() if infos["state"] in ["working", "official"] and level(infos) != -1) apps_previous = set(k for k, infos in previous_j.items() if infos.get("state") in ["working", "official"] and level(infos) != -1)
apps_previous_good = set(k for k, infos in previous_j.items() if k in apps_previous and level(infos) > 4) apps_previous_good = set(k for k, infos in previous_j.items() if k in apps_previous and level(infos) > 4)
apps_previous_broken = set(k for k, infos in previous_j.items() if k in apps_previous and level(infos) <= 4) apps_previous_broken = set(k for k, infos in previous_j.items() if k in apps_previous and level(infos) <= 4)