fix(search): Add proper item props to search results, reduce search to 1 request

asciidisco · asciidisco · commit dad1f7fa7f60 · 2017-10-24T17:55:05.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ script:
   - pip install pycryptodomex
   - make all
   - touch ./_build/.nojekyll
-  - if [ "$TRAVIS_BRANCH" == "master" ]; then codeclimate-test-reporter; fi
+  - if [ "$TRAVIS_BRANCH" == "master" ]; then codeclimate-test-reporter; else exit 0; fi
 
 deploy:
   - provider: pages
diff --git a/addon.xml b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.netflix" name="Netflix" version="0.12.5" provider-name="libdev + jojo + asciidisco">
+<addon id="plugin.video.netflix" name="Netflix" version="0.12.6" provider-name="libdev + jojo + asciidisco">
   <requires>
     <import addon="xbmc.python" version="2.25.0"/>
     <import addon="script.module.requests" version="2.12.4"/>
@@ -31,9 +31,9 @@
     <email>public at asciidisco dot com</email>
     <forum>https://www.kodinerds.net/index.php/Thread/55612-PreRelease-Plugin-Netflix-Inputstream/</forum>
     <source>https://github.com/asciidisco/plugin.video.netflix</source>
-    <news>v0.12.5 (2017-10-24)
-- Fix problems with Android ESN
-- Adapt to new Netflix search API
+    <news>v0.12.6 (2017-10-24)
+- Fix problems with wrongly tagged audio channels
+- Add proper item props to search results, reduce search to 1 request
     </news>
   </extension>
 </addon>
diff --git a/resources/lib/KodiHelper.py b/resources/lib/KodiHelper.py
@@ -1162,8 +1162,11 @@ def _generate_art_info(self, entry, li):
             'fanart': '',
             'poster': ''
         })
-
-        if 'boxarts' in dict(entry).keys() and  isinstance(entry.get('boxarts'), dict):
+        self.log(entry)
+        if 'boxarts' in dict(entry).keys() and not isinstance(entry.get('boxarts'), dict):
+            big = entry.get('boxarts', '')
+            small = big
+        if 'boxarts' in dict(entry).keys() and isinstance(entry.get('boxarts'), dict):
             big = entry.get('boxarts', {}).get('big')
             small = entry.get('boxarts', {}).get('small')
             art.update({
diff --git a/resources/lib/NetflixHttpSubRessourceHandler.py b/resources/lib/NetflixHttpSubRessourceHandler.py
@@ -383,6 +383,6 @@ def search(self, params):
         if 'error' in raw_search_results or result_size == 0:
             return []
         # list the search results
-        search_results = self.netflix_session.parse_search_results(
+        search_results = self.netflix_session.parse_video_list(
             response_data=raw_search_results)
         return search_results
diff --git a/resources/lib/NetflixSession.py b/resources/lib/NetflixSession.py
@@ -581,85 +581,6 @@ def parse_video_list_ids_entry(self, id, entry):
             }
         }
 
-    def parse_search_results(self, response_data):
-        """Parse the list of search results, rip out the parts we need
-           and extend it with detailed show informations
-
-        Parameters
-        ----------
-        response_data : :obj:`dict` of :obj:`str`
-            Parsed response JSON from the `fetch_search_results` call
-
-        Returns
-        -------
-        :obj:`dict` of :obj:`dict` of :obj:`str`
-            Search results in the format:
-
-            {
-                "70136140": {
-                    "boxarts": "https://art-s.nflximg....jpg",
-                    "detail_text": "Die legend\u00e4re und...",
-                    "id": "70136140",
-                    "season_id": "70109435",
-                    "synopsis": "Unter Befehl von...",
-                    "title": "Star Trek",
-                    "type": "show"
-                },
-                "70158329": {
-                    "boxarts": ...
-                }
-            }
-        """
-        search_results = {}
-        raw_search_results = response_data.get('value', {}).get('videos', {})
-        for entry_id in raw_search_results:
-            if self._is_size_key(key=entry_id) is False:
-                # fetch information about each show & build up a
-                # proper search results dictionary
-                show = self.parse_show_list_entry(
-                    id=entry_id,
-                    entry=raw_search_results.get(entry_id))
-                #show_info = self.parse_show_information(
-                #    id=entry_id,
-                #    response_data=raw_search_results.get(entry_id))
-                #show[entry_id].update(show_info)
-                search_results.update(show)
-        return search_results
-
-    def parse_show_list_entry(self, id, entry):
-        """Parse a show entry e.g. rip out the parts we need
-
-        Parameters
-        ----------
-        response_data : :obj:`dict` of :obj:`str`
-            Dictionary entry from the ´fetch_show_information´ call
-
-        id : :obj:`str`
-            Unique id of the video list
-
-        Returns
-        -------
-        entry : :obj:`dict` of :obj:`dict` of :obj:`str`
-            Show list entry in the format:
-
-            {
-                "3589e2c6-ca3b-48b4-a72d-34f2c09ffbf4_11568382": {
-                    "id": "3589e2c6-ca3b-48b4-a72d-34f2c09ffbf4_11568382",
-                    "title": "Enterprise",
-                    "boxarts": "https://art-s.nflximg.net/.../smth.jpg",
-                    "type": "show"
-                }
-            }
-        """
-        return {
-            id: {
-                'id': id,
-                'title': entry.get('title'),
-                'boxarts': entry['boxarts']['_342x192']['jpg']['url'],
-                'type': entry.get('summary', {}).get('type')
-            }
-        }
-
     def parse_video_list(self, response_data):
         """Parse a list of videos
 
@@ -949,7 +870,7 @@ def parse_creators_for_video(self, video, persons):
         for person_key in dict(persons).keys():
             is_size_key = self._is_size_key(key=person_key)
             if is_size_key is False and person_key != 'summary':
-                for creator_key in dict(video['creators']).keys():
+                for creator_key in dict(video.get('creators', {})).keys():
                     is_size_key = self._is_size_key(key=creator_key)
                     if is_size_key is False and creator_key != 'summary':
                         if video['creators'][creator_key][1] == person_key:
@@ -976,7 +897,7 @@ def parse_directors_for_video(self, video, persons):
         for person_key in dict(persons).keys():
             is_size_key = self._is_size_key(key=person_key)
             if is_size_key is False and person_key != 'summary':
-                for director_key in dict(video['directors']).keys():
+                for director_key in dict(video.get('directors', {})).keys():
                     is_size_key = self._is_size_key(key=director_key)
                     if is_size_key is False and director_key != 'summary':
                         if video['directors'][director_key][1] == person_key:
@@ -1143,39 +1064,6 @@ def parse_netflix_list_id(self, video_list):
                     netflix_list_id = video_id
         return netflix_list_id
 
-    def parse_show_information(self, id, response_data):
-        """Parse extended show information (synopsis, seasons, etc.)
-
-        Parameters
-        ----------
-        id : :obj:`str`
-            Video id
-
-        response_data : :obj:`dict` of :obj:`str`
-            Parsed response JSON from the `fetch_show_information` call
-
-        Returns
-        -------
-        entry : :obj:`dict` of :obj:`str`
-        Show information in the format:
-            {
-                "season_id": "80113084",
-                "synopsis": "Aus verzweifel..."
-                "detail_text": "I´m optional"
-            }
-        """
-        show = {}
-        raw_show = response_data['value']['videos'][id]
-        show.update({'synopsis': raw_show['regularSynopsis']})
-
-        if 'evidence' in raw_show:
-            evidence = raw_show.get('evidence', {}).get('value', {})
-            show.update({'detail_text': evidence.get('text', '')})
-        if 'seasonList' in raw_show:
-            season_list = raw_show.get('seasonList', {})
-            show.update({'season_id': season_list.get('current', ['', ''])[1]})
-        return show
-
     def parse_seasons(self, id, response_data):
         """Parse a list of seasons for a given show
 
@@ -1485,7 +1373,6 @@ def fetch_search_results(self, search_str, list_from=0, list_to=48):
         # reusable query items
         item_path = ['search', 'byTerm', '|' + search_str]
         item_titles = ['titles', list_to]
-        item_suggestions = ['suggestions', list_to]
         item_pagination = [{'from': list_from, 'to': list_to}]
 
         paths = [
@@ -1496,9 +1383,13 @@ def fetch_search_results(self, search_str, list_from=0, list_to=48):
             item_path + item_titles + item_pagination + ['reference', 'storyarts', '_1632x873', 'jpg'],
             item_path + item_titles + item_pagination + ['reference', 'interestingMoment', '_665x375', 'jpg'],
             item_path + item_titles + item_pagination + ['reference', 'artWorkByType', 'BILLBOARD', '_1280x720', 'jpg'],
-            item_path + item_titles + [['referenceId', 'id', 'length', 'name', 'trackIds', 'requestId', 'regularSynopsis', 'evidence']],
-            item_path + item_suggestions + item_pagination + ['summary', 'releaseYear', 'title', 'synopsis', 'regularSynopsis', 'evidence', 'queue', 'episodeCount', 'info', 'maturity', 'runtime', 'seasonCount', 'releaseYear', 'userRating', 'numSeasonsLabel', 'bookmarkPosition', 'watched', 'delivery', 'seasonList', 'current'],
-            item_path + item_suggestions + [['length', 'referenceId', 'trackId']]]
+            item_path + item_titles + item_pagination + ['reference', 'cast', {'from': 0, 'to': 15}, ['id', 'name']],
+            item_path + item_titles + item_pagination + ['reference', 'cast', 'summary'],
+            item_path + item_titles + item_pagination + ['reference', 'genres', {'from': 0, 'to': 5}, ['id', 'name']],
+            item_path + item_titles + item_pagination + ['reference', 'genres', 'summary'],
+            item_path + item_titles + item_pagination + ['reference', 'tags', {'from': 0, 'to': 9}, ['id', 'name']],
+            item_path + item_titles + item_pagination + ['reference', 'tags', 'summary'],
+            item_path + item_titles + [['referenceId', 'id', 'length', 'name', 'trackIds', 'requestId', 'regularSynopsis', 'evidence']]]
 
         response = self._path_request(paths=paths)
         return self._process_response(
@@ -1551,44 +1442,6 @@ def fetch_video_list(self, list_id, list_from=0, list_to=None):
             component='Video list')
         return processed_resp
 
-    def fetch_video_list_information(self, video_ids):
-        """
-        Fetches the JSON which contains the detail information of a
-        list of given video ids
-
-        Parameters
-        ----------
-        video_ids : :obj:`list` of :obj:`str`
-            List of video ids to fetch detail data for
-
-        Returns
-        -------
-        :obj:`dict` of :obj:`dict` of :obj:`str`
-            Raw Netflix API call response or api call error
-        """
-        paths = []
-        for video_id in video_ids:
-            paths.append(['videos', video_id, ['summary', 'title', 'synopsis', 'regularSynopsis', 'evidence', 'queue', 'episodeCount', 'info', 'maturity', 'runtime', 'seasonCount', 'releaseYear', 'userRating', 'numSeasonsLabel', 'bookmarkPosition', 'watched', 'delivery']])
-            paths.append(['videos', video_id, 'cast', {'from': 0, 'to': 15}, ['id', 'name']])
-            paths.append(['videos', video_id, 'cast', 'summary'])
-            paths.append(['videos', video_id, 'genres', {'from': 0, 'to': 5}, ['id', 'name']])
-            paths.append(['videos', video_id, 'genres', 'summary'])
-            paths.append(['videos', video_id, 'tags', {'from': 0, 'to': 9}, ['id', 'name']])
-            paths.append(['videos', video_id, 'tags', 'summary'])
-            paths.append(['videos', video_id, ['creators', 'directors'], {'from': 0, 'to': 49}, ['id', 'name']])
-            paths.append(['videos', video_id, ['creators', 'directors'], 'summary'])
-            paths.append(['videos', video_id, 'bb2OGLogo', '_400x90', 'png'])
-            paths.append(['videos', video_id, 'boxarts', '_342x192', 'jpg'])
-            paths.append(['videos', video_id, 'boxarts', '_1280x720', 'jpg'])
-            paths.append(['videos', video_id, 'storyarts', '_1632x873', 'jpg'])
-            paths.append(['videos', video_id, 'interestingMoment', '_665x375', 'jpg'])
-            paths.append(['videos', video_id, 'artWorkByType', 'BILLBOARD', '_1280x720', 'jpg'])
-
-        response = self._path_request(paths=paths)
-        return self._process_response(
-            response=response,
-            component='fetch_video_list_information')
-
     def fetch_metadata(self, id):
         """
         Fetches the JSON which contains the metadata for a
@@ -1617,7 +1470,6 @@ def fetch_metadata(self, id):
             response=response,
             component=self._get_api_url_for(component='metadata'))
 
-    def fetch_show_information(self, id, type):
         """Fetches the JSON which contains the detailed contents of a show
 
         Parameters
