Refactor addon structure

Author: mediaminister

.travis.yml

@@ -10,7 +10,7 @@ python:
 sudo: false
 
 env:
-  PYTHONPATH: lib:test
+  PYTHONPATH: resources/lib:test
   PYTHONIOENCODING: utf-8
 
 install:
@@ -19,12 +19,12 @@ install:
 script:
 - tox
 - tox -e flake8
-- pylint lib/ test/
+- pylint resources/lib/ test/
 #- kodi-addon-checker . --branch=krypton
 #- kodi-addon-checker . --branch=leia
 - proxy.py &
 - coverage run -m unittest discover
-- coverage run -a default.py
+- coverage run -a resources/lib/default.py
 
 after_success:
 - codecov

Makefile

@@ -1,4 +1,4 @@
-export PYTHONPATH := $(CURDIR)/lib:$(CURDIR)/test
+export PYTHONPATH := $(CURDIR)/resources/lib:$(CURDIR)/test
 PYTHON := python
 
 name = $(shell xmllint --xpath 'string(/addon/@id)' addon.xml)
@@ -7,7 +7,7 @@ git_branch = $(shell git rev-parse --abbrev-ref HEAD)
 git_hash = $(shell git rev-parse --short HEAD)
 
 zip_name = $(name)-$(version)-$(git_branch)-$(git_hash).zip
-include_files = addon.xml changelog.txt default.py LICENSE.txt README.md lib/ resources/
+include_files = addon.xml changelog.txt default.py LICENSE.txt README.md resources/
 include_paths = $(patsubst %,$(name)/%,$(include_files))
 exclude_files = \*.new \*.orig \*.pyc \*.pyo
 zip_dir = $(name)/
@@ -34,7 +34,7 @@ tox:
 
 pylint:
 	@echo -e "$(white)=$(blue) Starting sanity pylint test$(reset)"
-	$(PYTHON) -m pylint -e useless-suppression lib/ test/
+	$(PYTHON) -m pylint -e useless-suppression resources/lib/ test/
 
 language:
 	@echo -e "$(white)=$(blue) Starting language test$(reset)"

addon.xml

@@ -5,10 +5,10 @@
     <import addon="script.module.pysocks" version="1.6.8" optional="true"/>
   </requires>
   <!-- This is needed to get an addon icon -->
-  <extension point="xbmc.python.script" library="default.py">
+  <extension point="xbmc.python.script" library="resources/lib/default.py">
     <provides>executable</provides>
   </extension>
-  <extension point="xbmc.python.module" library="lib"/>
+  <extension point="xbmc.python.module" library="resources/lib"/>
   <extension point="xbmc.addon.metadata">
     <summary lang="en_GB">Kodi InputStream and DRM playback made easy</summary>
     <summary lang="de_DE">Kodi InputStream und DRM Wiedergabe einfach gemacht</summary>

default.py

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# MIT License (see LICENSE.txt or https://opensource.org/licenses/MIT)
+"""InputStream Helper package"""
+__all__ = ['inputstreamhelper']

lib/__init__.py

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+"""This is the actual InputStream Helper API script entry point"""
+
+from __future__ import absolute_import, division, unicode_literals
+import sys
+from inputstreamhelper.api import run
+
+
+run(sys.argv)