mbirth/tcl_ota_check
Archived
1
0
Fork 0
Code Pull Requests Activity

More trying to please Scrutinizer.

Browse Source
This commit is contained in:
Markus Birth 2018-02-15 00:39:01 +01:00
parent 1707bcad26
commit 16d33b0cb6
Signed by: mbirth
GPG Key ID: A9928D7A098C3A9A
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tcllib/devlist.py
View File

@ -19,7 +19,7 @@ DEVICELIST_FILE = "prds.json"
DEVICELIST_CACHE_SECONDS = 86400
def load_local_devicelist():
def _load_local_devicelist():
"""Load local devicelist and return decoded JSON (or None) and need_download status."""
need_download = True
try:
@ -32,19 +32,15 @@ def load_local_devicelist():
except FileNotFoundError:
return None, True
def get_devicelist(force: bool=False, output_diff: bool=True, local: bool=False) -> dict:
"""Return device list from saved database."""
old_prds, need_download = load_local_devicelist()
if local:
return old_prds
if need_download or force:
def _download_devicelist(doit: bool):
"""Download device list if doit is set. Or do nothing."""
if doit:
prds_json = requests.get(DEVICELIST_URL).text
with open(DEVICELIST_FILE, "wt") as dlfile:
dlfile.write(prds_json)
def _load_devicelist_with_diff(output_diff: bool, old_prds: dict = {}) -> dict:
"""Load local devicelist and output diff if requested."""
with open(DEVICELIST_FILE, "rt") as dlfile:
prds = json.load(dlfile)
@ -53,6 +49,17 @@ def get_devicelist(force: bool=False, output_diff: bool=True, local: bool=False)
return prds
def get_devicelist(force: bool=False, output_diff: bool=True, local: bool=False) -> dict:
"""Return device list from saved database."""
old_prds, need_download = _load_local_devicelist()
if local:
return old_prds
_download_devicelist(need_download or force)
return _load_devicelist_with_diff(output_diff, old_prds)
def print_versions_diff(old_data: dict, new_data: dict):
"""Print version changes between old and new databases."""
@ -70,17 +77,17 @@ def print_versions_diff(old_data: dict, new_data: dict):
elif new_data["last_ota"] != old_data["last_ota"]:
print("> {}: {} ⇨ {} (OTA)".format(prd, ansi.YELLOW_DARK + str(old_data["last_ota"]) + ansi.RESET, ansi.YELLOW + str(new_data["last_ota"]) + ansi.RESET))
def print_removed_prds(prds_data: dict, removed_prds: list):
def _print_removed_prds(prds_data: dict, removed_prds: list):
"""Print details of selected PRDs as removed."""
for prd in removed_prds:
print("> Removed device {} (was at {} / OTA: {}).".format(ansi.RED + prd + ansi.RESET, prds_data[prd]["last_full"], prds_data[prd]["last_ota"]))
def print_added_prds(prds_data: dict, added_prds: list):
def _print_added_prds(prds_data: dict, added_prds: list):
"""Print details of selected PRDs as added."""
for prd in added_prds:
print("> New device {} ({} / OTA: {}).".format(ansi.GREEN + prd + ansi.RESET, prds_data[prd]["last_full"], prds_data[prd]["last_ota"]))
def print_changed_prds(old_prds: dict, new_prds: dict, skip_prds: list):
def _print_changed_prds(old_prds: dict, new_prds: dict, skip_prds: list):
"""Print details of changed PRDs."""
for prd, pdata in new_prds.items():
if prd in skip_prds:
@ -92,6 +99,6 @@ def print_prd_diff(old_prds: dict, new_prds: dict):
"""Print PRD changes between old and new databases."""
added_prds = [prd for prd in new_prds if prd not in old_prds]
removed_prds = [prd for prd in old_prds if prd not in new_prds]
print_removed_prds(old_prds, removed_prds)
print_added_prds(new_prds, added_prds)
print_changed_prds(old_prds, new_prds, added_prds)
_print_removed_prds(old_prds, removed_prds)
_print_added_prds(new_prds, added_prds)
_print_changed_prds(old_prds, new_prds, added_prds)