KevinMidboe/spotify-downloader
1
0
Fork 0
mirror of https://github.com/KevinMidboe/spotify-downloader.git synced 2026-02-15 05:49:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rebase fixes

Browse Source
This commit is contained in:
Ritiek Malhotra
2019-02-26 23:41:37 +05:30
parent 4fc23a84dc
commit e9f046bea1
7 changed files with 43 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spotdl/youtube_tools.py
View File

@@ -48,7 +48,7 @@ def go_pafy(raw_song, meta_tags=None):
def match_video_and_metadata(track):
""" Get and match track data from YouTube and Spotify. """
meta_tags = None
spotipy = spotify_tools.SpotifyAuthorize()
spotify = spotify_tools.SpotifyAuthorize()
def fallback_metadata(meta_tags):
@@ -68,13 +68,13 @@ def match_video_and_metadata(track):
content = go_pafy(track, meta_tags=None)
track = slugify(content.title).replace("-", " ")
if not const.args.no_metadata:
meta_tags = spotify_tools.generate_metadata(track)
meta_tags = spotify.generate_metadata(track)
meta_tags = fallback_metadata(meta_tags)
elif internals.is_spotify(track):
log.debug("Input song is a Spotify URL")
# Let it generate metadata, YouTube doesn't know Spotify slang
meta_tags = spotify_tools.generate_metadata(track)
meta_tags = spotify.generate_metadata(track)
content = go_pafy(track, meta_tags)
if const.args.no_metadata:
meta_tags = None
@@ -84,7 +84,7 @@ def match_video_and_metadata(track):
if const.args.no_metadata:
content = go_pafy(track, meta_tags=None)
else:
meta_tags = spotify_tools.generate_metadata(track)
meta_tags = spotify.generate_metadata(track)
content = go_pafy(track, meta_tags=meta_tags)
meta_tags = fallback_metadata(meta_tags)
@@ -98,7 +98,8 @@ def generate_metadata(content):
"artists": [{"name": content.author}],
"duration": content.length,
"external_urls": {"youtube": content.watchv_url},
"album": {"images" : [{"url": content.getbestthumb()}], "name": None},
"album": {"images" : [{"url": content.getbestthumb()}],
"artists": [{"name": None}],"name": None},
"year": content.published.split("-")[0],
"release_date": content.published.split(" ")[0],
"type": "track",