work in progress on #5, work in progress #11

arvvoid · Feb 24, 2019 · cf7812a · cf7812a
1 parent 6ad5836
commit cf7812a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/hbogolib/handler.py b/hbogolib/handler.py
@@ -93,16 +93,31 @@ def setDispCat(self, cur_loc):
         xbmcplugin.setPluginCategory(self.handle, cur_loc)
 
     def send_login_hbogo(self, url, headers, data):
-        r = requests.post(url, headers=headers, data=data)
-        return r.json()
+        try:
+            r = requests.post(url, headers=headers, data=data)
+            return r.json()
+        except:
+            self.log("SEND LOGIN ERROR")
+            resp = {"Data": {"ErrorMessage": "SEND LOGIN ERROR"}, "ErrorMessage": "SEND LOGIN ERROR"}
+            return resp
 
     def get_from_hbogo(self, url):
-        r = requests.get(url, headers=self.loggedin_headers)
-        return r.json()
+        try:
+            r = requests.get(url, headers=self.loggedin_headers)
+            return r.json()
+        except:
+            self.log("GET FROM HBO ERROR")
+            resp = {"Data": {"ErrorMessage": "GET FROM HBO ERROR"}, "ErrorMessage": "GET FROM HBO ERROR"}
+            return resp
 
     def send_purchase_hbogo(self, url, purchase_payload, purchase_headers):
-        r = requests.post(url, headers=purchase_headers, data=purchase_payload)
-        return r.json()
+        try:
+            r = requests.post(url, headers=purchase_headers, data=purchase_payload)
+            return r.json()
+        except:
+            self.log("SEND HBO PURCHASE ERROR")
+            resp = {"Data": {"ErrorMessage": "SEND HBO PURCHASE ERROR"}, "ErrorMessage": "SEND HBO PURCHASE ERROR"}
+            return resp
 
     def del_login(self):
         try:

diff --git a/hbogolib/handlereu.py b/hbogolib/handlereu.py
@@ -709,8 +709,13 @@ def login(self):
             pass
 
         try:
-            self.customerId = jsonrspl['Customer']['CurrentDevice']['Id']
-            self.individualization = jsonrspl['Customer']['CurrentDevice']['Individualization']
+            if self.customerId != jsonrspl['Customer']['CurrentDevice']['Id'] or self.individualization != jsonrspl['Customer']['CurrentDevice']['Individualization']:
+                self.log("Customer ID or Individualization Mismatch Showing diferences")
+                self.log("Customer ID: " + self.customerId + ":" + jsonrspl['Customer']['CurrentDevice']['Id'])
+                self.log("Individualization: " + self.individualization + ":" + jsonrspl['Customer']['CurrentDevice']['Individualization'])
+                self.storeIndiv(jsonrspl['Customer']['CurrentDevice']['Individualization'], jsonrspl['Customer']['CurrentDevice']['Id'])
+            else:
+                self.log("Customer ID and Individualization Match")
         except:
             self.log("LOGIN: INDIVIDUALIZATION ERROR")
             xbmcgui.Dialog().ok(self.LB_LOGIN_ERROR, "LOGIN: INDIVIDUALIZATION ERROR")