Merge pull request #4694 from dimkroon/matrix-viwx-172

[plugin.video.viwx] v1.7.2

Author: basrieter

plugin.video.viwx/addon.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.viwx" name="viwX" version="1.6.2" provider-name="Dimitri Kroon">
+<addon id="plugin.video.viwx" name="viwX" version="1.7.2" provider-name="Dimitri Kroon">
   <requires>
     <import addon="xbmc.python" version="3.0.0"/>
     <import addon="inputstream.adaptive" version="19.0.5"/>
     <import addon="script.module.requests" version="2.31.0"/>
-    <import addon="script.module.pytz" version="2023.3"/>
+    <import addon="script.module.backports.zoneinfo" version="0.2.1"/>
+    <import addon="script.module.tzdata" version="0.2.1"/>
     <import addon="script.module.tzlocal" version="5.0.1"/>
     <import addon="script.module.codequick" version="1.0.3"/>
     <import addon="script.module.inputstreamhelper" version="0.6.1"/>
@@ -16,7 +17,7 @@
     <platform>all</platform>
     <summary lang="en_GB">Live TV and video on-demand from ITVX (UK only, ITVX account required)</summary>
     <description lang="en_GB">
-      A Vibrant ITVX Web eXperience. Play live TV and video on-demand from the webservices of British broadcaster ITV. An ITVX account is required, either free or premium, to play any stream.[CR][CR]This add-on is not developed by ITV and is no way affiliated with, or endorsed by ITV.
+      A Vibrant ITVX Web eXperience. Play live TV and video on-demand from the webservices of British broadcaster ITV. An ITVX account is required, either free or premium, to play any stream.[CR][CR]This add-on is not developed by ITV and is in no way affiliated with, or endorsed by ITV.
     </description>
     <disclaimer lang="en_GB">
       This addon is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -30,9 +31,23 @@
       <fanart>resources/fanart.png</fanart>
     </assets>
     <news>
-[B]v 1.6.2[/B]
+[B]v1.7.2[/B]
 [B]Fixes:[/B]
-- Logging in to IVX account with username and password works again.
+- In some cases, Kodi continued to run the previous version for a while after the add-on was updated.
+- Short news clips fail to play in category News.
+- Support live items without start and end time.
+
+[B]v 1.7.1[/B]
+[B]Fixes:[/B]
+- Short sport clips fail to play with error 'Not Found'
+
+[B]v 1.7.0[/B]
+[B]New Features:[/B]
+- Optional full HD streams - must be enabled in settings, off by default.
+
+[B]Fixes:[/B]
+- Search with live items in the results failed.
+- Some episode listings failed.
     </news>
     <reuselanguageinvoker>true</reuselanguageinvoker>
   </extension>

plugin.video.viwx/changelog.txt

@@ -1,3 +1,21 @@
+v 1.7.2
+Fixes:
+- In some cases, Kodi continued to run the previous version for a while after the add-on was updated.
+- Short news clips fail to play in category News.
+- Support live items without start and end time.
+
+v 1.7.1
+Fixes:
+- Short sport clips fail to play with error 'Not Found'
+
+v 1.7.0
+New Features:
+- Optional full HD streams - must be enabled in settings, off by default.
+
+Fixes:
+- Search with live items in the results failed.
+- Some episode listings failed.
+
 v 1.6.2
 Fixes:
 - Logging in to IVX account with username and password works again.

plugin.video.viwx/resources/language/resource.language.en_gb/strings.po

@@ -73,6 +73,10 @@ msgctxt "#30121"
 msgid "Offer to play from the start"
 msgstr ""
 
+msgctxt "#30122"
+msgid "TV region"
+msgstr ""
+
 msgctxt "#30131"
 msgid "Install IPTV Manager"
 msgstr ""
@@ -85,6 +89,14 @@ msgctxt "#30133"
 msgid "Go to IPTV Manager settings"
 msgstr ""
 
+msgctxt "#30140"
+msgid "Stream quality"
+msgstr ""
+
+msgctxt "#30141"
+msgid "Enable full HD (1080p)"
+msgstr ""
+
 msgctxt "#30200"
 msgid "itvX account"
 msgstr ""
@@ -134,9 +146,9 @@ msgid "When a category or collection has more items than specified here, items w
 msgstr ""
 
 msgctxt "#30311"
-msgid "Target of itvX logging.\n"
+msgid "Target of viwX logging.\n"
 "Default is the standard 'Kodi log' - nothing will be logged until 'debug logging' is enabled in Kodi's settings.\n"
-"'File' logs to itvX's own log file stored in the addon's user data directory. Only of use if you know where to "
+"'File' logs to viwX's own log file stored in the addon's user data directory. Only of use if you know where to "
 "find that file.\n"
 "'No logging' if you want to ensure the addon spends as little time on logging as possible."
 msgstr ""
@@ -146,11 +158,21 @@ msgid "Show a dialog with the option to play the current program from the start
 "When disabled 'play form the start' is still available on the context menu of the main live channels."
 msgstr ""
 
+msgctxt "#30322"
+msgid "Region for local news and weather on ITV1.\n"
+"Only available when Full HD is enabled."
+msgstr ""
+
 msgctxt "#30332"
 msgid "It may take a few hours before this setting takes effect.\n"
 "To force an update, select 'Refresh channels and guide now' in IPTV Manager's settings. You may also need te restart Kodi."
 msgstr ""
 
+msgctxt "#30341"
+msgid "May not work on all devices.\n"
+"When streams don't play, switch off to revert back to 720p HD."
+msgstr ""
+
 msgctxt "#30401"
 msgid "You will be asked to enter your username and password after which the addon will try to sign in to "
 "your account. You will remain signed in until you sign out or sign in with another account."

plugin.video.viwx/resources/lib/cc_patch.py

@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------------------------------------------------
-#  Copyright (c) 2022-2023 Dimitri Kroon.
+#  Copyright (c) 2022-2025 Dimitri Kroon.
 #  This file is part of plugin.video.viwx.
 #  SPDX-License-Identifier: GPL-2.0-or-later
 #  See LICENSE.txt
@@ -53,4 +53,4 @@ def label_setter(self, label):
         self.params.setdefault("_title_", unformatted_label)
         self.info.setdefault("title", unformatted_label)
 
-    Listitem.label = Listitem.label.setter(label_setter)
+    Listitem.label = Listitem.label.setter(label_setter)  # type: ignore

plugin.video.viwx/resources/lib/fetch.py

@@ -5,6 +5,7 @@
 #  See LICENSE.txt
 # ----------------------------------------------------------------------------------------------------------------------
 
+from __future__ import annotations
 import os
 import logging
 import requests
@@ -74,7 +75,7 @@ class CustomHttpAdapter(HTTPAdapter):
     def init_poolmanager(self, *args, **kwargs):
         import urllib3
         import ssl
-        logger.info('Urllib3 version %s', urllib3.__version__)
+        logger.info('Urllib3 version %s', urllib3.__version__)  # type: ignore
         logger.info(ssl.OPENSSL_VERSION)
 
         ctx = ssl.create_default_context()
@@ -123,27 +124,10 @@ def request(
                 hooks=hooks, stream=stream, verify=verify, cert=cert, json=json)
 
         # noinspection PyUnresolvedReferences
-        self.cookies.save()
+        self.cookies.save()  # type: ignore
         return resp
 
 
-def convert_consent(cookiejar):
-    """Replace Cassie consent cookies for Syrenis.
-
-    """
-    # RequestCookieJar's items() returns a list of tuples
-    try:
-        for name, value in cookiejar.items():
-            if name.startswith("Cassie"):
-                del cookiejar[name]
-
-        set_default_cookies(cookiejar)
-        cookiejar.cassie_converted = True
-        cookiejar.save()
-    except:
-        logger.error("Error converting consent cookies:\n", exc_info=True)
-
-
 def _create_cookiejar():
     """Restore a cookiejar from file. If the file does not exist create new one and
     apply the default cookies.
@@ -159,17 +143,14 @@ def _create_cookiejar():
             # if the file has been copied from another system.
             cj.filename = cookie_file
             logger.info("Restored cookies from file")
-            if not getattr(cj, "cassie_converted", None):
-                convert_consent(cj)
-
     except (FileNotFoundError, pickle.UnpicklingError):
-        cj = set_default_cookies(PersistentCookieJar(cookie_file))
-        cj.cassie_converted = True
+        cj = PersistentCookieJar(cookie_file)
+        set_default_cookies(cj)
         logger.info("Created new cookiejar")
     return cj
 
 
-def set_default_cookies(cookiejar: RequestsCookieJar = None):
+def set_default_cookies(cookiejar: RequestsCookieJar | None = None):
     """Post a cookie consent form rejecting all cookies.
 
     On success, set the required consent and other cookies.
@@ -232,7 +213,10 @@ def set_default_cookies(cookiejar: RequestsCookieJar = None):
         # Set consent cookies to reject all.
         jar.set('SyrenisGuid_213aea86-31e5-43f3-8d6b-e01ba0d420c7', my_guid, **std_cookie_args)
         jar.set('SyrenisCookieFormConsent_213aea86-31e5-43f3-8d6b-e01ba0d420c7',
-                '[{"FieldID":"s122_c113","IsChecked":0},{"FieldID":"s135_c126","IsChecked":0},{"FieldID":"s134_c125","IsChecked":0},{"FieldID":"s138_c129","IsChecked":0},{"FieldID":"s157_c147","IsChecked":0},{"FieldID":"s136_c127","IsChecked":0},{"FieldID":"s137_c128","IsChecked":0}]',
+                '[{"FieldID":"s122_c113","IsChecked":0},{"FieldID":"s135_c126","IsChecked":0},'
+                '{"FieldID":"s134_c125","IsChecked":0},{"FieldID":"s138_c129","IsChecked":0},'
+                '{"FieldID":"s157_c147","IsChecked":0},{"FieldID":"s136_c127","IsChecked":0},'
+                '{"FieldID":"s137_c128","IsChecked":0}]',
                 **std_cookie_args)
         jar.set('SyrenisCookiePrivacyLink_213aea86-31e5-43f3-8d6b-e01ba0d420c7', '1', **std_cookie_args)
         jar.set('SyrenisCookieConsentDate_213aea86-31e5-43f3-8d6b-e01ba0d420c7',
@@ -260,6 +244,7 @@ def web_request(method, url, headers=None, data=None, **kwargs):
         resp.raise_for_status()
         return resp
     except requests.HTTPError as e:
+        resp = e.response
         # noinspection PyUnboundLocalVariable
         logger.info("HTTP error %s for url %s: '%s'",
                     e.response.status_code,

plugin.video.viwx/resources/lib/iptvmanager.py

@@ -16,24 +16,29 @@
 # Logo URLs from now/next.
 CHANNELS = {
     'ITV1': {'id': 'viwx.itv1',
-            'name': 'ITV1',
-            'logo': 'https://images.ctfassets.net/bd5zurrrnk1g/54OefyIkbiHPMJUYApbuUX/7dfe2176762fd8ec10f77cd61a318b07/itv1.png?w=512',
-            'preset': 1},
+             'name': 'ITV1',
+             'logo': 'https://images.ctfassets.net/bd5zurrrnk1g/'
+                     '54OefyIkbiHPMJUYApbuUX/7dfe2176762fd8ec10f77cd61a318b07/itv1.png?w=512',
+             'preset': 1},
     'ITV2': {'id': 'viwx.itv2',
              'name': 'ITV2',
-             'logo': 'https://images.ctfassets.net/bd5zurrrnk1g/aV9MOsYOMEXHx3iw0p4tk/57b35173231c4290ff199ef8573367ad/itv2.png?w=512',
+             'logo': 'https://images.ctfassets.net/bd5zurrrnk1g/'
+                     'aV9MOsYOMEXHx3iw0p4tk/57b35173231c4290ff199ef8573367ad/itv2.png?w=512',
              'preset': 2},
     'ITVBe': {'id': 'viwx.itvbe',
               'name': 'ITVBe',
-              'logo': 'https://images.ctfassets.net/bd5zurrrnk1g/6Mul5JVrb06pRu8bNDgIAe/b5309fa32322cc3db398d25e523e2b2e/itvBe.png?w=512',
+              'logo': 'https://images.ctfassets.net/bd5zurrrnk1g/'
+                      '6Mul5JVrb06pRu8bNDgIAe/b5309fa32322cc3db398d25e523e2b2e/itvBe.png?w=512',
               'preset': 3},
     'ITV3': {'id': 'viwx.itv3',
              'name': 'ITV3',
-             'logo': 'https://images.ctfassets.net/bd5zurrrnk1g/39fJAu9LbUJptatyAs8HkL/80ac6eb141104854b209da946ae7a02f/itv3.png?w=512',
+             'logo': 'https://images.ctfassets.net/bd5zurrrnk1g/'
+                     '39fJAu9LbUJptatyAs8HkL/80ac6eb141104854b209da946ae7a02f/itv3.png?w=512',
              'preset': 4},
     'ITV4': {'id': 'viwx.itv4',
              'name': 'ITV4',
-             'logo': 'https://images.ctfassets.net/bd5zurrrnk1g/6Dv76O9mtWd6m7DzIavtsf/b3d491289679b8030eae7b4a7db58f2d/itv4.png?w=512',
+             'logo': 'https://images.ctfassets.net/bd5zurrrnk1g/'
+                     '6Dv76O9mtWd6m7DzIavtsf/b3d491289679b8030eae7b4a7db58f2d/itv4.png?w=512',
              'preset': 5}
 }
 
@@ -80,8 +85,8 @@ def send_epg(self):
         from resources.lib.itvx import get_full_schedule
 
         schedules = get_full_schedule()
-        epg = {CHANNELS[k]['id']: v for k, v in schedules.items()}
-        return dict(version=1, epg=epg)
+        epg_data = {CHANNELS[k]['id']: v for k, v in schedules.items()}
+        return dict(version=1, epg=epg_data)
 
 
 @Script.register
@@ -96,7 +101,7 @@ def channels(_, port):
 @Script.register
 def epg(_, port):
     try:
-         IPTVManager(int(port)).send_epg()
+        IPTVManager(int(port)).send_epg()
     except Exception as err:
         # Catch all errors to prevent codequick showing an error message
         xbmc.log("[viwX] Error in iptvmanager.epg: {!r}.".format(err))