diff options
Diffstat (limited to 'plugin.video.dazn/resources/lib')
| -rw-r--r-- | plugin.video.dazn/resources/lib/client.py | 4 | ||||
| -rw-r--r-- | plugin.video.dazn/resources/lib/common.py | 3 | ||||
| -rw-r--r-- | plugin.video.dazn/resources/lib/context.py | 9 | ||||
| -rw-r--r-- | plugin.video.dazn/resources/lib/simple_requests/api.py | 25 |
4 files changed, 10 insertions, 31 deletions
diff --git a/plugin.video.dazn/resources/lib/client.py b/plugin.video.dazn/resources/lib/client.py index b09521e..f13e0ed 100644 --- a/plugin.video.dazn/resources/lib/client.py +++ b/plugin.video.dazn/resources/lib/client.py @@ -132,10 +132,8 @@ class Client: else: self.setToken(data['AuthToken'], data.get('Result', 'RefreshAccessTokenError')) - def startUp(self, device_id=''): + def startUp(self): kodi_language = self.plugin.get_language() - if device_id != '': - self.DEVICE_ID = device_id self.POST_DATA = { 'LandingPageKey': 'generic', 'Languages': '{0}, {1}'.format(kodi_language, self.LANGUAGE), diff --git a/plugin.video.dazn/resources/lib/common.py b/plugin.video.dazn/resources/lib/common.py index d171d9a..5c3efe0 100644 --- a/plugin.video.dazn/resources/lib/common.py +++ b/plugin.video.dazn/resources/lib/common.py @@ -29,6 +29,7 @@ class Common: self.content = addon.getSetting('content') self.view_id = addon.getSetting('view_id') self.force_view = addon.getSetting('force_view') == 'true' + self.startup = addon.getSetting('startup') == 'true' def utfenc(self, text): result = text @@ -114,7 +115,7 @@ class Common: if ":" in mac_addr: device_id = str(uuid.UUID(hashlib.md5(str(mac_addr.decode("utf-8"))).hexdigest())) else: - log("[{0}] error: failed to get device id ({1})".format(self.addon_id, str(mac_addr))) + self.log("[{0}] error: failed to get device id ({1})".format(self.addon_id, str(mac_addr))) self.dialog_ok(30051) self.set_setting('device_id', device_id) return device_id diff --git a/plugin.video.dazn/resources/lib/context.py b/plugin.video.dazn/resources/lib/context.py index d84cbb1..a4df55d 100644 --- a/plugin.video.dazn/resources/lib/context.py +++ b/plugin.video.dazn/resources/lib/context.py @@ -24,15 +24,20 @@ class Context: self.cm.append((self.plugin.get_string(30231), 'ActivateWindow(Videos, {0})'.format(self.plugin.build_url(d)))) return self.cm - def related(self, cm_items): + def related(self, cm_items): for i in cm_items: + type_ = i['type'] + if type_ == 'Highlights': + type_ = self.plugin.get_string(30213) + elif type_ == 'Condensed': + type_ = self.plugin.get_string(30216) d = { 'mode': 'play_context', 'title': self.plugin.utfenc(i['title']), 'id': i.get('id', ''), 'params': i.get('params','') } - self.cm.append((self.plugin.get_string(30213), 'XBMC.RunPlugin({0})'.format(self.plugin.build_url(d)))) + self.cm.append((type_, 'XBMC.RunPlugin({0})'.format(self.plugin.build_url(d)))) return self.cm def goto(self, item): diff --git a/plugin.video.dazn/resources/lib/simple_requests/api.py b/plugin.video.dazn/resources/lib/simple_requests/api.py index 35f6148..10e6ec6 100644 --- a/plugin.video.dazn/resources/lib/simple_requests/api.py +++ b/plugin.video.dazn/resources/lib/simple_requests/api.py @@ -42,8 +42,6 @@ class Response(): def json(self): return real_json.loads(self.text) - pass - def _request(method, url, params=None, @@ -62,7 +60,6 @@ def _request(method, url, json=None): if not headers: headers = {} - pass url = urllib.quote(url, safe="%/:=&?~#+!$,;'@()*[]") @@ -77,13 +74,11 @@ def _request(method, url, ssl_context.check_hostname = False ssl_context.verify_mode = ssl.CERT_NONE handlers.append(urllib2.HTTPSHandler(context=ssl_context)) - pass # handlers.append(urllib2.HTTPCookieProcessor()) # handlers.append(ErrorHandler) if not allow_redirects: handlers.append(NoRedirectHandler) - pass opener = urllib2.build_opener(*handlers) query = '' @@ -92,20 +87,14 @@ def _request(method, url, value = params[key] if isinstance(value, str): value = value.decode('utf-8') - pass params[key] = value.encode('utf-8') - pass query = urllib.urlencode(params) - pass if query: url += '?%s' % query - pass request = urllib2.Request(url) if headers: for key in headers: request.add_header(key, str(unicode(headers[key]).encode('utf-8'))) - pass - pass if data or json: if headers.get('Content-Type', '').startswith('application/x-www-form-urlencoded') and data: # transform a string into a map of values @@ -115,37 +104,26 @@ def _request(method, url, for item in _data: name, value = item.split('=') data[name] = value - pass - pass # encode each value for key in data: data[key] = data[key].encode('utf-8') - pass # urlencode request.data = urllib.urlencode(data) - pass elif headers.get('Content-Type', '').startswith('application/json') and data: request.data = real_json.dumps(data).encode('utf-8') - pass elif json: request.data = real_json.dumps(json).encode('utf-8') - pass else: if not isinstance(data, basestring): data = str(data) - pass if isinstance(data, str): data = data.encode('utf-8') - pass request.data = data - pass - pass elif method.upper() in ['POST', 'PUT']: request.data = "null" - pass request.get_method = lambda: method result = Response() response = None @@ -155,8 +133,6 @@ def _request(method, url, # HTTPError implements addinfourl, so we can use the exception to construct a response if isinstance(e, urllib2.addinfourl): response = e - pass - pass # process response result.headers.update(response.headers) @@ -165,7 +141,6 @@ def _request(method, url, buf = StringIO(response.read()) f = gzip.GzipFile(fileobj=buf) result.text = f.read() - pass else: result.text = response.read() |