Merge pull request #4607 from dimkroon/matrix-viwx-1.5.2

[plugin.video.viwx] v1.5.2

plugin.video.viwx/addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.viwx" name="viwX" version="1.5.1" provider-name="Dimitri Kroon">
+<addon id="plugin.video.viwx" name="viwX" version="1.5.2" provider-name="Dimitri Kroon">
   <requires>
     <import addon="xbmc.python" version="3.0.0"/>
     <import addon="inputstream.adaptive" version="19.0.5"/>
@@ -30,18 +30,9 @@
       <fanart>resources/fanart.png</fanart>
     </assets>
     <news>
-[B]v1.5.1[/B]
+[B]v1.5.2[/B]
 [B]Fixes:[/B]
-* News clips failed to play with KeyError 'Brand'.
-* Error messages when opening an empty 'Continue Watching' list.
-* Stream-only FAST channels stalled in advert breaks.
-* Programmes are now reported as having been fully played when the user has skipped to the end while playing.
-* Some programmes were missing en IPTV EPG.
-* Search now requests the same number of items as a generic web browser does.
-
-[B]New Features:[/B]
-* Paid items are excluded from search results based on the setting 'Hide premium content'.
-* On most live channels it's now possible to seek back up to 1 hour from the moment the channel is started.
+- Login failed with error 'Forbidden' even though email and password were correct.
     </news>
     <reuselanguageinvoker>true</reuselanguageinvoker>
   </extension>

plugin.video.viwx/changelog.txt

@@ -1,3 +1,7 @@
+v 1.5.2
+Fixes:
+- Login failed with error 'Forbidden' even though email and password were correct.
+
 v 1.5.1
 Fixes:
 - News clips failed to play with KeyError 'Brand'.

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

@@ -181,19 +181,19 @@ msgid "Signed out!"
 msgstr ""
 
 msgctxt "#30614"
-msgid "User name"
+msgid "Email"
 msgstr ""
 
 msgctxt "#30615"
 msgid "Password"
 msgstr ""
 
 msgctxt "#30616"
-msgid "Invalid username"
+msgid "Invalid email or password"
 msgstr ""
 
 msgctxt "#30617"
-msgid "Invalid password"
+msgid "Forbidden\nIf this error persists wait a few hours before trying again."
 msgstr ""
 
 msgctxt "#30618"

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

@@ -10,6 +10,7 @@
 import json
 import logging
 
+from codequick import Script
 from codequick.support import logger_id
 
 from . import utils
@@ -21,6 +22,9 @@
 logger = logging.getLogger(logger_id + '.account')
 SESS_DATA_VERS = 2
 
+TXT_INVALID_EMAIL_OR_PASSW = 30616
+TXT_LOGIN_FORBIDDEN = 30617
+
 
 class ItvSession:
     def __init__(self):
@@ -123,7 +127,7 @@ def login(self, uname: str, passw: str):
                     'sec-fetch-dest':       'empty',
                     'sec-fetch-mode':       'cors',
                     'sec-fetch-site':       'same-site',
-                    'priority':             'u=1',
+                    'priority':             'u=0',
                     'te':                   'trailers'
                 },
                 timeout=fetch.WEB_TIMEOUT
@@ -141,8 +145,8 @@ def login(self, uname: str, passw: str):
             status_code = e.response.status_code
             if status_code in (400, 403):
                 msg = {
-                    400: 'Invalid username or password',
-                    403: 'Forbidden\nIf this error persists wait a few hours before trying again.'
+                    400: Script.localize(TXT_INVALID_EMAIL_OR_PASSW),
+                    403: Script.localize(TXT_LOGIN_FORBIDDEN)
                 }.get(status_code, 'Sign in failed.')
                 logger.info("Sign in failed: %r: %r", e, e.response.content)
                 raise AuthenticationError(msg) from None

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

@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------------------------------------------------
-#  Copyright (c) 2022-2023 Dimitri Kroon.
+#  Copyright (c) 2022-2024 Dimitri Kroon.
 #  This file is part of plugin.video.viwx.
 #  SPDX-License-Identifier: GPL-2.0-or-later
 #  See LICENSE.txt
@@ -30,8 +30,6 @@
 
 TXT_USERNAME = 30614
 TXT_PASSWORD = 30615
-TXT_INVALID_USERNAME = 30616
-TXT_INVALID_PASSWORD = 30617
 TXT_TRY_AGAIN = 30618
 TXT_RESUME_FROM = 30619
 TXT_PLAY_FROM_START = 30620
@@ -88,11 +86,6 @@ def show_login_result(success: bool, message: str = None):
 def ask_login_retry(reason):
     """Show a message that login has failed and ask whether to try again."""
 
-    if reason.lower() == 'invalid username':
-        reason = Script.localize(TXT_INVALID_USERNAME)
-    elif reason.lower() == 'invalid password':
-        reason = Script.localize(TXT_INVALID_PASSWORD)
-
     msg = '\n\n'.join((reason, Script.localize(TXT_TRY_AGAIN)))
 
     dlg = xbmcgui.Dialog()