c1d7d30 · searx · git.iko.soy

git.iko.soy/searx

[mod] len() removed from conditions

commitc1d7d30b8ec2950a6338f0b99ebe9bdc094fdb73 authorasciimoo <asciimoo@gmail.com> dateTue 11 Feb 2014, 13:13 (13 years ago) parent239299d

8 files changed+19−17

compare with master

unifiedsplit

searx/engines/__init__.py+1−1 searx/engines/json_engine.py+1−1 searx/engines/startpage.py+1−1 searx/engines/xpath.py+1−1 searx/engines/yacy.py+3−3 searx/engines/youtube.py+6−4 searx/search.py+3−3 searx/webapp.py+3−3

searx/engines/__init__.py+1−1

@@ -163,7 +163,7 @@ def score_results(results):

163163 duplicated = new_res

164164 break

165165 if duplicated:

166− if len(res.get('content', '')) > len(duplicated.get('content', '')): # noqa

166+ if res.get('content') > duplicated.get('content'):

167167 duplicated['content'] = res['content']

168168 duplicated['score'] += score

169169 duplicated['engines'].append(res['engine'])

searx/engines/json_engine.py+1−1

@@ -39,7 +39,7 @@ def parse(query):

3939

4040def do_query(data, q):

4141 ret = []

42− if not len(q):

42+ if not q:

4343 return ret

4444

4545 qkey = q[0]

searx/engines/startpage.py+1−1

@@ -35,7 +35,7 @@ def response(resp):

3535 title = link.text_content()

3636

3737 content = ''

38− if len(result.xpath('./p[@class="desc"]')):

38+ if result.xpath('./p[@class="desc"]'):

3939 content = result.xpath('./p[@class="desc"]')[0].text_content()

4040

4141 results.append({'url': url, 'title': title, 'content': content})

searx/engines/xpath.py+1−1

@@ -23,7 +23,7 @@ if xpath_results is a string element, then it's already done

2323def extract_text(xpath_results):

2424 if type(xpath_results) == list:

2525 # it's list of result : concat everything using recursive call

26− if not len(xpath_results):

26+ if not xpath_results:

2727 raise Exception('Empty url resultset')

2828 result = ''

2929 for e in xpath_results:

searx/engines/yacy.py+3−3

@@ -13,7 +13,7 @@ def request(query, params):

1313def response(resp):

1414 raw_search_results = loads(resp.text)

1515

16− if not len(raw_search_results):

16+ if not raw_search_results:

1717 return []

1818

1919 search_results = raw_search_results.get('channels', {})[0].get('items', [])

@@ -26,10 +26,10 @@ def response(resp):

2626 tmp_result['url'] = result['link']

2727 tmp_result['content'] = ''

2828

29− if len(result['description']):

29+ if result['description']:

3030 tmp_result['content'] += result['description'] + "<br/>"

3131

32− if len(result['pubDate']):

32+ if result['pubDate']:

3333 tmp_result['content'] += result['pubDate'] + "<br/>"

3434

3535 if result['size'] != '-1':

searx/engines/youtube.py+6−4

@@ -22,9 +22,10 @@ def response(resp):

2222 if not 'feed' in search_results:

2323 return results

2424 feed = search_results['feed']

25+

2526 for result in feed['entry']:

2627 url = [x['href'] for x in result['link'] if x['type'] == 'text/html']

27− if not len(url):

28+ if not url:

2829 return

2930 # remove tracking

3031 url = url[0].replace('feature=youtube_gdata', '')

@@ -32,12 +33,13 @@ def response(resp):

3233 url = url[:-1]

3334 title = result['title']['$t']

3435 content = ''

35−

3636 thumbnail = ''

37− if len(result['media$group']['media$thumbnail']):

37+

38+ if result['media$group']['media$thumbnail']:

3839 thumbnail = result['media$group']['media$thumbnail'][0]['url']

3940 content += '<a href="{0}" title="{0}" ><img src="{1}" /></a>'.format(url, thumbnail) # noqa

40− if len(content):

41+

42+ if content:

4143 content += '<br />' + result['content']['$t']

4244 else:

4345 content = result['content']['$t']

searx/search.py+3−3

@@ -49,7 +49,7 @@ class Search(object):

4949

5050 self.categories = []

5151

52− if len(self.engines):

52+ if self.engines:

5353 self.categories = list(set(engine['category']

5454 for engine in self.engines))

5555 else:

@@ -59,13 +59,13 @@ class Search(object):

5959 if not category in categories:

6060 continue

6161 self.categories.append(category)

62− if not len(self.categories):

62+ if not self.categories:

6363 cookie_categories = request.cookies.get('categories', '')

6464 cookie_categories = cookie_categories.split(',')

6565 for ccateg in cookie_categories:

6666 if ccateg in categories:

6767 self.categories.append(ccateg)

68− if not len(self.categories):

68+ if not self.categories:

6969 self.categories = ['general']

7070

7171 for categ in self.categories:

searx/webapp.py+3−3

@@ -91,7 +91,7 @@ def render(template_name, **kwargs):

9191 for ccateg in cookie_categories:

9292 if ccateg in categories:

9393 kwargs['selected_categories'].append(ccateg)

94− if not len(kwargs['selected_categories']):

94+ if not kwargs['selected_categories']:

9595 kwargs['selected_categories'] = ['general']

9696 return render_template(template_name, **kwargs)

9797

@@ -150,12 +150,12 @@ def index():

150150 elif search.request_data.get('format') == 'csv':

151151 csv = UnicodeWriter(cStringIO.StringIO())

152152 keys = ('title', 'url', 'content', 'host', 'engine', 'score')

153− if len(search.results):

153+ if search.results:

154154 csv.writerow(keys)

155155 for row in search.results:

156156 row['host'] = row['parsed_url'].netloc

157157 csv.writerow([row.get(key, '') for key in keys])

158− csv.stream.seek(0)

158+ csv.stream.seek(0)

159159 response = Response(csv.stream.read(), mimetype='application/csv')

160160 cont_disp = 'attachment;Filename=searx_-_{0}.csv'.format(search.query)

161161 response.headers.add('Content-Disposition', cont_disp)