From 1b85792b9b8286b393f30f51b7bdf56bfb01eed3 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Sun, 6 Dec 2020 09:07:11 -0500 Subject: [PATCH] test --- fHDHR/origin/origin_service.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/fHDHR/origin/origin_service.py b/fHDHR/origin/origin_service.py index 8347b21..f62385b 100644 --- a/fHDHR/origin/origin_service.py +++ b/fHDHR/origin/origin_service.py @@ -11,6 +11,8 @@ class OriginService(): self.base_url = 'http://www.xumo.tv' + self.geoID, self.geoLST = None, None + self.login() def login(self): @@ -25,12 +27,15 @@ class OriginService(): return True def getID(self): - url_headers = {'User-Agent': 'Mozilla/5.0'} - pagereq = self.fhdhr.web.session.get(self.base_url, headers=url_headers).text - results = json.loads(re.findall('__JOBS_REHYDRATE_STATE__=(.+?);', (pagereq), flags=re.DOTALL)[0]) - print(results["jobs"]["1"]["data"]["geoId"]) - print(results["jobs"]["1"]["data"]["channelListId"]) - return results["jobs"]["1"]["data"]["geoId"], results["jobs"]["1"]["data"]["channelListId"] + try: + url_headers = {'User-Agent': 'Mozilla/5.0'} + pagereq = self.fhdhr.web.session.get(self.base_url, headers=url_headers).text + results = json.loads(re.findall('__JOBS_REHYDRATE_STATE__=(.+?);', (pagereq), flags=re.DOTALL)[0]) + geoID, geoLST = results["jobs"]["1"]["data"]["geoId"], results["jobs"]["1"]["data"]["channelListId"] + except Exception as e: + self.fhdhr.logger.warning("XUMO Setup Failed %s" % e) + geoID, geoLST = None, None + return geoID, geoLST def get_status_dict(self): ret_status_dict = {