From bded1ee280a8e6a60ba7ecc2728117c7f824412f Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sat, 19 Feb 2022 18:23:16 +0100 Subject: [PATCH 1/3] [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 --- searx/engines/genius.py | 54 ++++++++++--------- .../themes/simple/src/less/embedded.less | 4 ++ 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/searx/engines/genius.py b/searx/engines/genius.py index 1f4b4b03e..2cdc686a7 100644 --- a/searx/engines/genius.py +++ b/searx/engines/genius.py @@ -5,7 +5,6 @@ """ -from json import loads from urllib.parse import urlencode from datetime import datetime @@ -26,6 +25,7 @@ page_size = 5 url = 'https://genius.com/api/' 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): @@ -39,11 +39,13 @@ def request(query, params): def parse_lyric(hit): - try: + content = '' + highlights = hit['highlights'] + if highlights: content = hit['highlights'][0]['value'] - except Exception as e: # pylint: disable=broad-except - logger.error(e, exc_info=True) - content = '' + else: + content = hit['result'].get('title_with_featured', '') + timestamp = hit['result']['lyrics_updated_at'] result = { 'url': hit['result']['url'], @@ -53,6 +55,12 @@ def parse_lyric(hit): } if 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 @@ -67,20 +75,19 @@ def parse_artist(hit): def parse_album(hit): - result = { - 'url': hit['result']['url'], - 'title': hit['result']['full_title'], - 'thumbnail': hit['result']['cover_art_url'], - 'content': '', + res = hit['result'] + content = res.get('name_with_artist', res.get('name', '')) + x = res.get('release_date_components') + if x: + 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} @@ -88,10 +95,9 @@ parse = {'lyric': parse_lyric, 'song': parse_lyric, 'artist': parse_artist, 'alb def response(resp): results = [] - json = loads(resp.text) - hits = [hit for section in json['response']['sections'] for hit in section['hits']] - for hit in hits: - func = parse.get(hit['type']) - if func: - results.append(func(hit)) + for section in resp.json()['response']['sections']: + for hit in section['hits']: + func = parse.get(hit['type']) + if func: + results.append(func(hit)) return results diff --git a/searx/static/themes/simple/src/less/embedded.less b/searx/static/themes/simple/src/less/embedded.less index 1074802f2..2e9216ad2 100644 --- a/searx/static/themes/simple/src/less/embedded.less +++ b/searx/static/themes/simple/src/less/embedded.less @@ -27,3 +27,7 @@ iframe[src^="https://bandcamp.com/EmbeddedPlayer/track"] { // hide playlist height: 120px; } + +iframe[src^="https://genius.com/songs"] { + height: 65px; +} From b08b81b4349b64b2b42f0a52a2c7f76073d4ffc3 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sat, 19 Feb 2022 20:14:31 +0100 Subject: [PATCH 2/3] [mod] bandcamp & genius: in result set img_src instead thumbnail Suggested-by: @dalf https://github.com/searxng/searxng/pull/900#issuecomment-1046009057 Signed-off-by: Markus Heiser --- searx/engines/bandcamp.py | 2 +- searx/engines/genius.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/searx/engines/bandcamp.py b/searx/engines/bandcamp.py index f83ca6d4f..8feff1fe0 100644 --- a/searx/engines/bandcamp.py +++ b/searx/engines/bandcamp.py @@ -82,7 +82,7 @@ def response(resp): thumbnail = result.xpath('.//div[@class="art"]/img/@src') if thumbnail: - new_result['thumbnail'] = thumbnail[0] + new_result['img_src'] = thumbnail[0] result_id = parse_qs(urlparse(link.get('href')).query)["search_item_id"][0] itemtype = extract_text(result.xpath('.//div[@class="itemtype"]')).lower() diff --git a/searx/engines/genius.py b/searx/engines/genius.py index 2cdc686a7..db1f66603 100644 --- a/searx/engines/genius.py +++ b/searx/engines/genius.py @@ -51,7 +51,7 @@ def parse_lyric(hit): 'url': hit['result']['url'], 'title': hit['result']['full_title'], 'content': content, - 'thumbnail': hit['result']['song_art_image_thumbnail_url'], + 'img_src': hit['result']['song_art_image_thumbnail_url'], } if timestamp: result.update({'publishedDate': datetime.fromtimestamp(timestamp)}) @@ -69,7 +69,7 @@ def parse_artist(hit): 'url': hit['result']['url'], 'title': hit['result']['name'], 'content': '', - 'thumbnail': hit['result']['image_url'], + 'img_src': hit['result']['image_url'], } return result @@ -85,7 +85,7 @@ def parse_album(hit): return { 'url': res['url'], 'title': res['full_title'], - 'thumbnail': res['cover_art_url'], + 'img_src': res['cover_art_url'], 'content': content.strip(), } From 96ac99b1f63538be7c492e8d86193cf519aee3ec Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Mon, 21 Feb 2022 22:16:24 +0100 Subject: [PATCH 3/3] [build] /static --- .../oscar/css/logicodev-dark.min.css.map | Bin 11830 -> 11830 bytes .../themes/simple/css/searxng-rtl.min.css | Bin 59388 -> 59440 bytes .../themes/simple/css/searxng-rtl.min.css.map | Bin 97809 -> 97892 bytes .../static/themes/simple/css/searxng.min.css | Bin 58360 -> 58412 bytes .../themes/simple/css/searxng.min.css.map | Bin 96202 -> 96285 bytes searx/static/themes/simple/js/searxng.min.js | Bin 29011 -> 29011 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/searx/static/themes/oscar/css/logicodev-dark.min.css.map b/searx/static/themes/oscar/css/logicodev-dark.min.css.map index e9928c467685b813cbaf6cfbbf9c84246d8a7cb7..6cb083bcfd6a35dfbc0abd6659073df92a4f9616 100644 GIT binary patch delta 45 zcmV+|0Mh@qT((@0d6Rzv7O{x;0g-tRlWYPBqn-jG0Yj6YBW?j?vkoMH0|8~Tk0+-F DoqP~r delta 50 zcmV-20L}llT((@0d6R|$50OI?k;Wvk#=rrQc@~lZ38S6@Apv5OpCfJoW3vtLFV4?PFII}J&PdHn&nU4nGu_NQ^QRvG D*i91^ delta 18 acmdmRf%(sQ<_&B!C;QG8-yAsez8?Ts9|-*b diff --git a/searx/static/themes/simple/css/searxng-rtl.min.css.map b/searx/static/themes/simple/css/searxng-rtl.min.css.map index 21f1358e0f23dfe7b60f7c3984d629cbe8c4f4b0..c79ba70f67ee2f78aa5e03b30cea537b4017232b 100644 GIT binary patch delta 80 zcmbREhxN%H)(uIvLXPg9I_1ue&R#nHj*gBx-p=})Q)~tAOLFV4?PFII}J&PdHn&nU4nGu_NQ^Q#vC D)D05# delta 18 acmZ2;g89dB<_&B!C;QG8-yAsewif_amk8Ye diff --git a/searx/static/themes/simple/css/searxng.min.css.map b/searx/static/themes/simple/css/searxng.min.css.map index 7e3f4ff733a05bb03beefaace950630cbc2b9366..43a083935a1cd3ad4d058900398d2020edc513ea 100644 GIT binary patch delta 80 zcmX^0o^|dA)(uIvLXPg9I_1ue&R#nHj*gBx-p=})Q*2LNpMF$?Q9?OAH7~QYST8w0 kSHCzvFTFTMDORC6CQm^jBQ-NUqr^(V%yhe&DC3eO0H50&2LJ#7 delta 23 fcmbRHf%VjT)(uIvOwPueOKeYF-`*(7I421JgR=^0 diff --git a/searx/static/themes/simple/js/searxng.min.js b/searx/static/themes/simple/js/searxng.min.js index 75f9f2b2cb1a3d48f9109d0a1645731145a6fab1..7a74e677fbb8cf624e06c155a595aeffbdba4d4e 100644 GIT binary patch delta 348 zcmccoi1G3x#tlz|7)vKV74l-tm~0^Iz?eU|P&g1s9u^J)vqdI1h{#NK6Hx>5az(5{;6{>lF+qx5~=#Bx`6^7p0bz7Ud}b1!Zk{3XlXg|B!vj$egc{I$2vm zaWbodB4grYbp<=1ztR-k7}GbeRbXXgEZ)3XF`rR6**4ME);3cwCp9mWLM=#pcCdRONf-l>Sd=^YAf03XD6lDDJW?dN0&}Mt*pV4Q&W>X V`MdHB?qZEpO=}3T`Ibth4*+76afSc@ delta 348 zcmccoi1G3x#tlz|81pAT74l*%m~0^Iz*suDP&g1s9u^J)vqdI1h{#NK6Hx>5az(crQ%&MRWG+bT54(P8m1vkcw&1)4{85z?zZ&u7_RL-$Yw6(R()XPcDOE1aLHMA~E zEK(@7O;j}k3LAjkH`!G=5@^DFWeJhwSiS7jN^K<@{p_R^I|U`};^^ebr