X-Git-Url: http://git.code-monkey.de/?p=plugin.video.netflix.git;a=blobdiff_plain;f=resources%2Flib%2FKodiHelper.py;h=7e1811339ed923cedf094679763af94a451571a9;hp=1f12375f19a863702eed6dc9fada28186a485ac7;hb=ff2b5ac70453c86580956b4e0f6b16bb514c9566;hpb=d6b516f25ba5662cc3399edbb96ad18b18e013cb diff --git a/resources/lib/KodiHelper.py b/resources/lib/KodiHelper.py index 1f12375..7e18113 100644 --- a/resources/lib/KodiHelper.py +++ b/resources/lib/KodiHelper.py @@ -7,10 +7,13 @@ import xbmcplugin import xbmcgui import xbmc import json -from os.path import join +from MSL import MSL +from os import remove +from os.path import join, isfile from urllib import urlencode from xbmcaddon import Addon from uuid import uuid4 +from utils import get_user_agent_for_current_platform from UniversalAnalytics import Tracker try: import cPickle as pickle @@ -31,23 +34,27 @@ class KodiHelper: base_url : :obj:`str` Plugin base url """ + addon = self.get_addon() self.plugin_handle = plugin_handle self.base_url = base_url - self.addon = Addon() - self.plugin = self.addon.getAddonInfo('name') - self.version = self.addon.getAddonInfo('version') - self.base_data_path = xbmc.translatePath(self.addon.getAddonInfo('profile')) + self.plugin = addon.getAddonInfo('name') + self.version = addon.getAddonInfo('version') + self.base_data_path = xbmc.translatePath(addon.getAddonInfo('profile')) self.home_path = xbmc.translatePath('special://home') - self.plugin_path = self.addon.getAddonInfo('path') + self.plugin_path = addon.getAddonInfo('path') self.cookie_path = self.base_data_path + 'COOKIE' self.data_path = self.base_data_path + 'DATA' self.config_path = join(self.base_data_path, 'config') self.msl_data_path = xbmc.translatePath('special://profile/addon_data/service.msl').decode('utf-8') + '/' - self.verb_log = self.addon.getSetting('logging') == 'true' - self.default_fanart = self.addon.getAddonInfo('fanart') + self.verb_log = addon.getSetting('logging') == 'true' + self.default_fanart = addon.getAddonInfo('fanart') self.library = None self.setup_memcache() + def get_addon (self): + """Returns a fresh addon instance""" + return Addon() + def refresh (self): """Refresh the current list""" return xbmc.executebuiltin('Container.Refresh') @@ -171,7 +178,7 @@ class KodiHelper: bool Setting could be set or not """ - return self.addon.setSetting(key, value) + return self.get_addon().setSetting(key, value) def get_credentials (self): """Returns the users stored credentials @@ -182,16 +189,44 @@ class KodiHelper: The users stored account data """ return { - 'email': self.addon.getSetting('email'), - 'password': self.addon.getSetting('password') + 'email': self.get_addon().getSetting('email'), + 'password': self.get_addon().getSetting('password') } + def get_esn(self): + """ + Returns the esn from settings + """ + self.log(msg='Is FILE: ' + str(isfile(self.msl_data_path + 'msl_data.json'))) + self.log(msg=self.get_addon().getSetting('esn')) + return self.get_addon().getSetting('esn') + + def set_esn(self, esn): + """ + Returns the esn from settings + """ + stored_esn = self.get_esn() + if not stored_esn and esn: + self.set_setting('esn', esn) + self.delete_manifest_data() + return esn + return stored_esn + + def delete_manifest_data(self): + if isfile(self.msl_data_path + 'msl_data.json'): + remove(self.msl_data_path + 'msl_data.json') + if isfile(self.msl_data_path + 'manifest.json'): + remove(self.msl_data_path + 'manifest.json') + msl = MSL(kodi_helper=self) + msl.perform_key_handshake() + msl.save_msl_data() + def get_dolby_setting(self): """ Returns if the dolby sound is enabled :return: True|False """ - return self.addon.getSetting('enable_dolby_sound') == 'true' + return self.get_addon().getSetting('enable_dolby_sound') == 'true' def get_custom_library_settings (self): """Returns the settings in regards to the custom library folder(s) @@ -202,8 +237,8 @@ class KodiHelper: The users library settings """ return { - 'enablelibraryfolder': self.addon.getSetting('enablelibraryfolder'), - 'customlibraryfolder': self.addon.getSetting('customlibraryfolder') + 'enablelibraryfolder': self.get_addon().getSetting('enablelibraryfolder'), + 'customlibraryfolder': self.get_addon().getSetting('customlibraryfolder') } def get_ssl_verification_setting (self): @@ -214,7 +249,7 @@ class KodiHelper: bool Verify or not """ - return self.addon.getSetting('ssl_verification') == 'true' + return self.get_addon().getSetting('ssl_verification') == 'true' def set_main_menu_selection (self, type): """Persist the chosen main menu entry in memory @@ -640,6 +675,8 @@ class KodiHelper: bool List could be build """ + self.set_esn(esn) + addon = self.get_addon() inputstream_addon = self.get_inputstream_addon() if inputstream_addon == None: self.show_missing_inputstream_addon_notification() @@ -650,13 +687,16 @@ class KodiHelper: self.track_event('playVideo') # check esn in settings - settings_esn = str(self.addon.getSetting('esn')) + settings_esn = str(addon.getSetting('esn')) if len(settings_esn) == 0: - self.addon.setSetting('esn', str(esn)) + addon.setSetting('esn', str(esn)) # inputstream addon properties - msl_service_url = 'http://localhost:' + str(self.addon.getSetting('msl_service_port')) + msl_service_url = 'http://localhost:' + str(addon.getSetting('msl_service_port')) play_item = xbmcgui.ListItem(path=msl_service_url + '/manifest?id=' + video_id) + play_item.setContentLookup(False) + play_item.setMimeType('application/dash+xml') + play_item.setProperty(inputstream_addon + '.stream_headers', 'user-agent=' + get_user_agent_for_current_platform()) play_item.setProperty(inputstream_addon + '.license_type', 'com.widevine.alpha') play_item.setProperty(inputstream_addon + '.manifest_type', 'mpd') play_item.setProperty(inputstream_addon + '.license_key', msl_service_url + '/license?id=' + video_id + '||b{SSM}!b{SID}|') @@ -739,7 +779,9 @@ class KodiHelper: if 'mpaa' in entry_keys: infos.update({'mpaa': entry['mpaa']}) else: - infos.update({'mpaa': str(entry['maturity']['board']) + '-' + str(entry['maturity']['value'])}) + if entry.get('maturity', None) is not None: + if entry['maturity']['board'] is not None and entry['maturity']['value'] is not None: + infos.update({'mpaa': str(entry['maturity']['board'].encode('utf-8')) + '-' + str(entry['maturity']['value'].encode('utf-8'))}) if 'rating' in entry_keys: infos.update({'rating': int(entry['rating']) * 2}) if 'synopsis' in entry_keys: @@ -868,7 +910,7 @@ class KodiHelper: :obj:`str` Requested string or empty string """ - src = xbmc if string_id < 30000 else self.addon + src = xbmc if string_id < 30000 else self.get_addon() locString = src.getLocalizedString(string_id) if isinstance(locString, unicode): locString = locString.encode('utf-8') @@ -916,14 +958,15 @@ class KodiHelper: :param event: the string idetifier of the event :return: None """ + addon = self.get_addon() # Check if tracking is enabled - enable_tracking = (self.addon.getSetting('enable_tracking') == 'true') + enable_tracking = (addon.getSetting('enable_tracking') == 'true') if enable_tracking: #Get or Create Tracking id - tracking_id = self.addon.getSetting('tracking_id') + tracking_id = addon.getSetting('tracking_id') if tracking_id is '': tracking_id = str(uuid4()) - self.addon.setSetting('tracking_id', tracking_id) + addon.setSetting('tracking_id', tracking_id) # Send the tracking event tracker = Tracker.create('UA-46081640-5', client_id=tracking_id) tracker.send('event', event)