chore(cleanup): Adhere to Kodi addon guidelines

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.netflix" name="Netflix" version="0.12.0" provider-name="libdev + jojo + asciidisco">
   <requires>
-    <import addon="xbmc.python" version="2.24.0"/>
+    <import addon="xbmc.python" version="2.25.0"/>
     <import addon="script.module.requests" version="2.12.4"/>
     <import addon="script.module.pycryptodome" version="3.4.3"/>
     <import addon="inputstream.adaptive" version="2.0.0"/>
@@ -11,23 +11,25 @@
   </extension>
   <extension point="xbmc.service" library="service.py" start="login" />
   <extension point="xbmc.addon.metadata">
-    <summary lang="de">Netflix</summary>
-    <description lang="de">Addon für Netflix VOD Services</description>
-    <disclaimer lang="de">Möglicherweise sind einge Teile dieses Addons in Ihrem Land illegal, Sie sollten dies unbedingt vor der Installation überprüfen.</disclaimer>
-    <summary lang="en">Netflix</summary>
-    <description lang="en">Netflix VOD Services Addon</description>
-    <disclaimer lang="en">Some parts of this addon may not be legal in your country of residence - please check with your local laws before installing.</disclaimer>
+    <summary lang="de_DE">Netflix</summary>
+    <description lang="de_DE">Addon für Netflix VOD Services</description>
+    <disclaimer lang="de_DE">Möglicherweise sind einge Teile dieses Addons in Ihrem Land illegal, Sie sollten dies unbedingt vor der Installation überprüfen.</disclaimer>
+    <summary lang="en_GB">Netflix</summary>
+    <description lang="en_GB">Netflix VOD Services Addon</description>
+    <disclaimer lang="en_GB">Some parts of this addon may not be legal in your country of residence - please check with your local laws before installing.</disclaimer>
     <assets>
       <icon>resources\icon.png</icon>
       <fanart>resources\fanart.jpg</fanart>
       <screenshot>resources\screenshot-01.jpg</screenshot>
       <screenshot>resources\screenshot-02.jpg</screenshot>
       <screenshot>resources\screenshot-03.jpg</screenshot>
     </assets>
+    <language>en de</language>
     <platform>all</platform>
     <license>MIT</license>
+    <website>https://www.netflix.com</website>
     <email>public at asciidisco dot com</email>
-    <forum>http://www.kodinerds.net/index.php/Thread/55607-Inputstream-Agile-Betatest-Netflix/</forum>
+    <forum>https://www.kodinerds.net/index.php/Thread/55612-PreRelease-Plugin-Netflix-Inputstream/</forum>
     <source>https://github.com/asciidisco/plugin.video.netflix</source>
     <news>v0.12.0 (2017-10-10)
 - Polish, English, German transaltion update

docs/conf.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# plugin.video.telekom-sport documentation build configuration file, created by
+# plugin.video.netflix documentation build configuration file, created by
 # sphinx-quickstart on Wed Apr 26 16:27:25 2017.
 
 
@@ -18,42 +18,7 @@
 sys.path.insert(0, ROOT_PATH + 'resources' + os.path.sep)
 sys.path.insert(0, ROOT_PATH + 'resources' + os.path.sep + 'lib' + os.path.sep)
 
-def get_addon_data():
-    """Loads the Kodi plugin data from addon.xml"""
-    root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    pathname = os.path.join(root_dir, 'addon.xml')
-    with open(pathname, 'rb') as addon_xml:
-        addon_xml_contents = addon_xml.read()
-        _id = re.search(
-            r'(?<!xml )id="(.+?)"',
-            addon_xml_contents).group(1)
-        author = re.search(
-            r'(?<!xml )provider-name="(.+?)"',
-            addon_xml_contents).group(1)
-        name = re.search(
-            r'(?<!xml )name="(.+?)"',
-            addon_xml_contents).group(1)
-        version = re.search(
-            r'(?<!xml )version="(.+?)"',
-            addon_xml_contents).group(1)
-        desc = re.search(
-            r'(?<!xml )description lang="en">(.+?)<',
-            addon_xml_contents).group(1)
-        email = re.search(
-            r'(?<!xml )email>(.+?)<',
-            addon_xml_contents).group(1)
-        source = re.search(
-            r'(?<!xml )source>(.+?)<',
-            addon_xml_contents).group(1)
-        return {
-            'id': _id,
-            'author': author,
-            'name': name,
-            'version': version,
-            'desc': desc,
-            'email': email,
-            'source': source,
-        }
+from setup import get_addon_data
 
 ADDON_DATA = get_addon_data()
 

makefile

@@ -10,8 +10,8 @@ COVERAGE_FILE = ./.coverage
 COVERAGE_DIR = ./coverage
 REPORT_DIR = ./report
 DOCS_DIR = ./docs
-FLAKE_FILES = ./addon.py ./resources/lib/utils.py
-RADON_FILES = resources/lib/*.py ./addon.py
+FLAKE_FILES = ./addon.py ./service.py ./resources/lib/utils.py
+RADON_FILES = resources/lib/*.py ./addon.py ./service.py
 LINT_REPORT_FILE = ./report/lint.html
 TEST_OPTIONS = -s --cover-package=resources.lib.utils --cover-package=resources.lib.NetflixSession  --cover-package=resources.lib.Navigation --cover-package=resources.lib.MSL --cover-package=resources.lib.KodiHelper --cover-package=resources.lib.Library --cover-package=resources.lib.KodiHelper --cover-package=resources.lib.Library --cover-package=resources.lib.NetflixHttpRequestHandler --cover-package=resources.lib.NetflixHttpSubRessourceHandler --cover-erase --with-coverage --cover-branches
 I18N_FILES = resources/language/**/*.po
@@ -38,8 +38,8 @@ clean-coverage:
 
 lint:
 		flake8 --filename=$(FLAKE_FILES)
-		pylint addon resources --ignore=test,UniversalAnalytics || exit 0		
-		pylint addon resources --ignore=test,UniversalAnalytics --output-format=html > $(LINT_REPORT_FILE)
+		pylint addon service resources --ignore=test,UniversalAnalytics || exit 0		
+		pylint addon service resources --ignore=test,UniversalAnalytics --output-format=html > $(LINT_REPORT_FILE)
 		radon cc $(RADON_FILES)
 		dennis-cmd lint $(I18N_FILES)
 		rst-lint docs/index.rst --level=severe