git.iko.soy/searx
on master help sign in
Merge branch 'master' into patch-1
commit3e9ce2638ae0b2f06c9a9f9a8c1cd4ab0082c05d authorAlexandre Flament <alex@al-f.net> dateTue 9 Apr 2019, 03:32 (8 years ago) parentcef77f0ca09d91
3 files changed+96−151
compare with master
unifiedsplit
searx/engines/youtube_noapi.py+34−36 searx/query.py+6−9 tests/unit/engines/test_youtube_noapi.py+56−106
searx/engines/youtube_noapi.py+34−36
@@ -8,7 +8,8 @@
88# @stable no
99# @parse url, title, content, publishedDate, thumbnail, embedded
1010
11−from lxml import html
11+from functools import reduce
12+from json import loads
1213from searx.engines.xpath import extract_text
1314from searx.utils import list_get
1415from searx.url_utils import quote_plus
@@ -34,20 +35,6 @@ embedded_url = '<iframe width="540" height="304" ' +\
3435
3536base_youtube_url = 'https://www.youtube.com/watch?v='
3637
37−# specific xpath variables
38−results_xpath = "//ol/li/div[contains(@class, 'yt-lockup yt-lockup-tile yt-lockup-video vve-check')]"
39−url_xpath = './/h3/a/@href'
40−title_xpath = './/div[@class="yt-lockup-content"]/h3/a'
41−content_xpath = './/div[@class="yt-lockup-content"]/div[@class="yt-lockup-description yt-ui-ellipsis yt-ui-ellipsis-2"]'
42−
43−
44−# returns extract_text on the first result selected by the xpath or None
45−def extract_text_from_dom(result, xpath):
46− r = result.xpath(xpath)
47− if len(r) > 0:
48− return extract_text(r[0])
49− return None
50−
5138
5239# do search-request
5340def request(query, params):
@@ -63,27 +50,38 @@ def request(query, params):
6350def response(resp):
6451 results = []
6552
66− dom = html.fromstring(resp.text)
67−
68− # parse results
69− for result in dom.xpath(results_xpath):
70− videoid = list_get(result.xpath('@data-context-item-id'), 0)
71− if videoid is not None:
72− url = base_youtube_url + videoid
73− thumbnail = 'https://i.ytimg.com/vi/' + videoid + '/hqdefault.jpg'
74−
75− title = extract_text_from_dom(result, title_xpath) or videoid
76− content = extract_text_from_dom(result, content_xpath)
77−
78− embedded = embedded_url.format(videoid=videoid)
79−
80− # append result
81− results.append({'url': url,
82− 'title': title,
83− 'content': content,
84− 'template': 'videos.html',
85− 'embedded': embedded,
86− 'thumbnail': thumbnail})
53+ results_data = resp.text[resp.text.find('ytInitialData'):]
54+ results_data = results_data[results_data.find('{'):results_data.find(';\n')]
55+
56+ results_json = loads(results_data) if results_data else {}
57+ sections = results_json.get('contents', {})\
58+ .get('twoColumnSearchResultsRenderer', {})\
59+ .get('primaryContents', {})\
60+ .get('sectionListRenderer', {})\
61+ .get('contents', [])
62+
63+ for section in sections:
64+ for video_container in section.get('itemSectionRenderer', {}).get('contents', []):
65+ video = video_container.get('videoRenderer', {})
66+ videoid = video.get('videoId')
67+ if videoid is not None:
68+ url = base_youtube_url + videoid
69+ thumbnail = 'https://i.ytimg.com/vi/' + videoid + '/hqdefault.jpg'
70+ title = video.get('title', {}).get('simpleText', videoid)
71+ description_snippet = video.get('descriptionSnippet', {})
72+ if 'runs' in description_snippet:
73+ content = reduce(lambda a, b: a + b.get('text', ''), description_snippet.get('runs'), '')
74+ else:
75+ content = description_snippet.get('simpleText', '')
76+ embedded = embedded_url.format(videoid=videoid)
77+
78+ # append result
79+ results.append({'url': url,
80+ 'title': title,
81+ 'content': content,
82+ 'template': 'videos.html',
83+ 'embedded': embedded,
84+ 'thumbnail': thumbnail})
8785
8886 # return results
8987 return results
searx/query.py+6−9
@@ -113,19 +113,16 @@ class RawTextQuery(object):
113113 parse_next = True
114114 engine_name = engine_shortcuts[prefix]
115115 if engine_name in engines:
116− for engine_category in engines[engine_name].categories:
117− self.engines.append({'category': engine_category,
118− 'name': engine_name,
119− 'from_bang': True})
116+ self.engines.append({'category': 'none',
117+ 'name': engine_name,
118+ 'from_bang': True})
120119
121120 # check if prefix is equal with engine name
122121 elif prefix in engines:
123122 parse_next = True
124− if prefix in engines:
125− for engine_category in engines[prefix].categories:
126− self.engines.append({'category': engine_category,
127− 'name': prefix,
128− 'from_bang': True})
123+ self.engines.append({'category': 'none',
124+ 'name': prefix,
125+ 'from_bang': True})
129126
130127 # check if prefix is equal with categorie name
131128 elif prefix in categories:
tests/unit/engines/test_youtube_noapi.py+56−106
@@ -46,121 +46,71 @@ class TestYoutubeNoAPIEngine(SearxTestCase):
4646 self.assertEqual(youtube_noapi.response(response), [])
4747
4848 html = """
49− <ol id="item-section-063864" class="item-section">
50− <li>
51− <div class="yt-lockup yt-lockup-tile yt-lockup-video vve-check clearfix yt-uix-tile"
52− data-context-item-id="DIVZCPfAOeM"
53− data-visibility-tracking="CBgQ3DAYACITCPGXnYau6sUCFZEIHAod-VQASCj0JECx_-GK5uqMpcIB">
54− <div class="yt-lockup-dismissable"><div class="yt-lockup-thumbnail contains-addto">
55− <a aria-hidden="true" href="/watch?v=DIVZCPfAOeM" class=" yt-uix-sessionlink pf-link"
56− data-sessionlink="itct=CBgQ3DAYACITCPGXnYau6sUCFZEIHAod-VQASCj0JFIEdGVzdA">
57− <div class="yt-thumb video-thumb"><img src="//i.ytimg.com/vi/DIVZCPfAOeM/mqdefault.jpg"
58− width="196" height="110"/></div><span class="video-time" aria-hidden="true">11:35</span></a>
59− <span class="thumb-menu dark-overflow-action-menu video-actions">
60− </span>
61− </div>
62− <div class="yt-lockup-content">
63− <h3 class="yt-lockup-title">
64− <a href="/watch?v=DIVZCPfAOeM"
65− class="yt-uix-tile-link yt-ui-ellipsis yt-ui-ellipsis-2 yt-uix-sessionlink spf-link"
66− data-sessionlink="itct=CBgQ3DAYACITCPGXnYau6sUCFZEIHAod-VQASCj0JFIEdGVzdA"
67− title="Top Speed Test Kawasaki Ninja H2 (Thailand) By. MEHAY SUPERBIKE"
68− aria-describedby="description-id-259079" rel="spf-prefetch" dir="ltr">
69− Title
70− </a>
71− <span class="accessible-description" id="description-id-259079"> - Durée : 11:35.</span>
72− </h3>
73− <div class="yt-lockup-byline">de
74− <a href="/user/mheejapan" class=" yt-uix-sessionlink spf-link g-hovercard"
75− data-sessionlink="itct=CBgQ3DAYACITCPGXnYau6sUCFZEIHAod-VQASCj0JA" data-ytid="UCzEesu54Hjs0uRKmpy66qeA"
76− data-name="">MEHAY SUPERBIKE</a></div><div class="yt-lockup-meta">
77− <ul class="yt-lockup-meta-info">
78− <li>il y a 20 heures</li>
79− <li>8 424 vues</li>
80− </ul>
81− </div>
82− <div class="yt-lockup-description yt-ui-ellipsis yt-ui-ellipsis-2" dir="ltr">
83− Description
84− </div>
85− <div class="yt-lockup-badges">
86− <ul class="yt-badge-list ">
87− <li class="yt-badge-item" >
88− <span class="yt-badge">Nouveauté</span>
89− </li>
90− <li class="yt-badge-item" ><span class="yt-badge " >HD</span></li>
91− </ul>
92− </div>
93− <div class="yt-lockup-action-menu yt-uix-menu-container">
94− <div class="yt-uix-menu yt-uix-videoactionmenu hide-until-delayloaded"
95− data-video-id="DIVZCPfAOeM" data-menu-content-id="yt-uix-videoactionmenu-menu">
96− </div>
97− </div>
98− </div>
99− </div>
100− </div>
101− </li>
102− </ol>
49+ <div></div>
50+ <script>
51+ window["ytInitialData"] = {
52+ "contents": {
53+ "twoColumnSearchResultsRenderer": {
54+ "primaryContents": {
55+ "sectionListRenderer": {
56+ "contents": [
57+ {
58+ "itemSectionRenderer": {
59+ "contents": [
60+ {
61+ "videoRenderer": {
62+ "videoId": "DIVZCPfAOeM",
63+ "title": {
64+ "simpleText": "Title"
65+ },
66+ "descriptionSnippet": {
67+ "runs": [
68+ {
69+ "text": "Des"
70+ },
71+ {
72+ "text": "cription"
73+ }
74+ ]
75+ }
76+ }
77+ },
78+ {
79+ "videoRenderer": {
80+ "videoId": "9C_HReR_McQ",
81+ "title": {
82+ "simpleText": "Title"
83+ },
84+ "descriptionSnippet": {
85+ "simpleText": "Description"
86+ }
87+ }
88+ }
89+ ]
90+ }
91+ }
92+ ]
93+ }
94+ }
95+ }
96+ }
97+ };
98+ </script>
10399 """
104100 response = mock.Mock(text=html)
105101 results = youtube_noapi.response(response)
106102 self.assertEqual(type(results), list)
107− self.assertEqual(len(results), 1)
103+ self.assertEqual(len(results), 2)
108104 self.assertEqual(results[0]['title'], 'Title')
109105 self.assertEqual(results[0]['url'], 'https://www.youtube.com/watch?v=DIVZCPfAOeM')
110106 self.assertEqual(results[0]['content'], 'Description')
111107 self.assertEqual(results[0]['thumbnail'], 'https://i.ytimg.com/vi/DIVZCPfAOeM/hqdefault.jpg')
112108 self.assertTrue('DIVZCPfAOeM' in results[0]['embedded'])
113−
114− html = """
115− <ol id="item-section-063864" class="item-section">
116− <li>
117− <div class="yt-lockup yt-lockup-tile yt-lockup-video vve-check clearfix yt-uix-tile"
118− data-context-item-id="DIVZCPfAOeM"
119− data-visibility-tracking="CBgQ3DAYACITCPGXnYau6sUCFZEIHAod-VQASCj0JECx_-GK5uqMpcIB">
120− <div class="yt-lockup-dismissable"><div class="yt-lockup-thumbnail contains-addto">
121− <a aria-hidden="true" href="/watch?v=DIVZCPfAOeM" class=" yt-uix-sessionlink pf-link"
122− data-sessionlink="itct=CBgQ3DAYACITCPGXnYau6sUCFZEIHAod-VQASCj0JFIEdGVzdA">
123− <div class="yt-thumb video-thumb"><img src="//i.ytimg.com/vi/DIVZCPfAOeM/mqdefault.jpg"
124− width="196" height="110"/></div><span class="video-time" aria-hidden="true">11:35</span></a>
125− <span class="thumb-menu dark-overflow-action-menu video-actions">
126− </span>
127− </div>
128− <div class="yt-lockup-content">
129− <h3 class="yt-lockup-title">
130− <span class="accessible-description" id="description-id-259079"> - Durée : 11:35.</span>
131− </h3>
132− <div class="yt-lockup-byline">de
133− <a href="/user/mheejapan" class=" yt-uix-sessionlink spf-link g-hovercard"
134− data-sessionlink="itct=CBgQ3DAYACITCPGXnYau6sUCFZEIHAod-VQASCj0JA" data-ytid="UCzEesu54Hjs0uRKmpy66qeA"
135− data-name="">MEHAY SUPERBIKE</a></div><div class="yt-lockup-meta">
136− <ul class="yt-lockup-meta-info">
137− <li>il y a 20 heures</li>
138− <li>8 424 vues</li>
139− </ul>
140− </div>
141− <div class="yt-lockup-badges">
142− <ul class="yt-badge-list ">
143− <li class="yt-badge-item" >
144− <span class="yt-badge">Nouveauté</span>
145− </li>
146− <li class="yt-badge-item" ><span class="yt-badge " >HD</span></li>
147− </ul>
148− </div>
149− <div class="yt-lockup-action-menu yt-uix-menu-container">
150− <div class="yt-uix-menu yt-uix-videoactionmenu hide-until-delayloaded"
151− data-video-id="DIVZCPfAOeM" data-menu-content-id="yt-uix-videoactionmenu-menu">
152− </div>
153− </div>
154− </div>
155− </div>
156− </div>
157− </li>
158− </ol>
159− """
160− response = mock.Mock(text=html)
161− results = youtube_noapi.response(response)
162− self.assertEqual(type(results), list)
163− self.assertEqual(len(results), 1)
109+ self.assertEqual(results[1]['title'], 'Title')
110+ self.assertEqual(results[1]['url'], 'https://www.youtube.com/watch?v=9C_HReR_McQ')
111+ self.assertEqual(results[1]['content'], 'Description')
112+ self.assertEqual(results[1]['thumbnail'], 'https://i.ytimg.com/vi/9C_HReR_McQ/hqdefault.jpg')
113+ self.assertTrue('9C_HReR_McQ' in results[1]['embedded'])
164114
165115 html = """
166116 <ol id="item-section-063864" class="item-section">