From e4065078ddb2b96f660473da312434d39fd77f62 Mon Sep 17 00:00:00 2001 From: marco <10120390+mac12m99@users.noreply.github.com> Date: Thu, 17 Dec 2020 20:30:52 +0100 Subject: [PATCH] =?UTF-8?q?pi=C3=B9=20try-except=20in=20service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service.py | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/service.py b/service.py index 1a69cbbc..69204fa6 100644 --- a/service.py +++ b/service.py @@ -308,17 +308,21 @@ def get_ua_list(): # https://github.com/alfa-addon/addon/blob/master/plugin.video.alfa/platformcode/updater.py#L273 logger.info() url = "http://omahaproxy.appspot.com/all?csv=1" - current_ver = config.get_setting("chrome_ua_version", default="").split(".") - data = httptools.downloadpage(url, alfa_s=True).data - new_ua_ver = scrapertools.find_single_match(data, "win64,stable,([^,]+),") - if not current_ver: - config.set_setting("chrome_ua_version", new_ua_ver) - else: - for pos, val in enumerate(new_ua_ver.split('.')): - if int(val) > int(current_ver[pos]): - config.set_setting("chrome_ua_version", new_ua_ver) - break + try: + current_ver = config.get_setting("chrome_ua_version", default="").split(".") + data = httptools.downloadpage(url, alfa_s=True).data + new_ua_ver = scrapertools.find_single_match(data, "win64,stable,([^,]+),") + + if not current_ver: + config.set_setting("chrome_ua_version", new_ua_ver) + else: + for pos, val in enumerate(new_ua_ver.split('.')): + if int(val) > int(current_ver[pos]): + config.set_setting("chrome_ua_version", new_ua_ver) + break + except: + logger.error(traceback.format_exc()) def run_threaded(job_func, args): @@ -451,7 +455,10 @@ if __name__ == "__main__": logger.error(traceback.format_exc()) while True: - schedule.run_pending() + try: + schedule.run_pending() + except: + logger.error(traceback.format_exc()) if monitor.waitForAbort(1): # every second break