chore(performance): Further speed up of imports

diff --git a/addon.py b/addon.py
index 55c918cb240216a3cacf67e36edd5764ded57711..5b2d7e8faa90381dbdd61a81e5d8a69fcccfbf59 100644 (file)
--- a/addon.py
+++ b/addon.py
@@ -3,8 +3,6 @@
 # Module: default
 # Created on: 13.01.2017
 
-# import local classes
-
 import sys
 from resources.lib.NetflixSession import NetflixSession
 from resources.lib.KodiHelper import KodiHelper

diff --git a/addon.xml b/addon.xml
index f301981973b7abcb1a71b875807185367b86e805..920b7c135e7d08f388852dcecb30d9eb859c3d7f 100644 (file)
--- a/addon.xml
+++ b/addon.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.netflix" name="Netflix" version="0.9.10" provider-name="libdev + jojo + asciidisco">
+<addon id="plugin.video.netflix" name="Netflix" version="0.9.11" provider-name="libdev + jojo + asciidisco">
   <requires>
     <import addon="xbmc.python" version="2.24.0"/>
     <import addon="script.module.beautifulsoup4" version="4.3.2"/>
     <import addon="script.module.requests" version="2.12.4"/>
     <import addon="script.module.pycryptodome" version="3.4.3"/>
-    <import addon="script.module.simplejson" version="3.3.0"/>
   </requires>
   <extension point="xbmc.python.pluginsource" library="addon.py">
     <provides>video</provides>

diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po
index 89d8e2a2f91d592e1c2aaf1b857f771b41294dd0..cfa6cd0057bb2b97dc4dcbadf353ddc206d79848 100644 (file)
--- a/resources/language/English/strings.po
+++ b/resources/language/English/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.9.10
+# Addon version: 0.9.11
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""

diff --git a/resources/language/German/strings.po b/resources/language/German/strings.po
index 28a8569a73c2182abbbdd604961c7b8c0c5be64a..494840cf00d38388c52dc46e95c54ba5165f3e20 100644 (file)
--- a/resources/language/German/strings.po
+++ b/resources/language/German/strings.po
@@ -1,7 +1,7 @@
 # Kodi Media Center language file
 # Addon Name: Netflix
 # Addon id: plugin.video.netflix
-# Addon version: 0.9.10
+# Addon version: 0.9.11
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""

diff --git a/resources/lib/KodiHelper.py b/resources/lib/KodiHelper.py
index 94516caf1868718b68f920efa3e572d7594d334a..7386ece24a4c9562c86f6023ea6125e95a5f2587 100644 (file)
--- a/resources/lib/KodiHelper.py
+++ b/resources/lib/KodiHelper.py
@@ -3,14 +3,14 @@
 # Module: KodiHelper
 # Created on: 13.01.2017
 
-import os
-import urllib
 import xbmcplugin
 import xbmcgui
-import xbmcaddon
 import xbmc
 import json
-import uuid
+from os.path import join
+from urllib import urlencode
+from xbmcaddon import Addon
+from uuid import uuid4
 from UniversalAnalytics import Tracker
 try:
    import cPickle as pickle
@@ -33,14 +33,14 @@ class KodiHelper:
         """
         self.plugin_handle = plugin_handle
         self.base_url = base_url
-        self.addon = xbmcaddon.Addon()
+        self.addon = Addon()
         self.plugin = self.addon.getAddonInfo('name')
         self.base_data_path = xbmc.translatePath(self.addon.getAddonInfo('profile'))
         self.home_path = xbmc.translatePath('special://home')
         self.plugin_path = self.addon.getAddonInfo('path')
         self.cookie_path = self.base_data_path + 'COOKIE'
         self.data_path = self.base_data_path + 'DATA'
-        self.config_path = os.path.join(self.base_data_path, 'config')
+        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')
@@ -801,7 +801,7 @@ class KodiHelper:
         entry_keys = entry.keys()
 
         # action item templates
-        encoded_title = urllib.urlencode({'title': entry['title'].encode('utf-8')}) if 'title' in entry else ''
+        encoded_title = urlencode({'title': entry['title'].encode('utf-8')}) if 'title' in entry else ''
         url_tmpl = 'XBMC.RunPlugin(' + self.base_url + '?action=%action%&id=' + str(entry['id']) + '&' + encoded_title + ')'
         actions = [
             ['export_to_library', self.get_local_string(30018), 'export'],
@@ -922,7 +922,7 @@ class KodiHelper:
             #Get or Create Tracking id
             tracking_id = self.addon.getSetting('tracking_id')
             if tracking_id is '':
-                tracking_id = str(uuid.uuid4())
+                tracking_id = str(uuid4())
                 self.addon.setSetting('tracking_id', tracking_id)
             # Send the tracking event
             tracker = Tracker.create('UA-46081640-5', client_id=tracking_id)

diff --git a/resources/lib/Library.py b/resources/lib/Library.py
index 3dd8475226dc1ad7e91d92a6b073d9afbfc5aed4..0d70ad3c359c95abb9187f7d8ad237b9bc161005 100644 (file)
--- a/resources/lib/Library.py
+++ b/resources/lib/Library.py
@@ -4,12 +4,12 @@
 # Created on: 13.01.2017
 
 import os
-import shutil
+from shutil import rmtree
+from utils import noop
 try:
    import cPickle as pickle
 except:
    import pickle
-from utils import noop
 
 class Library:
     """Exports Netflix shows & movies to a local library folder"""
@@ -348,7 +348,7 @@ class Library:
         self._update_local_db(filename=self.db_filepath, db=self.db)
         dirname = os.path.join(self.movie_path, folder)
         if os.path.exists(dirname):
-            shutil.rmtree(dirname)
+            rmtree(dirname)
             return True
         return False
 
@@ -370,7 +370,7 @@ class Library:
         self._update_local_db(filename=self.db_filepath, db=self.db)
         show_dir = os.path.join(self.tvshow_path, folder)
         if os.path.exists(show_dir):
-            shutil.rmtree(show_dir)
+            rmtree(show_dir)
             return True
         return False
 

diff --git a/resources/lib/Navigation.py b/resources/lib/Navigation.py
index 79efa598d22ec16fd6dec18aa78ede59b447abc8..d4d3f7f3593f8b10f0b208cedf53df94bc3d7e08 100644 (file)
--- a/resources/lib/Navigation.py
+++ b/resources/lib/Navigation.py
@@ -3,11 +3,9 @@
 # Module: Navigation
 # Created on: 13.01.2017
 
-import urllib
-import time
+from urllib import urlencode, unquote
 from urlparse import parse_qsl
-from utils import noop
-from utils import log
+from utils import noop, log
 
 class Navigation:
     """Routes to the correct subfolder, dispatches actions & acts as a controller for the Kodi view & the Netflix model"""
@@ -95,7 +93,7 @@ class Navigation:
             return self.add_to_list(video_id=params['id'])
         elif params['action'] == 'export':
             # adds a title to the users list on Netflix
-            alt_title = self.kodi_helper.show_add_to_library_title_dialog(original_title=urllib.unquote(params['title']).decode('utf8'))
+            alt_title = self.kodi_helper.show_add_to_library_title_dialog(original_title=unquote(params['title']).decode('utf8'))
             return self.export_to_library(video_id=params['id'], alt_title=alt_title)
         elif params['action'] == 'remove':
             # adds a title to the users list on Netflix
@@ -543,4 +541,4 @@ class Navigation:
         str
             Url + querystring based on the param
         """
-        return self.base_url + '?' + urllib.urlencode(query)
+        return self.base_url + '?' + urlencode(query)

diff --git a/resources/lib/NetflixSession.py b/resources/lib/NetflixSession.py
index a96fae6f9b400b310e25120c27b222e3f827a9fd..0ad98b1757fe24170a0f34ff4707a971cb345bb6 100644 (file)
--- a/resources/lib/NetflixSession.py
+++ b/resources/lib/NetflixSession.py
@@ -4,17 +4,17 @@
 # Created on: 13.01.2017
 
 import os
-import base64
-import time
-import urllib
 import json
-import requests
+from requests import session, cookies
+from urllib import quote
+from time import time
+from base64 import urlsafe_b64encode
+from bs4 import BeautifulSoup, SoupStrainer
+from utils import noop
 try:
    import cPickle as pickle
 except:
    import pickle
-from bs4 import BeautifulSoup, SoupStrainer
-from utils import noop
 
 class NetflixSession:
     """Helps with login/session management of Netflix users & API data fetching"""
@@ -100,7 +100,7 @@ class NetflixSession:
         self.log = log_fn
 
         # start session, fake chrome on the current platform (so that we get a proper widevine esn) & enable gzip
-        self.session = requests.session()
+        self.session = session()
         self.session.headers.update({
             'User-Agent': self._get_user_agent_for_current_platform(),
             'Accept-Encoding': 'gzip'
@@ -272,7 +272,7 @@ class NetflixSession:
         """
         payload = {
             'switchProfileGuid': profile_id,
-            '_': int(time.time()),
+            '_': int(time()),
             'authURL': self.user_data['authURL']
         }
 
@@ -1295,7 +1295,7 @@ class NetflixSession:
             'toRow': list_to,
             'opaqueImageExtension': 'jpg',
             'transparentImageExtension': 'png',
-            '_': int(time.time()),
+            '_': int(time()),
             'authURL': self.user_data['authURL']
         }
         response = self._session_get(component='video_list_ids', params=payload, type='api')
@@ -1321,7 +1321,7 @@ class NetflixSession:
             Raw Netflix API call response or api call error
         """
         # properly encode the search string
-        encoded_search_string = urllib.quote(search_str)
+        encoded_search_string = quote(search_str)
 
         paths = [
             ['search', encoded_search_string, 'titles', {'from': list_from, 'to': list_to}, ['summary', 'title']],
@@ -1424,7 +1424,7 @@ class NetflixSession:
         payload = {
             'movieid': id,
             'imageformat': 'jpg',
-            '_': int(time.time())
+            '_': int(time())
         }
         response = self._session_get(component='metadata', params=payload, type='api')
         return self._process_response(response=response, component=self._get_api_url_for(component='metadata'))
@@ -1813,10 +1813,10 @@ class NetflixSession:
             return False
 
         with open(filename) as f:
-            cookies = pickle.load(f)
-            if cookies:
-                jar = requests.cookies.RequestsCookieJar()
-                jar._cookies = cookies
+            _cookies = pickle.load(f)
+            if _cookies:
+                jar = cookies.RequestsCookieJar()
+                jar._cookies = _cookies
                 self.session.cookies = jar
             else:
                 return False
@@ -1849,7 +1849,7 @@ class NetflixSession:
         :obj:`str`
             Account data hash
         """
-        return base64.urlsafe_b64encode(account['email'])
+        return urlsafe_b64encode(account['email'])
 
     def _get_user_agent_for_current_platform (self):
         """Determines the user agent string for the current platform (to retrieve a valid ESN)
@@ -1895,9 +1895,9 @@ class NetflixSession:
                 Contents of the field to match
         """
         url = self._get_document_url_for(component=component) if type == 'document' else self._get_api_url_for(component=component)
-        start = time.time()
+        start = time()
         response = self.session.post(url=url, data=data, params=params, headers=headers, verify=self.verify_ssl)
-        end = time.time()
+        end = time()
         self.log('[POST] Request for "' + url + '" took ' + str(end - start) + ' seconds')
         return response
 
@@ -1921,9 +1921,9 @@ class NetflixSession:
                 Contents of the field to match
         """
         url = self._get_document_url_for(component=component) if type == 'document' else self._get_api_url_for(component=component)
-        start = time.time()
+        start = time()
         response = self.session.get(url=url, verify=self.verify_ssl, params=params)
-        end = time.time()
+        end = time()
         self.log('[GET] Request for "' + url + '" took ' + str(end - start) + ' seconds')
         return response
 

diff --git a/service.py b/service.py
index b6abc1b8e8ed11e98aa9f1078fe43c166e55f92f..1829fbd9d4e5848d22f6a5c9c55bdb374fb9f67e 100644 (file)
--- a/service.py
+++ b/service.py
@@ -12,7 +12,6 @@ kodi_helper = KodiHelper(
     base_url=None
 )
 
-
 def select_unused_port():
     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     sock.bind(('localhost', 0))