v2.4.4

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.viaplay" version="2.4.3" name="Viaplay" provider-name="mariusz89b, emilsvennesson, heppen-dev">
+<addon id="plugin.video.viaplay" version="2.4.4" name="Viaplay" provider-name="mariusz89b, emilsvennesson, heppen-dev">
   <requires>
     <import addon="script.module.requests" version="2.9.1" />
     <import addon="script.module.iso8601" version="0.1.11" />
@@ -24,7 +24,11 @@
     <platform>all</platform>
     <license>GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 and MIT LICENSE.</license>
     <source>https://github.com/Mariusz89B/plugin.video.viaplay</source>
-    <news>v2.4.3 (2023-03-06)
+    <news>v2.4.4 (2023-03-12)
+- Fixed bug when returning from search.
+- Added option to enable/disable synchronization. 
+
+v2.4.3 (2023-03-06)
 - Added profile selector.
 - Added supported countries.
 - Added synchronization with watched list.

changelog.txt

@@ -1,3 +1,7 @@
+v2.4.4 (2023-03-12)
+- Fixed bug when returning from search.
+- Added option to enable/disable synchronization. 
+
 v2.4.3 (2023-03-06)
 - Added profile selector.
 - Added supported countries.

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

@@ -371,4 +371,8 @@ msgstr ""
 
 msgctxt "#30092"
 msgid "Remove watched content"
+msgstr ""
+
+msgctxt "#30093"
+msgid "Synchronize content"
 msgstr ""

resources/language/resource.language.pl_pl/strings.po

@@ -367,4 +367,8 @@ msgstr "Zawartość usunięto z listy"
 
 msgctxt "#30092"
 msgid "Remove watched content"
-msgstr "Usuń oglądaną zawartość"
+msgstr "Usuń oglądaną zawartość"
+
+msgctxt "#30093"
+msgid "Synchronize content"
+msgstr "Synchronizuj zawartość"

resources/language/resource.language.sv_se/strings.po

@@ -295,7 +295,7 @@ msgstr "Användarnamn"
 
 msgctxt "#30074"
 msgid "Password"
-msgstr "Användarnamn"
+msgstr "Lösenord"
 
 msgctxt "#30075"
 msgid "Wrong login credentials"
@@ -367,4 +367,8 @@ msgstr "Innehåll borttaget från listan"
 
 msgctxt "#30092"
 msgid "Remove watched content"
-msgstr "Ta bort sett innehåll"
+msgstr "Ta bort sett innehåll"
+
+msgctxt "#30093"
+msgid "Synchronize content"
+msgstr "Synkronisera innehåll"

resources/lib/addon.py

@@ -429,57 +429,73 @@ def start():
 
 @plugin.route('/search')
 def search():
-    file_name = os.path.join(profile_path, 'title_search.list')
-    f = xbmcvfs.File(file_name, "rb")
-    searches = sorted(f.read().splitlines())
-    f.close()
+    pages = helper.vp.get_root_page()
+    title = [x['title'] for x in pages if x['name'] == 'viaplay:search'][0]
 
-    actions = [helper.language(30079), helper.language(30080)] + searches
+    file_search = os.path.join(profile_path, 'last_search.list')
 
-    action = helper.dialog(dialog_type='select', heading=helper.language(30081), options=actions)
-    title = None
+    if xbmc.getInfoLabel('ListItem.Label') == title:
+        file_name = os.path.join(profile_path, 'title_search.list')
+        f = xbmcvfs.File(file_name, 'rb')
+        searches = sorted(f.read().splitlines())
+        f.close()
 
-    if action == -1:
-        return
-    elif action == 0:
-        pass
-    elif action == 1:
-        which = helper.dialog(dialog_type='multiselect', heading=helper.language(30080), options=searches)
-        if which is None:
-            return
-        else:
-            for item in reversed(which):
-                del searches[item]
+        actions = [helper.language(30079), helper.language(30080)] + searches
 
-            f = xbmcvfs.File(file_name, "wb")
-            if sys.version_info[0] < 3:
-                searches = [x.decode('utf-8') for x in searches]
-            f.write(bytearray('\n'.join(searches), 'utf-8'))
-            f.close()
+        action = helper.dialog(dialog_type='select', heading=helper.language(30081), options=actions)
+        title = None
+
+        if action == -1:
             return
-    else:
-        if searches:
-            title = searches[action - 2]
+        elif action == 0:
+            pass
+        elif action == 1:
+            which = helper.dialog(dialog_type='multiselect', heading=helper.language(30080), options=searches)
+            if which is None:
+                return
+            else:
+                for item in reversed(which):
+                    del searches[item]
+
+                f = xbmcvfs.File(file_name, 'wb')
+                if sys.version_info[0] < 3:
+                    searches = [x.decode('utf-8') for x in searches]
+                f.write(bytearray('\n'.join(searches), 'utf-8'))
+                f.close()
+                return
+        else:
+            if searches:
+                title = searches[action - 2]
 
-    if action == 0:
-        search = helper.get_user_input(helper.language(30015))
+        if action == 0:
+            search = helper.get_user_input(helper.language(30015))
 
-    else:
-        if sys.version_info[0] > 2:
-            search = title
         else:
-            search = title.encode('utf-8')
+            if sys.version_info[0] > 2:
+                search = title
+            else:
+                search = title.encode('utf-8')
 
-    if not search:
-        return
-    searches = (set([search] + searches))
-    f = xbmcvfs.File(file_name, "wb")
-    if sys.version_info[0] < 3:
-        searches = [x.decode('utf-8') for x in searches]
-    f.write(bytearray('\n'.join(searches), 'utf-8'))
-    f.close()
+        if not search:
+            return
+        searches = (set([search] + searches))
+        f = xbmcvfs.File(file_name, 'wb')
+        if sys.version_info[0] < 3:
+            searches = [x.decode('utf-8') for x in searches]
+        f.write(bytearray('\n'.join(searches), 'utf-8'))
+        f.close()
+
+        if search != '':
+            f = xbmcvfs.File(file_search, 'w')
+            f.write(search)
+            f.close()
+
+            list_products(plugin.args['url'][0], search_query=search)
+    else:
+        f = xbmcvfs.File(file_search, 'r')
+        search = f.read().splitlines()
+        f.close()
 
-    if search != '':
         list_products(plugin.args['url'][0], search_query=search)
 
 

resources/lib/viaplay.py

@@ -387,7 +387,8 @@ def get_stream(self, guid, pincode=None, tve='false', url=''):
             'position': 0
         }
 
-        response = self.make_request(url=url, method='post', payload=json.dumps(json_data), params=params, status=True)
+        if self.get_setting('synchronize'):
+            response = self.make_request(url=url, method='post', payload=json.dumps(json_data), params=params, status=True)
 
         if 'viaplay:media' in data['_links']:
             mpd_url = data['_links']['viaplay:media']['href']

resources/settings.xml

@@ -50,6 +50,11 @@
 					<default>false</default>
 					<control type="toggle"/>
 				</setting>
+				<setting help="" id="synchronize" label="30093" type="boolean">
+					<level>0</level>
+					<default>true</default>
+					<control type="toggle"/>
+				</setting>
 				<setting help="" id="subtitles" label="30012" type="boolean">
 					<level>0</level>
 					<default>true</default>