git.iko.soy/searx
on master help sign in
[fix] fdroid engine
commitfcc9587ee9b1a4b31a511a8580f2d534e400e96b authorDalf <alex@al-f.net> dateMon 5 Aug 2019, 15:44 (7 years ago) parentfbf6b68
2 files changed+47−37
compare with master
unifiedsplit
searx/engines/fdroid.py+14−15 tests/unit/engines/test_fdroid.py+33−22
searx/engines/fdroid.py+14−15
@@ -18,13 +18,13 @@ categories = ['files']
1818paging = True
1919
2020# search-url
21−base_url = 'https://f-droid.org/'
22−search_url = base_url + 'repository/browse/?{query}'
21+base_url = 'https://search.f-droid.org/'
22+search_url = base_url + '?{query}'
2323
2424
2525# do search-request
2626def request(query, params):
27− query = urlencode({'fdfilter': query, 'fdpage': params['pageno']})
27+ query = urlencode({'q': query, 'page': params['pageno'], 'lang': ''})
2828 params['url'] = search_url.format(query=query)
2929 return params
3030
@@ -35,17 +35,16 @@ def response(resp):
3535
3636 dom = html.fromstring(resp.text)
3737
38− for app in dom.xpath('//div[@id="appheader"]'):
39− url = app.xpath('./ancestor::a/@href')[0]
40− title = app.xpath('./p/span/text()')[0]
41− img_src = app.xpath('.//img/@src')[0]
42−
43− content = extract_text(app.xpath('./p')[0])
44− content = content.replace(title, '', 1).strip()
45−
46− results.append({'url': url,
47− 'title': title,
48− 'content': content,
49− 'img_src': img_src})
38+ for app in dom.xpath('//a[@class="package-header"]'):
39+ app_url = app.xpath('./@href')[0]
40+ app_title = extract_text(app.xpath('./div/h4[@class="package-name"]/text()'))
41+ app_content = extract_text(app.xpath('./div/div/span[@class="package-summary"]')).strip() \
42+ + ' - ' + extract_text(app.xpath('./div/div/span[@class="package-license"]')).strip()
43+ app_img_src = app.xpath('./img[@class="package-icon"]/@src')[0]
44+
45+ results.append({'url': app_url,
46+ 'title': app_title,
47+ 'content': app_content,
48+ 'img_src': app_img_src})
5049
5150 return results
tests/unit/engines/test_fdroid.py+33−22
@@ -13,29 +13,40 @@ class TestFdroidEngine(SearxTestCase):
1313 params = fdroid.request(query, dic)
1414 self.assertTrue('url' in params)
1515 self.assertTrue(query in params['url'])
16− self.assertTrue('f-droid.org' in params['url'])
16+ self.assertTrue('search.f-droid.org' in params['url'])
1717
18− def test_response(self):
18+ def test_response_empty(self):
1919 resp = mock.Mock(text='<html></html>')
2020 self.assertEqual(fdroid.response(resp), [])
2121
22+ def test_response_oneresult(self):
2223 html = """
23− <a href="https://google.com/qwerty">
24− <div id="appheader">
25− <div style="float:left;padding-right:10px;">
26− <img src="http://example.com/image.png"
27− style="width:48px;border:none;">
28− </div>
29− <div style="float:right;">
30− <p>Details...</p>
31− </div>
32− <p style="color:#000000;">
33− <span style="font-size:20px;">Sample title</span>
34− <br>
35− Sample content
36− </p>
37− </div>
38− </a>
24+<!DOCTYPE html>
25+<html>
26+<head>
27+ <title>test</title>
28+</head>
29+<body>
30+ <div class="site-wrapper">
31+ <div class="main-content">
32+ <a class="package-header" href="https://example.com/app.url">
33+ <img class="package-icon" src="https://example.com/appexample.logo.png" />
34+
35+ <div class="package-info">
36+ <h4 class="package-name">
37+ App Example 1
38+ </h4>
39+
40+ <div class="package-desc">
41+ <span class="package-summary">Description App Example 1</span>
42+ <span class="package-license">GPL-3.0-only</span>
43+ </div>
44+ </div>
45+ </a>
46+ </div>
47+ </div>
48+</body>
49+</html>
3950 """
4051
4152 resp = mock.Mock(text=html)
@@ -43,7 +54,7 @@ class TestFdroidEngine(SearxTestCase):
4354
4455 self.assertEqual(type(results), list)
4556 self.assertEqual(len(results), 1)
46− self.assertEqual(results[0]['url'], 'https://google.com/qwerty')
47− self.assertEqual(results[0]['title'], 'Sample title')
48− self.assertEqual(results[0]['content'], 'Sample content')
49− self.assertEqual(results[0]['img_src'], 'http://example.com/image.png')
57+ self.assertEqual(results[0]['url'], 'https://example.com/app.url')
58+ self.assertEqual(results[0]['title'], 'App Example 1')
59+ self.assertEqual(results[0]['content'], 'Description App Example 1 - GPL-3.0-only')
60+ self.assertEqual(results[0]['img_src'], 'https://example.com/appexample.logo.png')