Final fixes for 0.6.0

mediathekview · Mar 1, 2019 · abc8a38 · abc8a38
1 parent 7372aba
commit abc8a38
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/addon.xml b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.mediathekview"
 	name="MediathekView"
-	version="0.5.9"
+	version="0.6.0"
 	provider-name="MediathekView.de, Leo Moll">
 	<requires>
 		<import addon="xbmc.python" version="2.25.0"/>
@@ -26,7 +26,7 @@
 		<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>v0.6.0 (2019-03-XX):
+		<news>v0.6.0 (2019-03-01):
 - Feature: Cache der Anfragen für lokale Datenbanken
 - Feature: Natives ultraschnelles Update für SQLite
 - Bugfix: Live Streams konnten heruntergeladen werden

diff --git a/resources/lib/plugin.py b/resources/lib/plugin.py
@@ -318,9 +318,8 @@ def run(self):
             Downloader(self).play_movie_with_subs(filmid)
 
         # cleanup saved searches
-        if mode is None or mode != 'search':
+        if mode is None or mode != 'newsearch':
             self.set_setting('lastsearch1', '')
-        if mode is None or mode != 'searchall':
             self.set_setting('lastsearch2', '')
 
     def exit(self):

diff --git a/resources/lib/storesqlite.py b/resources/lib/storesqlite.py
@@ -288,9 +288,9 @@ def get_shows(self, channelid, initial, showui, caching=True):
             elif channelid == 0:
                 cache_condition = "SHOW:2:" + initial
             elif initial:
-                cache_condition = "SHOW:3:" + channelid + ':' + initial
-            elif initial:
-                cache_condition = "SHOW:3:" + channelid
+                cache_condition = "SHOW:3:" + str(channelid) + ':' + initial
+            else:
+                cache_condition = "SHOW:3:" + str(channelid)
             cached_data = self._load_cache('get_shows', cache_condition)
             if cached_data is not None:
                 showui.begin(channelid)