X-Git-Url: http://git.code-monkey.de/?p=plugin.video.netflix.git;a=blobdiff_plain;f=addon.py;h=9e7a68af2dab0dd3f08fa422c16d189101a09af2;hp=6ac0874d7522bb0b6b0b31ef44ae7d3ba80eccc2;hb=8ba617cc3e63a64aabd1eb98aebafcff85f540db;hpb=85447a5fdfc7dff80e2272d77a5f94c0eddff1af diff --git a/addon.py b/addon.py index 6ac0874..9e7a68a 100644 --- a/addon.py +++ b/addon.py @@ -3,20 +3,10 @@ # Module: default # Created on: 13.01.2017 -# import local classes -if __package__ is None: - import sys - import os - sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) - from resources.lib.NetflixSession import NetflixSession - from resources.lib.KodiHelper import KodiHelper - from resources.lib.Navigation import Navigation - from resources.lib.Library import Library -else: - from .resources.lib.NetflixSession import NetflixSession - from .resources.lib.KodiHelper import KodiHelper - from .resources.lib.Navigation import Navigation - from .resources.lib.Library import Library +import sys +from resources.lib.KodiHelper import KodiHelper +from resources.lib.Navigation import Navigation +from resources.lib.Library import Library # Setup plugin plugin_handle = int(sys.argv[1]) @@ -27,20 +17,12 @@ kodi_helper = KodiHelper( plugin_handle=plugin_handle, base_url=base_url ) -netflix_session = NetflixSession( - cookie_path=kodi_helper.cookie_path, - data_path=kodi_helper.data_path, - log_fn=kodi_helper.log -) library = Library( - base_url=base_url, - #root_folder=kodi_helper.base_data_path, - root_folder='/Users/asciidisco/Desktop/lib', + root_folder=kodi_helper.base_data_path, library_settings=kodi_helper.get_custom_library_settings(), log_fn=kodi_helper.log ) navigation = Navigation( - netflix_session=netflix_session, kodi_helper=kodi_helper, library=library, base_url=base_url, @@ -51,4 +33,5 @@ kodi_helper.set_library(library=library) if __name__ == '__main__': # Call the router function and pass the plugin call parameters to it. # We use string slicing to trim the leading '?' from the plugin call paramstring + kodi_helper.log('Started (Version ' + kodi_helper.version + ')') navigation.router(paramstring=sys.argv[2][1:])