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 minor bugs

Browse Source
This commit is contained in:
Ritiek Malhotra
2017-05-02 22:52:41 +05:30
committed by GitHub
parent f0f0de3f92
commit 89c8c36785
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spotdl.py
View File

@@ -11,6 +11,7 @@ import os
import argparse import argparse
#import spotipy.util as util #import spotipy.util as util
# Python 3 compatibility
if version_info > (3,0): if version_info > (3,0):
raw_input = input raw_input = input
@@ -24,6 +25,7 @@ open('list.txt', 'a').close()
spotify = spotipy.Spotify() spotify = spotipy.Spotify()
# Set up agruments
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("-n", "--no-convert", help="skip the conversion process and meta-tags", action="store_true") parser.add_argument("-n", "--no-convert", help="skip the conversion process and meta-tags", action="store_true")
parser.add_argument("-m", "--manual", help="choose the song to download manually", action="store_true") parser.add_argument("-m", "--manual", help="choose the song to download manually", action="store_true")
@@ -67,10 +69,13 @@ def generateSongName(raw_song):
return raw_song return raw_song
def generateMetaTags(raw_song): def generateMetaTags(raw_song):
if isSpotify(raw_song): try:
return spotify.track(raw_song) if isSpotify(raw_song):
else: return spotify.track(raw_song)
return spotify.search(raw_song, limit=1)['tracks']['items'][0] else:
return spotify.search(raw_song, limit=1)['tracks']['items'][0]
except:
return None
def generateSearchURL(song): def generateSearchURL(song):
URL = "https://www.youtube.com/results?sp=EgIQAQ%253D%253D&q=" + song.replace(" ", "%20") URL = "https://www.youtube.com/results?sp=EgIQAQ%253D%253D&q=" + song.replace(" ", "%20")
@@ -183,9 +188,10 @@ def grabSingle(raw_song, number):
if not args.no_convert: if not args.no_convert:
print('Converting ' + music_file + '.m4a to mp3') print('Converting ' + music_file + '.m4a to mp3')
convertToMP3(music_file) convertToMP3(music_file)
print('Fixing meta-tags')
meta_tags = generateMetaTags(raw_song) meta_tags = generateMetaTags(raw_song)
fixSong(music_file, meta_tags) if not meta_tags == None:
print('Fixing meta-tags')
fixSong(music_file, meta_tags)
def grabList(file): def grabList(file):
lines = open(file, 'r').read() lines = open(file, 'r').read()
@@ -215,7 +221,7 @@ def fixEncoding(query):
if version_info > (3,0): if version_info > (3,0):
return query return query
else: else:
return query.decode('utf-8').encode('utf-8') return query.encode('utf-8').decode('utf-8')
def graceQuit(): def graceQuit():
print('') print('')