From 951c192adbb8ba2b83d0e4d58554611af677ea44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B0=D0=B2=D0=BB=D0=BE?= <33848191+p182@users.noreply.github.com> Date: Wed, 30 Sep 2020 13:28:29 +0300 Subject: [PATCH 1/3] Update musicbrainz.py URLEncode already do URL Quoting, so we don't need to do it before --- maloja/thirdparty/musicbrainz.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maloja/thirdparty/musicbrainz.py b/maloja/thirdparty/musicbrainz.py index 9e146a8..7a13bbd 100644 --- a/maloja/thirdparty/musicbrainz.py +++ b/maloja/thirdparty/musicbrainz.py @@ -33,8 +33,8 @@ class MusicBrainz(MetadataInterface): self.lock.acquire() try: artists, title = track - artiststring = urllib.parse.quote(", ".join(artists)) - titlestring = urllib.parse.quote(title) + artiststring = ", ".join(artists) #Join artists collection into string + titlestring = title querystr = urllib.parse.urlencode({ "fmt":"json", "query":"{title} {artist}".format(artist=artiststring,title=titlestring) From 30f10ba46e4f2d345897d70d173aa4b15ac12a66 Mon Sep 17 00:00:00 2001 From: ICTman1076 Date: Wed, 30 Sep 2020 20:18:28 +0100 Subject: [PATCH 2/3] Add services to links.jinja Beatport, Bandcamp and Qobuz --- maloja/web/jinja/snippets/links.jinja | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maloja/web/jinja/snippets/links.jinja b/maloja/web/jinja/snippets/links.jinja index 1ca240b..f765c1b 100644 --- a/maloja/web/jinja/snippets/links.jinja +++ b/maloja/web/jinja/snippets/links.jinja @@ -72,7 +72,10 @@ "soundcloud":'https://soundcloud.com/search?q=', "amazonmusic":'https://music.amazon.com/search/', "deezer":'https://www.deezer.com/search/', - "apple":'https://music.apple.com/us/search/song?term=' + "apple":'https://music.apple.com/us/search/song?term=', + "beatport":'https://beatport.com/search?q=', + "bandcamp":'https://bandcamp.com/search?q=', + "qobuz":'https://www.qobuz.com/us-en/search?q=' } %} From 258b9c22d6082f5d26f9881bc671db63ba64011c Mon Sep 17 00:00:00 2001 From: ICTman1076 Date: Wed, 30 Sep 2020 20:22:47 +0100 Subject: [PATCH 3/3] Update default.ini with new search services --- maloja/data_files/settings/default.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maloja/data_files/settings/default.ini b/maloja/data_files/settings/default.ini index e07427d..f024edb 100644 --- a/maloja/data_files/settings/default.ini +++ b/maloja/data_files/settings/default.ini @@ -34,7 +34,7 @@ CACHE_EXPIRE_POSITIVE = 300 # after how many days positive results should be ref THUMBOR_SERVER = None THUMBOR_SECRET = "" -# Can be 'YouTube', 'YouTube Music', 'Spotify', 'Tidal', 'SoundCloud', 'Deezer', 'Amazon Music', 'Apple' +# Can be 'YouTube', 'YouTube Music', 'Spotify', 'Tidal', 'SoundCloud', 'Deezer', 'Amazon Music', 'Apple', 'Beatport', 'Bandcamp', 'Qobuz' # Set to None to disable TRACK_SEARCH_PROVIDER = None