Merge pull request #122 from dimkroon/development

Version 1.5.2

Author: dimkroon

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()

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

@@ -6,6 +6,7 @@
 # ----------------------------------------------------------------------------------------------------------------------
 
 import os
+import sys
 from typing import Dict, List, Tuple
 
 from unittest.mock import patch
@@ -100,6 +101,10 @@ def set_credentials(session=None) -> None:
     credentials_set = s.refresh()
     if credentials_set is False:
         credentials_set = s.login(account_login.UNAME, account_login.PASSW)
+        if not credentials_set:
+            import traceback
+            traceback.print_exc()
+            sys.exit(1)
 
 
 def setup_web_test(*args):

test/support/fixtures.py

@@ -342,8 +342,10 @@ def check_vnd_user_content_v1_json(self, data):
                 # Some episodes' series and/or episode number are None, e.g. episodes of The Chase
                 object_checks.has_keys(item, 'seriesNumber', 'episodeNumber')
 
-            if item['contentType'] in ('FILM', 'SPECIAL'):
+            if item['contentType'] == 'FILM':
                 self.assertIsNotNone(utils.iso_duration_2_seconds(item['duration']))
+            elif item['contentType'] == 'SPECIAL':
+                self.assertTrue(utils.iso_duration_2_seconds(item['duration']) or item['duration'] is None)
             else:
                 self.assertIsNone(item['duration'])
 
@@ -699,8 +701,8 @@ def test_get_playlist_catchup(self):
 
     def test_get_playlist_premium_catchup(self):
         """Request a premium stream without a premium account."""
-        # 2Point4 Children S1E1
-        resp = self.get_playlist_catchup('https://magni.itv.com/playlist/itvonline/ITV/10_0848_0006.001')
+        # Judge John Deed S1E1
+        resp = self.get_playlist_catchup('https://magni.itv.com/playlist/itvonline/ITV/10_5323_0001.001')
         object_checks.has_keys(resp, 'Message', 'TransactionId')
         self.assertTrue('message: User does not have entitlements' in resp['Message'])
 

test/web/test_itvx_api.py

@@ -115,7 +115,8 @@ def check_programme(self, progr_data):
     has_keys(progr_data, 'title', 'image', 'longDescription', 'description',
              'encodedProgrammeId', 'titleSlug', 'tier', 'visuallySigned',
              obj_name=obj_name)
-    expect_keys(progr_data, 'categories', 'programmeId')
+    expect_keys(progr_data, 'programmeId')
+    misses_keys(progr_data, 'categories')
     # Only programme details pages (like episodes, specials, films) still have this field.
     # Its presence is specifically checked in their tests.
     expect_misses_keys(progr_data, 'imagePresets')
@@ -124,7 +125,8 @@ def check_programme(self, progr_data):
     self.assertTrue(is_not_empty(progr_data['longDescription'], str))
     self.assertTrue(is_not_empty(progr_data['description'], str))
     self.assertTrue(is_url(progr_data['image']))
-    self.assertTrue(is_not_empty(progr_data['categories'], list))
+    self.assertTrue(is_not_empty(progr_data['genres'], list))
+    has_keys(progr_data['genres'][0], 'id', 'name')
     self.assertTrue(is_not_empty(progr_data['titleSlug'], str))
     self.assertTrue(is_tier_info(progr_data['tier']))
     if 'numberOfAvailableSeries' in progr_data:
@@ -149,7 +151,7 @@ def check_series(self, series, parent_name):
 def check_title(self, title, parent_name):
     obj_name = '{}-title-{}'.format(parent_name, title['episodeTitle'])
     has_keys(title, 'accessibilityTags', 'audioDescribed', 'availabilityFrom', 'availabilityUntil', 'broadcastDateTime',
-             'categories', 'contentInfo', 'dateTime', 'description',
+             'genres', 'contentInfo', 'dateTime', 'description',
              'duration', 'encodedEpisodeId', 'episodeTitle', 'genres', 'guidance', 'image', 'longDescription',
              'notFormattedDuration', 'playlistUrl', 'productionType', 'premium', 'tier', 'series', 'visuallySigned',
              'subtitled', 'audioDescribed',
@@ -164,12 +166,18 @@ def check_title(self, title, parent_name):
     self.assertTrue(is_iso_utc_time(title['availabilityFrom']))
     self.assertTrue(is_iso_utc_time(title['availabilityUntil']))
     self.assertTrue(is_iso_utc_time(title['broadcastDateTime']) or title['broadcastDateTime'] is None)
-    self.assertIsInstance(title['categories'], list)
+    self.assertTrue(is_not_empty(title['genres'], list))
+    has_keys(title['genres'][0], 'id', 'name')
     self.assertIsInstance(title['contentInfo'], str)        # can be empty in films, specials, or episodes in sections like 'latest episodes'.
-    self.assertTrue(is_iso_utc_time(title['dateTime']))
+    self.assertTrue(is_iso_utc_time(title['dateTime']) or title['dateTime'] is None)
     self.assertTrue(is_not_empty(title['description'], str))
-    self.assertTrue(is_not_empty(title['duration'], str))
-    self.assertFalse(title['duration'].startswith('P'))  # duration is not in iso format
+    self.assertTrue(is_not_empty(title['duration'], str) or title['duration'] is None)
+    if title['duration'] is not None:
+        self.assertFalse(title['duration'].startswith('P'))  # duration is not in iso format
+    if title['notFormattedDuration'] is None:
+        self.assertIsNone(title['duration'])
+    else:
+        self.assertTrue(title['notFormattedDuration'].startswith('PT'))
     self.assertTrue(is_encoded_episode_id(title['encodedEpisodeId']))
     self.assertTrue(is_not_empty(title['episodeTitle'], str) or title['episodeTitle'] is None)
     check_genres(self, title['genres'])
@@ -336,11 +344,11 @@ def check_item_type_brand(testcase, item, parent_name):
     has_keys(item, 'title', 'contentType', 'titleSlug', 'description', 'genres', 'dateTime', 'imageTemplate',
              'numberOfAvailableSeries', 'series', 'programmeId', 'encodedProgrammeId', 'contentInfo', 'isPaid',
              obj_name=name)
-    expect_keys(item, 'partnership', 'contentOwner','categories', 'channel', 'ccid', obj_name=name)
+    expect_keys(item, 'partnership', 'contentOwner', 'channel', 'ccid', obj_name=name)
+    misses_keys(item, 'categories')
     testcase.assertTrue(is_not_empty(item['title'], str))
     testcase.assertTrue(is_not_empty(item['titleSlug'], str))
     testcase.assertTrue(is_not_empty(item['description'], str))
-    testcase.assertTrue(is_not_empty(item['categories'], list))
     check_genres(testcase, item['genres'], name)
     testcase.assertTrue(item['dateTime'] is None or is_iso_utc_time(item['dateTime']))
     testcase.assertTrue(is_url(item['imageTemplate']))