Merge branch 'develop'

README.md

@@ -148,10 +148,10 @@ Die Installation dieser Bibliotheken unter Debian/Ubuntu erfolgt durch Eingabe f
 ````
 Python 2:
 sudo apt install python-pip
-pip install mysql-connector==2.2.9
+pip install mysql-connector-python
 Python 3:
 sudo apt install python3-pip
-pip3 install mysql-connector==2.2.9
+pip3 install mysql-connector-python
 ````
 
 Das Aktualisierungsprogramm heisst `mvupdate` (`mvupdate3` für Python 3) und liegt im Hauptverzeichnis
@@ -321,10 +321,10 @@ The required library can be installed via pip:
 ````
 Python 2:
 sudo apt install python-pip
-pip install mysql-connector==2.2.9
+pip install mysql-connector-python
 Python 3:
 sudo apt install python3-pip
-pip3 install mysql-connector==2.2.9
+pip3 install mysql-connector-python
 ````
 
 The update program is called `mvupdate` (`mvupdate3` for Python 3) and is located in the root directory
@@ -492,10 +492,10 @@ QUeste potranno essere istallate mediante il programma pip:
 ````
 Python 2:
 sudo apt install python-pip
-pip install mysql-connector==2.2.9
+pip install mysql-connector-python
 Python 3:
 sudo apt install python3-pip
-pip3 install mysql-connector==2.2.9
+pip3 install mysql-connector-python
 ````
 
 Il programma di aggiornamento si chiama `mvupdate` (`mvupdate3` per Python 3) e si trova nella directory

addon.kodi18.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.mediathekview"
 	name="MediathekView"
-	version="0.6.4"
+	version="0.6.5"
 	provider-name="MediathekView.de, Leo Moll">
 	<requires>
 		<import addon="xbmc.python" version="2.25.0"/>
@@ -23,7 +23,15 @@
 		<description lang="de_DE">Ermöglicht den Zugriff auf fast alle deutschen Mediatheken der öffentlich Rechtlichen basierend auf der Datenbank von MediathekView.de</description>
 		<description lang="en_GB">Gives access to most video-platforms from German public service broadcasters using the database of MediathekView.de</description>
 		<description lang="it_IT">Fornisce l'accesso a gran parte delle piattaforme video operate dalle emittenti pubbliche tedesche usando la banca dati di MediathekView.de</description>
-		<news>v.0.6.4 (2020-05-26):
+		<news>
+v.0.6.6 (2020-09-xx):
+- [fix] #175 fix for airdate 1969 (update mySql DB structure)
+- [other] #173 delay service startup by 10 sec to avoid error message 
+- [other] #171 / #170 improved memory usage
+- [new] #169 new sort order (airdate desc)
+- [new] define content type in settings to enable more skins
+- [new] Bulk insert for mySQL / update to latest mySql driver
+v.0.6.4 (2020-05-26):
 [fix]
 - #143 ijson issue on FireTvStick
 - #136 MySql caching_sha2_password issue
@@ -45,10 +53,6 @@
 - Python 3 compat
 - Kodi loglevel change (notice to info)
 - Add User Agent String for all request to fix issue with ORF
-v.0.6.2 (2019-03-10):
-- [fix] Implemented Workaround for broken gzip module support in Kodi 18 running on Android
-- [fix] Fixed crash in mvupdate tool when invoked with MySQL support
-- [new] Improved compatibility with future Kodi versions with Python 3 support
 </news>
 		<platform>all</platform>
 		<language>de fr</language>

addon.kodi19.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.mediathekview"
 	name="MediathekView"
-	version="0.6.4+matrix.1"
+	version="0.6.5+matrix.1"
 	provider-name="MediathekView.de, Leo Moll">
 	<requires>
 		<import addon="xbmc.python" version="3.0.0"/>
@@ -22,7 +22,15 @@
 		<description lang="de_DE">Ermöglicht den Zugriff auf fast alle deutschen Mediatheken der öffentlich Rechtlichen basierend auf der Datenbank von MediathekView.de</description>
 		<description lang="en_GB">Gives access to most video-platforms from German public service broadcasters using the database of MediathekView.de</description>
 		<description lang="it_IT">Fornisce l'accesso a gran parte delle piattaforme video operate dalle emittenti pubbliche tedesche usando la banca dati di MediathekView.de</description>
-		<news>v.0.6.4 (2020-05-26):
+		<news>
+v.0.6.6 (2020-09-xx):
+- [fix] #175 fix for airdate 1969 (update mySql DB structure)
+- [other] #173 delay service startup by 10 sec to avoid error message 
+- [other] #171 / #170 improved memory usage
+- [new] #169 new sort order (airdate desc)
+- [new] define content type in settings to enable more skins
+- [new] Bulk insert for mySQL / update to latest mySql driver
+v.0.6.4 (2020-05-26):
 [fix]
 - #143 ijson issue on FireTvStick
 - #136 MySql caching_sha2_password issue
@@ -44,10 +52,6 @@
 - Python 3 compat
 - Kodi loglevel change (notice to info)
 - Add User Agent String for all request to fix issue with ORF
-v.0.6.2 (2019-03-10):
-- [fix] Implemented Workaround for broken gzip module support in Kodi 18 running on Android
-- [fix] Fixed crash in mvupdate tool when invoked with MySQL support
-- [new] Improved compatibility with future Kodi versions with Python 3 support
 </news>
 		<platform>all</platform>
 		<language>de fr</language>

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.mediathekview"
 	name="MediathekView"
-	version="0.6.4"
+	version="0.6.5"
 	provider-name="MediathekView.de, Leo Moll">
 	<requires>
 		<import addon="xbmc.python" version="2.25.0"/>
@@ -23,7 +23,15 @@
 		<description lang="de_DE">Ermöglicht den Zugriff auf fast alle deutschen Mediatheken der öffentlich Rechtlichen basierend auf der Datenbank von MediathekView.de</description>
 		<description lang="en_GB">Gives access to most video-platforms from German public service broadcasters using the database of MediathekView.de</description>
 		<description lang="it_IT">Fornisce l'accesso a gran parte delle piattaforme video operate dalle emittenti pubbliche tedesche usando la banca dati di MediathekView.de</description>
-		<news>v.0.6.4 (2020-05-26):
+		<news>
+v.0.6.6 (2020-09-xx):
+- [fix] #175 fix for airdate 1969 (update mySql DB structure)
+- [other] #173 delay service startup by 10 sec to avoid error message 
+- [other] #171 / #170 improved memory usage
+- [new] #169 new sort order (airdate desc)
+- [new] define content type in settings to enable more skins
+- [new] Bulk insert for mySQL / update to latest mySql driver
+v.0.6.4 (2020-05-26):
 [fix]
 - #143 ijson issue on FireTvStick
 - #136 MySql caching_sha2_password issue
@@ -45,10 +53,6 @@
 - Python 3 compat
 - Kodi loglevel change (notice to info)
 - Add User Agent String for all request to fix issue with ORF
-v.0.6.2 (2019-03-10):
-- [fix] Implemented Workaround for broken gzip module support in Kodi 18 running on Android
-- [fix] Fixed crash in mvupdate tool when invoked with MySQL support
-- [new] Improved compatibility with future Kodi versions with Python 3 support
 </news>
 		<platform>all</platform>
 		<language>de fr</language>

resources/language/resource.language.de_de/strings.po

@@ -90,6 +90,30 @@ msgctxt "#30124"
 msgid "Sort by duration"
 msgstr "Dauer"
 
+msgctxt "#30130"
+msgid "Content Type Filmliste"
+msgstr "Content Type Filmliste"
+
+msgctxt "#30131"
+msgid "none"
+msgstr "none"
+
+msgctxt "#30132"
+msgid "videos"
+msgstr "videos"
+
+msgctxt "#30133"
+msgid "movies"
+msgstr "movies"
+
+msgctxt "#30134"
+msgid "episodes"
+msgstr "episodes"
+
+msgctxt "#30135"
+msgid "tvshows"
+msgstr "tvshows"
+
 msgctxt "#30171"
 msgid "Aired Date"
 msgstr "Sendedatum"
@@ -98,6 +122,10 @@ msgctxt "#30172"
 msgid "Added to Database"
 msgstr "Hinzugefügt zur Datenbank"
 
+msgctxt "#30173"
+msgid "Default"
+msgstr "Default"
+
 # Settings Page 2
 msgctxt "#30210"
 msgid "Database type"
@@ -462,5 +490,5 @@ msgid "Cannot retrieve Movie Information"
 msgstr "Es war nicht möglich die Sendung zu finden"
 
 msgctxt "#30990"
-msgid "Airdate: [COLOR chartreuse]{0:s}[/COLOR][CR][CR]"
-msgstr "Ausgestrahlt: [COLOR chartreuse]{0:s}[/COLOR][CR][CR]"
+msgid "Airdate: {0:s}[CR][CR]"
+msgstr "Ausgestrahlt: {0:s}[CR][CR]"

resources/language/resource.language.en_gb/strings.po

@@ -90,6 +90,30 @@ msgctxt "#30124"
 msgid "Sort by duration"
 msgstr "Duration"
 
+msgctxt "#30130"
+msgid "Content Type Movie list"
+msgstr "Content Type Movie list"
+
+msgctxt "#30131"
+msgid "none"
+msgstr "none"
+
+msgctxt "#30132"
+msgid "videos"
+msgstr "videos"
+
+msgctxt "#30133"
+msgid "movies"
+msgstr "movies"
+
+msgctxt "#30134"
+msgid "episodes"
+msgstr "episodes"
+
+msgctxt "#30135"
+msgid "tvshows"
+msgstr "tvshows"
+
 msgctxt "#30171"
 msgid "Aired Date"
 msgstr "Aired Date"
@@ -98,6 +122,10 @@ msgctxt "#30172"
 msgid "Added to Database"
 msgstr "Added to Database"
 
+msgctxt "#30173"
+msgid "Default"
+msgstr "Default"
+
 # Settings Page 2
 msgctxt "#30210"
 msgid "Database type"
@@ -462,5 +490,5 @@ msgid "Cannot retrieve Movie Information"
 msgstr "Cannot retrieve Movie Information"
 
 msgctxt "#30990"
-msgid "Airdate: [COLOR chartreuse]{0:s}[/COLOR][CR][CR]"
-msgstr "Airdate: [COLOR chartreuse]{0:s}[/COLOR][CR][CR]"
+msgid "Airdate: {0:s}[CR][CR]"
+msgstr "Ausgestrahlt: {0:s}[CR][CR]"

resources/language/resource.language.it_it/strings.po

@@ -90,6 +90,30 @@ msgctxt "#30124"
 msgid "Sort by duration"
 msgstr "Ordina per durata"
 
+msgctxt "#30130"
+msgid "Content Type Elenco Dei Film"
+msgstr "Content Type Elenco Dei FFilm"
+
+msgctxt "#30131"
+msgid "none"
+msgstr "none"
+
+msgctxt "#30132"
+msgid "videos"
+msgstr "videos"
+
+msgctxt "#30133"
+msgid "movies"
+msgstr "movies"
+
+msgctxt "#30134"
+msgid "episodes"
+msgstr "episodes"
+
+msgctxt "#30135"
+msgid "tvshows"
+msgstr "tvshows"
+
 msgctxt "#30171"
 msgid "Aired Date"
 msgstr "Data di Trasmissione"
@@ -98,6 +122,10 @@ msgctxt "#30172"
 msgid "Added to Database"
 msgstr "Entrata nel database"
 
+msgctxt "#30173"
+msgid "Default"
+msgstr "Default"
+
 # Settings Page 2
 msgctxt "#30210"
 msgid "Database type"
@@ -463,5 +491,5 @@ msgid "Cannot retrieve Movie Information"
 msgstr "Non è stato possibile trovare il film"
 
 msgctxt "#30990"
-msgid "Airdate: [COLOR chartreuse]{0:s}[/COLOR][CR][CR]"
-msgstr "In onda: [COLOR chartreuse]{0:s}[/COLOR][CR][CR]"
+msgid "Airdate: {0:s}[CR][CR]"
+msgstr "Ausgestrahlt: {0:s}[CR][CR]"

resources/lib/channelui.py

@@ -45,6 +45,7 @@ def begin(self):
         """
         for method in self.sortmethods:
             xbmcplugin.addSortMethod(self.handle, method)
+        xbmcplugin.setContent(self.handle, '')
 
     def add(self, altname=None):
         """

resources/lib/filmui.py

@@ -43,6 +43,7 @@ def __init__(self, plugin, sortmethods=None):
         # define sortmethod for films
         # all av. sort method and put the default sortmethod on first place to be used by UI
         allSortMethods = [
+            xbmcplugin.SORT_METHOD_UNSORTED,
             xbmcplugin.SORT_METHOD_TITLE,
             xbmcplugin.SORT_METHOD_DATE,
             xbmcplugin.SORT_METHOD_DATEADDED,
@@ -73,9 +74,9 @@ def begin(self, showshows, showchannels):
         """
         self.showshows = showshows
         self.showchannels = showchannels
-        # xbmcplugin.setContent( self.handle, 'tvshows' )
         for method in self.sortmethods:
             xbmcplugin.addSortMethod(self.handle, method)
+        xbmcplugin.setContent(self.handle, self.settings.contentType)
 
     def add(self, alttitle=None, total_items=None):
         """

resources/lib/initialui.py

@@ -44,6 +44,7 @@ def begin(self, channelid):
         self.channelid = channelid
         for method in self.sortmethods:
             xbmcplugin.addSortMethod(self.handle, method)
+        xbmcplugin.setContent(self.handle, '')
 
     def add(self, altname=None):
         """

resources/lib/kodi/kodiaddon.py

@@ -10,6 +10,7 @@
 
 # pylint: disable=import-error
 import xbmc
+import xbmcvfs
 import xbmcgui
 import xbmcaddon
 import xbmcplugin
@@ -36,11 +37,25 @@ def __init__(self):
         self.icon = self.addon.getAddonInfo('icon')
         self.fanart = self.addon.getAddonInfo('fanart')
         self.version = self.addon.getAddonInfo('version')
-        self.path = mvutils.py2_decode(self.addon.getAddonInfo('path')) ##TODO self.unicodePath = unicode(self.path, 'utf-8')
-        self.datapath = mvutils.py2_decode(xbmc.translatePath(self.addon.getAddonInfo('profile'))) ### TODO.decode('utf-8')
+        self.path = mvutils.py2_decode(self.addon.getAddonInfo('path'))
+        ##
+        if self.getKodiVersion() > 18:
+            self.datapath = mvutils.py2_decode(xbmcvfs.translatePath(self.addon.getAddonInfo('profile')))
+        else:
+            self.datapath = mvutils.py2_decode(xbmc.translatePath(self.addon.getAddonInfo('profile')))
+        ##
         self.language = self.addon.getLocalizedString
         KodiLogger.__init__(self, self.addon_id, self.version)
 
+    def getKodiVersion(self):
+        """
+        Get Kodi major version
+        Returns:
+            int: Kodi major version (e.g. 18)
+        """
+        xbmc_version = xbmc.getInfoLabel("System.BuildVersion")
+        return int(xbmc_version.split('-')[0].split('.')[0])
+
     def get_addon_info(self, info_id):
         """
         Returns the value of an addon property as a string.