diff --git a/searx/engines/youtube_noapi.py b/searx/engines/youtube_noapi.py index 9f01841f66..3bf25932b2 100644 --- a/searx/engines/youtube_noapi.py +++ b/searx/engines/youtube_noapi.py @@ -8,7 +8,8 @@ # @stable no # @parse url, title, content, publishedDate, thumbnail, embedded -from lxml import html +from functools import reduce +from json import loads from searx.engines.xpath import extract_text from searx.utils import list_get from searx.url_utils import quote_plus @@ -34,20 +35,6 @@ base_youtube_url = 'https://www.youtube.com/watch?v=' -# specific xpath variables -results_xpath = "//ol/li/div[contains(@class, 'yt-lockup yt-lockup-tile yt-lockup-video vve-check')]" -url_xpath = './/h3/a/@href' -title_xpath = './/div[@class="yt-lockup-content"]/h3/a' -content_xpath = './/div[@class="yt-lockup-content"]/div[@class="yt-lockup-description yt-ui-ellipsis yt-ui-ellipsis-2"]' - - -# returns extract_text on the first result selected by the xpath or None -def extract_text_from_dom(result, xpath): - r = result.xpath(xpath) - if len(r) > 0: - return extract_text(r[0]) - return None - # do search-request def request(query, params): @@ -63,27 +50,38 @@ def request(query, params): def response(resp): results = [] - dom = html.fromstring(resp.text) - - # parse results - for result in dom.xpath(results_xpath): - videoid = list_get(result.xpath('@data-context-item-id'), 0) - if videoid is not None: - url = base_youtube_url + videoid - thumbnail = 'https://i.ytimg.com/vi/' + videoid + '/hqdefault.jpg' - - title = extract_text_from_dom(result, title_xpath) or videoid - content = extract_text_from_dom(result, content_xpath) - - embedded = embedded_url.format(videoid=videoid) - - # append result - results.append({'url': url, - 'title': title, - 'content': content, - 'template': 'videos.html', - 'embedded': embedded, - 'thumbnail': thumbnail}) + results_data = resp.text[resp.text.find('ytInitialData'):] + results_data = results_data[results_data.find('{'):results_data.find(';\n')] + + results_json = loads(results_data) if results_data else {} + sections = results_json.get('contents', {})\ + .get('twoColumnSearchResultsRenderer', {})\ + .get('primaryContents', {})\ + .get('sectionListRenderer', {})\ + .get('contents', []) + + for section in sections: + for video_container in section.get('itemSectionRenderer', {}).get('contents', []): + video = video_container.get('videoRenderer', {}) + videoid = video.get('videoId') + if videoid is not None: + url = base_youtube_url + videoid + thumbnail = 'https://i.ytimg.com/vi/' + videoid + '/hqdefault.jpg' + title = video.get('title', {}).get('simpleText', videoid) + description_snippet = video.get('descriptionSnippet', {}) + if 'runs' in description_snippet: + content = reduce(lambda a, b: a + b.get('text', ''), description_snippet.get('runs'), '') + else: + content = description_snippet.get('simpleText', '') + embedded = embedded_url.format(videoid=videoid) + + # append result + results.append({'url': url, + 'title': title, + 'content': content, + 'template': 'videos.html', + 'embedded': embedded, + 'thumbnail': thumbnail}) # return results return results diff --git a/tests/unit/engines/test_youtube_noapi.py b/tests/unit/engines/test_youtube_noapi.py index 41dcbb7492..cbf7b9bcd2 100644 --- a/tests/unit/engines/test_youtube_noapi.py +++ b/tests/unit/engines/test_youtube_noapi.py @@ -46,121 +46,71 @@ def test_response(self): self.assertEqual(youtube_noapi.response(response), []) html = """ -
    -
  1. -
    -
    - - - -
    -
    -

    - - Title - - - Durée : 11:35. -

    -
    de - MEHAY SUPERBIKE
    -
      -
    • il y a 20 heures
      • -
    • 8 424 vues
      • -
    -
    -
    - Description -
    -
    -
      -
    • - Nouveauté -
      • -
    • HD
      • -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    2. -
+
+ """ response = mock.Mock(text=html) results = youtube_noapi.response(response) self.assertEqual(type(results), list) - self.assertEqual(len(results), 1) + self.assertEqual(len(results), 2) self.assertEqual(results[0]['title'], 'Title') self.assertEqual(results[0]['url'], 'https://www.youtube.com/watch?v=DIVZCPfAOeM') self.assertEqual(results[0]['content'], 'Description') self.assertEqual(results[0]['thumbnail'], 'https://i.ytimg.com/vi/DIVZCPfAOeM/hqdefault.jpg') self.assertTrue('DIVZCPfAOeM' in results[0]['embedded']) - - html = """ -
    -
  1. -
    -
    - - - -
    -
    -

    - - Durée : 11:35. -

    -
    de - MEHAY SUPERBIKE
    -
      -
    • il y a 20 heures
      • -
    • 8 424 vues
      • -
    -
    -
    -
      -
    • - Nouveauté -
      • -
    • HD
      • -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    2. -
- """ - response = mock.Mock(text=html) - results = youtube_noapi.response(response) - self.assertEqual(type(results), list) - self.assertEqual(len(results), 1) + self.assertEqual(results[1]['title'], 'Title') + self.assertEqual(results[1]['url'], 'https://www.youtube.com/watch?v=9C_HReR_McQ') + self.assertEqual(results[1]['content'], 'Description') + self.assertEqual(results[1]['thumbnail'], 'https://i.ytimg.com/vi/9C_HReR_McQ/hqdefault.jpg') + self.assertTrue('9C_HReR_McQ' in results[1]['embedded']) html = """