From 617ce230b44ad6c422a53aa2bd2b42819c9393c3 Mon Sep 17 00:00:00 2001 From: Bob van de Vijver Date: Fri, 27 Dec 2019 13:36:44 +0100 Subject: [PATCH] Added localisation support for uptime active keyword --- fritzbox_uptime.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fritzbox_uptime.py b/fritzbox_uptime.py index 649c0d0..456ad74 100755 --- a/fritzbox_uptime.py +++ b/fritzbox_uptime.py @@ -23,6 +23,7 @@ import sys import fritzbox_helper as fh locale = os.environ.get('locale', 'de') +activeLoc = {"de": "aktiv", "en": "active"} patternLoc = {"de": r"(\d+)\s(Tag|Stunden|Minuten)", "en": r"(\d+)\s(days|hours|minutes)"} dayLoc = {"de": "Tag", "en": "days"} @@ -43,7 +44,10 @@ def get_uptime(): xhr_data = fh.get_xhr_content(server, session_id, PAGE) data = json.loads(xhr_data) for d in data['data']['drain']: - if 'aktiv' in d['statuses']: + if type(d['statuses']) != str and type(d['statuses']) != unicode: + continue + + if activeLoc[locale] in d['statuses'].lower(): matches = re.finditer(pattern, d['statuses']) if matches: hours = 0.0