Merge pull request #1692 from CastagnaIT/changes

Updates to new website changes

resources/lib/kodi/infolabels.py

@@ -252,18 +252,20 @@ def parse_art(videoid, item):
         paths.ART_PARTIAL_PATHS[2] + ['url'], item)
     fanart = common.get_path_safe(
         paths.ART_PARTIAL_PATHS[3] + [0, 'url'], item)
+    fallback = common.get_path_safe(['itemSummary', 'value', 'boxArt', 'url'], item)
     return _assign_art(videoid,
                        boxart_large=boxarts.get(paths.ART_SIZE_FHD),
                        boxart_small=boxarts.get(paths.ART_SIZE_SD),
                        poster=boxarts.get(paths.ART_SIZE_POSTER),
                        interesting_moment=interesting_moment.get(paths.ART_SIZE_FHD),
                        clearlogo=clearlogo,
-                       fanart=fanart)
+                       fanart=fanart,
+                       fallback=fallback)
 
 
 def _assign_art(videoid, **kwargs):
     """Assign the art available from Netflix to appropriate Kodi art"""
-    art = {'poster': _best_art([kwargs['poster']]),
+    art = {'poster': _best_art([kwargs['poster'], kwargs['fallback']]),
            'fanart': _best_art([kwargs['fanart'],
                                 kwargs['interesting_moment'],
                                 kwargs['boxart_large'],

resources/lib/services/nfsession/msl/msl_utils.py

@@ -28,7 +28,7 @@
 
 ENDPOINTS = {
     'manifest_v1': CHROME_BASE_URL + 'pbo_manifests/%5E1.0.0/router',  # "pbo_manifests/^1.0.0/router"
-    'manifest': CHROME_PLAYAPI_URL + 'licensedmanifest',
+    'manifest': CHROME_PLAYAPI_URL + 'licensedmanifest/1',
     'license': CHROME_BASE_URL + 'pbo_licenses/%5E1.0.0/router',
     'events': CHROME_PLAYAPI_URL + 'event/1',
     'logblobs': CHROME_PLAYAPI_URL + 'logblob/1'

resources/lib/services/nfsession/session/access.py

@@ -122,8 +122,8 @@ def login_auth_data(self, data=None, password=None):
                              'If you have just done "Sign out of all devices" from Netflix account settings '
                              'wait about 10 minutes before generating a new AuthKey.') from exc
         # Get the account e-mail
-        page_response = self.get('your_account').decode('utf-8')
-        email_match = re.search(r'account-email[^<]+>([^<]+@[^</]+)</', page_response)
+        page_response = self.get('account_security').decode('utf-8')
+        email_match = re.search(r'>([^<]+@[^</]+)<', page_response)
         email = email_match.group(1).strip() if email_match else None
         if not email:
             raise WebsiteParsingError('E-mail field not found')

resources/lib/services/nfsession/session/endpoints.py

@@ -59,8 +59,8 @@
          'use_default_params': False,
          'add_auth_url': None,
          'accept': 'text/html,application/xhtml+xml,application/xml'},
-    'your_account':
-        {'address': '/YourAccount',
+    'account_security':
+        {'address': '/account/security',
          'is_api_call': False,
          'use_default_params': False,
          'add_auth_url': None,
@@ -82,7 +82,7 @@
          'is_api_call': False,
          'use_default_params': False,
          'add_auth_url': None,
-         'accept': 'application/json, text/javascript, */*'},
+         'accept': '*/*'},
     'profile_lock':
         {'address': '/api/shakti/mre/profileLock',
          'is_api_call': False,

resources/lib/utils/api_paths.py

@@ -51,7 +51,7 @@
     [['requestId', 'summary', 'title', 'synopsis', 'regularSynopsis', 'evidence', 'queue', 'inRemindMeList',
       'episodeCount', 'info', 'maturity', 'runtime', 'seasonCount', 'availability', 'trackIds',
       'releaseYear', 'userRating', 'numSeasonsLabel', 'bookmarkPosition', 'creditsOffset',
-      'dpSupplementalMessage', 'watched', 'delivery', 'sequiturEvidence', 'promoVideo', 'availability']],
+      'dpSupplementalMessage', 'watched', 'delivery', 'sequiturEvidence', 'promoVideo', 'availability', 'itemSummary']],
     [['genres', 'tags', 'creators', 'directors', 'cast'],
      {'from': 0, 'to': 10}, ['id', 'name']]
 ] + ART_PARTIAL_PATHS

resources/lib/utils/api_requests.py

@@ -28,16 +28,25 @@ def login(ask_credentials=True):
     try:
         is_success = False
         credentials = None
-        is_login_with_credentials = True
+        is_login_with_credentials = False
         # The database 'isAdsPlan' value is stored after the login, so the first time we have None value
         # this avoids to show the notice message multiple times if more login attempts will be done over the time
         show_ads_notice = G.LOCAL_DB.get_value('is_ads_plan', None, table=TABLE_SESSION) is None
         if ask_credentials:
             is_login_with_credentials = ui.show_yesno_dialog('Login', common.get_local_string(30340),
                                                              yeslabel=common.get_local_string(30341),
                                                              nolabel=common.get_local_string(30342))
-            if is_login_with_credentials:
-                credentials = {'credentials': ui.ask_credentials()}
+            # if is_login_with_credentials:
+            #     credentials = {'credentials': ui.ask_credentials()}
+        if is_login_with_credentials:
+            # The login page is changed now part of HTML seem protected by reCaptcha
+            # in the HTML page the reactContext data is added after the reCaptcha checks so at the moment
+            # it is not accessible by requesting the login page through python script,
+            # this prevents us to get the authURL code needed to perform the login request
+            ui.show_ok_dialog('Login',
+                              'Due to new website protections at moment the login with credentials is not available.')
+            is_login_with_credentials = False
+
         if is_login_with_credentials:
             if common.make_call('login', credentials):
                 is_success = True