KevinMidboe/spotify-downloader
1
0
Fork 0
mirror of https://github.com/KevinMidboe/spotify-downloader.git synced 2025-10-29 18:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't view sort results if metadata not found

Browse Source
This commit is contained in:
ritiek
2017-08-02 17:49:16 +05:30
parent 606e55bb1e
commit 67f594c7b0
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/misc.py
View File

@@ -98,11 +98,14 @@ def generate_token():
return token return token
def generate_search_url(song): def generate_search_url(song, viewsort=False):
"""Generate YouTube search URL for the given song.""" """Generate YouTube search URL for the given song."""
# urllib.request.quote() encodes URL with special characters # urllib.request.quote() encodes URL with special characters
url = u"https://www.youtube.com/results?q={0}&sp=CAMSAhABUBQ%253D".format( song = quote(song)
quote(song)) if viewsort:
url = u"https://www.youtube.com/results?q={0}&sp=CAMSAhABUBQ%253D".format(song)
else:
url = u"https://www.youtube.com/results?sp=EgIQAQ%253D%253D&q={0}".format(song)
return url return url

4
spotdl.py
View File

@@ -58,9 +58,11 @@ def generate_youtube_url(raw_song):
meta_tags = generate_metadata(raw_song) meta_tags = generate_metadata(raw_song)
if meta_tags is None: if meta_tags is None:
song = raw_song song = raw_song
search_url = misc.generate_search_url(song, viewsort=False)
else: else:
song = generate_songname(meta_tags) song = generate_songname(meta_tags)
search_url = misc.generate_search_url(song) search_url = misc.generate_search_url(song, viewsort=True)
item = urllib.request.urlopen(search_url).read() item = urllib.request.urlopen(search_url).read()
# item = unicode(item, 'utf-8') # item = unicode(item, 'utf-8')
items_parse = BeautifulSoup(item, "html.parser") items_parse = BeautifulSoup(item, "html.parser")