Merge pull request #4677 from dimkroon/matrix-viwx-162

[plugin.video.viwx] v1.6.2

Author: basrieter

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.6.1" provider-name="Dimitri Kroon">
+<addon id="plugin.video.viwx" name="viwX" version="1.6.2" provider-name="Dimitri Kroon">
   <requires>
     <import addon="xbmc.python" version="3.0.0"/>
     <import addon="inputstream.adaptive" version="19.0.5"/>
@@ -30,14 +30,9 @@
       <fanart>resources/fanart.png</fanart>
     </assets>
     <news>
-[B]v 1.6.1[/B]
+[B]v 1.6.2[/B]
 [B]Fixes:[/B]
-- NO IPTV EPG.
-
-[B]Changes:[/B]
-- An attempt to correct some mistakes that are easily made when copying authentication tokens from a web browser.
-- More informative error messages and logs when importing tokens fails.
-- Some other minor changes.
+- Logging in to IVX account with username and password works again.
     </news>
     <reuselanguageinvoker>true</reuselanguageinvoker>
   </extension>

plugin.video.viwx/changelog.txt

@@ -1,3 +1,7 @@
+v 1.6.2
+Fixes:
+- Logging in to IVX account with username and password works again.
+
 v 1.6.1
 Fixes:
 - NO IPTV EPG.

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

@@ -196,7 +196,7 @@ msgid "You need to sign in to your itvX account.\n"
 msgstr ""
 
 msgctxt "#30612"
-msgid "Successfully signed in!"
+msgid "Successfully signed in as '{nickname}'"
 msgstr ""
 
 msgctxt "#30613"

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

@@ -98,7 +98,6 @@ def login(self, uname: str, passw: str):
         Raises AuthenticationError if login fails, or other exceptions as they occur, like e.g. FetchError.
         """
         import requests
-        from resources.lib.telemetry_data import telemetry_factory
         self.account_data = {}
 
         req_data = {
@@ -121,9 +120,8 @@ def login(self, uname: str, passw: str):
                     'accept-language':      'en-GB,en;q=0.5',
                     'accept-encoding':      'gzip, deflate',
                     'content-type':         'application/json',
-                    'akamai-bm-telemetry':  telemetry_factory.get_data(),
-                    'origin':               'https://www.itv.com',
-                    'referer':              'https://www.itv.com/',
+                    'origin':               'https://app.10ft.itv.com',
+                    'referer':              'https://app.10ft.itv.com/',
                     'sec-fetch-dest':       'empty',
                     'sec-fetch-mode':       'cors',
                     'sec-fetch-site':       'same-site',

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

@@ -25,7 +25,6 @@
 
 TXT_ACCOUNT_ERROR = 30610
 MSG_LOGIN = 30611
-MSG_LOGIN_SUCCESS = 30612
 MSG_LOGGED_OUT_SUCCESS = 30613
 
 TXT_USERNAME = 30614
@@ -72,17 +71,6 @@ def show_msg_not_logged_in():
     return result
 
 
-def show_login_result(success: bool, message: str = None):
-    if success:
-        icon = Script.NOTIFY_INFO
-        if not message:
-            message = Script.localize(MSG_LOGIN_SUCCESS)
-    else:
-        icon = Script.NOTIFY_WARNING
-
-    Script.notify(Script.localize(TXT_ITV_ACCOUNT), message, icon)
-
-
 def ask_login_retry(reason):
     """Show a message that login has failed and ask whether to try again."""
 

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

@@ -21,7 +21,7 @@
 
 logger = logging.getLogger('.'.join((logger_id, __name__)))
 
-
+TXT_LOGIN_SUCCESS = 30612
 TXT_EXPORT_NOT_SINGED_IN = 30623
 TXT_EXPORT_SUCCESS = 30624
 TXT_EXPORT_FAIL = 30625
@@ -47,8 +47,9 @@ def login(_=None):
             logger.info("Entering login credentials canceled by user")
             return
         try:
-            itv_account.itv_session().login(uname, passw)
-            kodi_utils.show_login_result(success=True)
+            session = itv_account.itv_session()
+            session.login(uname, passw)
+            kodi_utils.msg_dlg(TXT_LOGIN_SUCCESS, nickname=session.user_nickname)
             from resources.lib import cache
             import xbmc
             cache.my_list_programmes = None