mbirth/tcl_ota_check
1
0
Fork 0
mirror of https://github.com/mbirth/tcl_ota_check.git synced 2024-11-09 22:06:47 +00:00
Code Issues Releases Wiki Activity

Split prds.json handling into smaller methods.

Browse Source
This commit is contained in:
Markus Birth 2018-02-05 18:14:33 +01:00
parent feb2f72fe1
commit ba99c104d0
Signed by: mbirth
GPG Key ID: A9928D7A098C3A9A
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tcllib/devlist.py
View File

@ -19,20 +19,22 @@ DEVICELIST_FILE = "prds.json"
DEVICELIST_CACHE_SECONDS = 86400 DEVICELIST_CACHE_SECONDS = 86400
def get_devicelist(force=False, output_diff=True): def load_local_devicelist():
"""Return device list from saved database.""" """Load local devicelist and return decoded JSON (or None) and need_download status."""
need_download = True need_download = True
old_prds = None
try: try:
filestat = os.stat(DEVICELIST_FILE) filestat = os.stat(DEVICELIST_FILE)
filemtime = filestat.st_mtime filemtime = filestat.st_mtime
if filemtime > time.time() - DEVICELIST_CACHE_SECONDS: if filemtime > time.time() - DEVICELIST_CACHE_SECONDS:
need_download = False need_download = False
with open(DEVICELIST_FILE, "rt") as dlfile: with open(DEVICELIST_FILE, "rt") as dlfile:
old_prds = json.load(dlfile) return json.load(dlfile), need_download
except FileNotFoundError: except FileNotFoundError:
pass return None, True
def get_devicelist(force=False, output_diff=True):
"""Return device list from saved database."""
old_prds, need_download = load_local_devicelist()
if need_download or force: if need_download or force:
prds_json = requests.get(DEVICELIST_URL).text prds_json = requests.get(DEVICELIST_URL).text
@ -47,6 +49,21 @@ def get_devicelist(force=False, output_diff=True):
return prds return prds
def print_versions_diff(old_data, new_data):
prd = new_data["curef"]
if new_data["last_full"] != old_data["last_full"] and new_data["last_ota"] != old_data["last_ota"]:
print("> {}: {} ⇨ {} (OTA: {} ⇨ {})".format(
prd,
ansi.CYAN_DARK + str(old_data["last_full"]) + ansi.RESET,
ansi.CYAN + str(new_data["last_full"]) + ansi.RESET,
ansi.YELLOW_DARK + str(old_data["last_ota"]) + ansi.RESET,
ansi.YELLOW + str(new_data["last_ota"]) + ansi.RESET
))
elif new_data["last_full"] != old_data["last_full"]:
print("> {}: {} ⇨ {} (FULL)".format(prd, ansi.CYAN_DARK + str(old_data["last_full"]) + ansi.RESET, ansi.CYAN + str(new_data["last_full"]) + ansi.RESET))
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_prd_diff(old_prds, new_prds): def print_prd_diff(old_prds, new_prds):
"""Print changes between old and new databases.""" """Print changes between old and new databases."""
added_prds = [prd for prd in new_prds if prd not in old_prds] added_prds = [prd for prd in new_prds if prd not in old_prds]
@ -59,15 +76,4 @@ def print_prd_diff(old_prds, new_prds):
if prd in added_prds: if prd in added_prds:
continue continue
odata = old_prds[prd] odata = old_prds[prd]
if pdata["last_full"] != odata["last_full"] and pdata["last_ota"] != odata["last_ota"]: print_versions_diff(odata, pdata)
print("> {}: {} ⇨ {} (OTA: {} ⇨ {})".format(
prd,
ansi.CYAN_DARK + str(odata["last_full"]) + ansi.RESET,
ansi.CYAN + str(pdata["last_full"]) + ansi.RESET,
ansi.YELLOW_DARK + str(odata["last_ota"]) + ansi.RESET,
ansi.YELLOW + str(pdata["last_ota"]) + ansi.RESET
))
elif pdata["last_full"] != odata["last_full"]:
print("> {}: {} ⇨ {} (FULL)".format(prd, ansi.CYAN_DARK + str(odata["last_full"]) + ansi.RESET, ansi.CYAN + str(pdata["last_full"]) + ansi.RESET))
elif pdata["last_ota"] != odata["last_ota"]:
print("> {}: {} ⇨ {} (OTA)".format(prd, ansi.YELLOW_DARK + str(odata["last_ota"]) + ansi.RESET, ansi.YELLOW + str(pdata["last_ota"]) + ansi.RESET))