X-Git-Url: http://git.code-monkey.de/?p=plugin.video.netflix.git;a=blobdiff_plain;f=resources%2Flib%2FNetflixSession.py;fp=resources%2Flib%2FNetflixSession.py;h=f4c9be3fda59bc99b8c5805fcda5e45b9f8e08e8;hp=377866765cb4803d0dc0c560c3ae4817f2889cdd;hb=4992e07aa489c7b2da627ab57769c4b0b03c6e62;hpb=0aec910d198d3512895b752c0999403484ccddb2 diff --git a/resources/lib/NetflixSession.py b/resources/lib/NetflixSession.py index 3778667..f4c9be3 100644 --- a/resources/lib/NetflixSession.py +++ b/resources/lib/NetflixSession.py @@ -446,6 +446,11 @@ class NetflixSession: for key in self.video_list_keys: video_list_ids[key] = {} + # check if the list items are hidden behind a `value` sub key + # this is the case when we fetch the lists via POST, not via a GET preflight request + if 'value' in response_data.keys(): + response_data = response_data['value'] + # subcatogorize the lists by their context video_lists = response_data['lists'] for video_list_id in video_lists.keys(): @@ -1270,8 +1275,9 @@ class NetflixSession: response = self._session_get(component='browse') return BeautifulSoup(response.text, 'html.parser') - def fetch_video_list_ids (self, list_from=0, list_to=50): + def fetch_video_list_ids_via_preflight (self, list_from=0, list_to=50): """Fetches the JSON with detailed information based on the lists on the landing page (browse page) of Netflix + via the preflight (GET) request Parameters ---------- @@ -1298,14 +1304,11 @@ class NetflixSession: response = self._session_get(component='video_list_ids', params=payload, type='api') return self._process_response(response=response, component=self._get_api_url_for(component='video_list_ids')) - def fetch_search_results (self, search_str, list_from=0, list_to=10): - """Fetches the JSON which contains the results for the given search query + def fetch_video_list_ids (self, list_from=0, list_to=50): + """Fetches the JSON with detailed information based on the lists on the landing page (browse page) of Netflix Parameters ---------- - search_str : :obj:`str` - String to query Netflix search for - list_from : :obj:`int` Start entry for pagination @@ -1317,42 +1320,20 @@ class NetflixSession: :obj:`dict` of :obj:`dict` of :obj:`str` Raw Netflix API call response or api call error """ - # properly encode the search string - encoded_search_string = quote(search_str) - paths = [ - ['search', encoded_search_string, 'titles', {'from': list_from, 'to': list_to}, ['summary', 'title']], - ['search', encoded_search_string, 'titles', {'from': list_from, 'to': list_to}, 'boxarts', '_342x192', 'jpg'], - ['search', encoded_search_string, 'titles', ['id', 'length', 'name', 'trackIds', 'requestId']], - ['search', encoded_search_string, 'suggestions', 0, 'relatedvideos', {'from': list_from, 'to': list_to}, ['summary', 'title']], - ['search', encoded_search_string, 'suggestions', 0, 'relatedvideos', {'from': list_from, 'to': list_to}, 'boxarts', '_342x192', 'jpg'], - ['search', encoded_search_string, 'suggestions', 0, 'relatedvideos', ['id', 'length', 'name', 'trackIds', 'requestId']] + ['lolomo', {'from': list_from, 'to': list_to}, ['displayName', 'context', 'id', 'index', 'length']] ] - response = self._path_request(paths=paths) - return self._process_response(response=response, component='Search results') - - def get_lolomo_for_kids (self): - """Fetches the lolomo ID for Kids profiles - Returns - ------- - :obj:`str` - Kids Lolomo ID - """ - response = self._session_get(component='kids') - for cookie in response.cookies: - if cookie.name.find('lhpuuidh-browse-' + self.user_data['guid']) != -1 and cookie.name.rfind('-T') == -1: - start = unquote(cookie.value).rfind(':') - return unquote(cookie.value)[start+1:] - return None + response = self._path_request(paths=paths) + return self._process_response(response=response, component='Video list ids') - def fetch_lists_for_kids (self, lolomo, list_from=0, list_to=50): - """Fetches the JSON which contains the contents of a the video list for kids users + def fetch_search_results (self, search_str, list_from=0, list_to=10): + """Fetches the JSON which contains the results for the given search query Parameters ---------- - lolomo : :obj:`str` - Lolomo ID for the Kids profile + search_str : :obj:`str` + String to query Netflix search for list_from : :obj:`int` Start entry for pagination @@ -1365,13 +1346,19 @@ class NetflixSession: :obj:`dict` of :obj:`dict` of :obj:`str` Raw Netflix API call response or api call error """ + # properly encode the search string + encoded_search_string = quote(search_str) + paths = [ - ['lists', lolomo, {'from': list_from, 'to': list_to}, ['displayName', 'context', 'genreId', 'id', 'index', 'length']] + ['search', encoded_search_string, 'titles', {'from': list_from, 'to': list_to}, ['summary', 'title']], + ['search', encoded_search_string, 'titles', {'from': list_from, 'to': list_to}, 'boxarts', '_342x192', 'jpg'], + ['search', encoded_search_string, 'titles', ['id', 'length', 'name', 'trackIds', 'requestId']], + ['search', encoded_search_string, 'suggestions', 0, 'relatedvideos', {'from': list_from, 'to': list_to}, ['summary', 'title']], + ['search', encoded_search_string, 'suggestions', 0, 'relatedvideos', {'from': list_from, 'to': list_to}, 'boxarts', '_342x192', 'jpg'], + ['search', encoded_search_string, 'suggestions', 0, 'relatedvideos', ['id', 'length', 'name', 'trackIds', 'requestId']] ] - response = self._path_request(paths=paths) - res = self._process_response(response=response, component='Kids lists') - return self.parse_video_list_ids(response_data=res['value']) + return self._process_response(response=response, component='Search results') def fetch_video_list (self, list_id, list_from=0, list_to=20): """Fetches the JSON which contains the contents of a given video list