KevinMidboe/spotify-downloader
1
0
Fork 0
mirror of https://github.com/KevinMidboe/spotify-downloader.git synced 2025-12-08 20:39:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
ritiek
2018-01-12 15:56:09 +05:30
parent b2f3c43d0f
commit 8c76bd8ea3
7 changed files with 77 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/youtube_tools.py
View File

@@ -71,15 +71,15 @@ def generate_youtube_url(raw_song, meta_tags, tries_remaining=5):
else:
song = internals.generate_songname(meta_tags)
query['q'] = song
log.debug('Query: {0}'.format(query))
log.debug('query: {0}'.format(query))
data = pafy.call_gdata('search', query)
query2 = {'part': 'contentDetails,snippet,statistics',
query_results = {'part': 'contentDetails,snippet,statistics',
'maxResults': 50,
'id': ','.join(i['id']['videoId'] for i in data['items'])}
log.debug('Query2: {0}'.format(query2))
log.debug('query_results: {0}'.format(query_results))
vdata = pafy.call_gdata('videos', query2)
vdata = pafy.call_gdata('videos', query_results)
videos = []
for x in vdata['items']:
@@ -94,8 +94,6 @@ def generate_youtube_url(raw_song, meta_tags, tries_remaining=5):
if not videos:
return None
log.debug(pprint.pformat(videos))
if const.args.manual:
log.info(song)
log.info('0. Skip downloading this song.\n')