[fix] genius: add player an avoid exceptional programming

Add player:

- The players are just playing 30sec from the title.  Some of the player will be
  blocked because of a cross-origin request and some players will link to apple
  when you press the play button.

Avoid exceptions and (and BTW improve results)

-  ERROR   searx.engines.genius          : list index out of range

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
Markus Heiser 2022-02-19 18:23:16 +01:00
parent cb037c89f9
commit bded1ee280
2 changed files with 34 additions and 24 deletions

View File

@ -5,7 +5,6 @@
""" """
from json import loads
from urllib.parse import urlencode from urllib.parse import urlencode
from datetime import datetime from datetime import datetime
@ -26,6 +25,7 @@ page_size = 5
url = 'https://genius.com/api/' url = 'https://genius.com/api/'
search_url = url + 'search/{index}?{query}&page={pageno}&per_page={page_size}' search_url = url + 'search/{index}?{query}&page={pageno}&per_page={page_size}'
music_player = 'https://genius.com{api_path}/apple_music_player'
def request(query, params): def request(query, params):
@ -39,11 +39,13 @@ def request(query, params):
def parse_lyric(hit): def parse_lyric(hit):
try: content = ''
highlights = hit['highlights']
if highlights:
content = hit['highlights'][0]['value'] content = hit['highlights'][0]['value']
except Exception as e: # pylint: disable=broad-except else:
logger.error(e, exc_info=True) content = hit['result'].get('title_with_featured', '')
content = ''
timestamp = hit['result']['lyrics_updated_at'] timestamp = hit['result']['lyrics_updated_at']
result = { result = {
'url': hit['result']['url'], 'url': hit['result']['url'],
@ -53,6 +55,12 @@ def parse_lyric(hit):
} }
if timestamp: if timestamp:
result.update({'publishedDate': datetime.fromtimestamp(timestamp)}) result.update({'publishedDate': datetime.fromtimestamp(timestamp)})
api_path = hit['result'].get('api_path')
if api_path:
# The players are just playing 30sec from the title. Some of the player
# will be blocked because of a cross-origin request and some players will
# link to apple when you press the play button.
result['iframe_src'] = music_player.format(api_path=api_path)
return result return result
@ -67,20 +75,19 @@ def parse_artist(hit):
def parse_album(hit): def parse_album(hit):
result = { res = hit['result']
'url': hit['result']['url'], content = res.get('name_with_artist', res.get('name', ''))
'title': hit['result']['full_title'], x = res.get('release_date_components')
'thumbnail': hit['result']['cover_art_url'], if x:
'content': '', x = x.get('year')
if x:
content = "%s / %s" % (x, content)
return {
'url': res['url'],
'title': res['full_title'],
'thumbnail': res['cover_art_url'],
'content': content.strip(),
} }
try:
year = hit['result']['release_date_components']['year']
except Exception as e: # pylint: disable=broad-except
logger.error(e, exc_info=True)
else:
if year:
result.update({'content': 'Released: {}'.format(year)})
return result
parse = {'lyric': parse_lyric, 'song': parse_lyric, 'artist': parse_artist, 'album': parse_album} parse = {'lyric': parse_lyric, 'song': parse_lyric, 'artist': parse_artist, 'album': parse_album}
@ -88,10 +95,9 @@ parse = {'lyric': parse_lyric, 'song': parse_lyric, 'artist': parse_artist, 'alb
def response(resp): def response(resp):
results = [] results = []
json = loads(resp.text) for section in resp.json()['response']['sections']:
hits = [hit for section in json['response']['sections'] for hit in section['hits']] for hit in section['hits']:
for hit in hits: func = parse.get(hit['type'])
func = parse.get(hit['type']) if func:
if func: results.append(func(hit))
results.append(func(hit))
return results return results

View File

@ -27,3 +27,7 @@ iframe[src^="https://bandcamp.com/EmbeddedPlayer/track"] {
// hide playlist // hide playlist
height: 120px; height: 120px;
} }
iframe[src^="https://genius.com/songs"] {
height: 65px;
}