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

Fix check_exists() from giving prompts on non-existent files

Browse Source
This commit is contained in:
Ritiek
2017-06-16 02:06:08 +05:30
parent be088f6dc0
commit 74511cf596
2 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/misc.py
View File

@@ -1,6 +1,7 @@
import argparse import argparse
import sys import sys
import os import os
from slugify import slugify
import spotipy.oauth2 as oauth2 import spotipy.oauth2 as oauth2
def input_link(links): def input_link(links):
@@ -56,6 +57,11 @@ def is_spotify(raw_song):
else: else:
return False return False
def generate_filename(title):
raw_title = title.replace(' ', '_')
filename = slugify(raw_title, ok='-_()[]{}', lower=False)
return fix_encoding(filename)
def generate_token(): def generate_token():
# Please respect this user token :) # Please respect this user token :)
creds = oauth2.SpotifyClientCredentials( creds = oauth2.SpotifyClientCredentials(

70
spotdl.py
View File

@@ -5,16 +5,17 @@ from core.misc import input_link
from core.misc import trim_song from core.misc import trim_song
from core.misc import get_arguments from core.misc import get_arguments
from core.misc import is_spotify from core.misc import is_spotify
from core.misc import generate_filename
from core.misc import generate_token from core.misc import generate_token
from core.misc import generate_search_URL from core.misc import generate_search_URL
from core.misc import fix_encoding from core.misc import fix_encoding
from core.misc import grace_quit from core.misc import grace_quit
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
from titlecase import titlecase from titlecase import titlecase
from slugify import slugify
from mutagen.easyid3 import EasyID3 from mutagen.easyid3 import EasyID3
from mutagen.id3 import ID3, APIC from mutagen.id3 import ID3, APIC
from mutagen.mp4 import MP4, MP4Cover from mutagen.mp4 import MP4, MP4Cover
from slugify import slugify
import spotipy import spotipy
import spotipy.oauth2 as oauth2 import spotipy.oauth2 as oauth2
import urllib2 import urllib2
@@ -23,7 +24,7 @@ import sys
import os import os
import subprocess import subprocess
def generate_song_name(raw_song): def generate_songname(raw_song):
if is_spotify(raw_song): if is_spotify(raw_song):
tags = generate_metadata(raw_song) tags = generate_metadata(raw_song)
raw_song = tags['artists'][0]['name'] + ' - ' + tags['name'] raw_song = tags['artists'][0]['name'] + ' - ' + tags['name']
@@ -51,11 +52,11 @@ def generate_metadata(raw_song):
#pprint.pprint(spotify.album(meta_tags['album']['id'])) #pprint.pprint(spotify.album(meta_tags['album']['id']))
return meta_tags return meta_tags
except BaseException: except (urllib2.URLError, IOError):
return None return None
def generate_YouTube_URL(raw_song): def generate_YouTube_URL(raw_song):
song = generate_song_name(raw_song) song = generate_songname(raw_song)
searchURL = generate_search_URL(song) searchURL = generate_search_URL(song)
item = urllib2.urlopen(searchURL).read() item = urllib2.urlopen(searchURL).read()
items_parse = BeautifulSoup(item, "html.parser") items_parse = BeautifulSoup(item, "html.parser")
@@ -128,14 +129,8 @@ def feed_playlist(username):
tracks = spotify.next(tracks) tracks = spotify.next(tracks)
feed_tracks(file, tracks) feed_tracks(file, tracks)
# Generate name for the song to be downloaded
def generate_filename(content):
title = (content.title).replace(' ', '_')
title = slugify(title, ok='-_()[]{}', lower=False)
return fix_encoding(title)
def download_song(content): def download_song(content):
music_file = generate_filename(content) music_file = generate_filename(content.title)
if args.input_ext == '.webm': if args.input_ext == '.webm':
link = content.getbestaudio(preftype='webm') link = content.getbestaudio(preftype='webm')
if link is not None: if link is not None:
@@ -237,39 +232,42 @@ def check_exists(music_file, raw_song, islist):
os.remove("Music/" + file) os.remove("Music/" + file)
continue continue
if file.startswith(music_file): if file.startswith(generate_filename(music_file)):
# FIXME audiofile = EasyID3('Music/' + file)
#audiofile = mutagen.load("Music/" + music_file + output_ext)
#if is_spotify(raw_song) and not audiofile.tag.title == ( try:
# generate_metadata(raw_song))['name']: already_tagged = audiofile['title'][0] == generate_metadata(raw_song)['name']
# os.remove("Music/" + music_file + output_ext) except KeyError:
# return False already_tagged = False
os.remove("Music/" + file)
return False if is_spotify(raw_song) and not already_tagged:
if islist:
return True
else:
prompt = raw_input('Song with same name has already been downloaded. Re-download? (y/n): ').lower()
if prompt == "y":
os.remove("Music/" + file) os.remove("Music/" + file)
return False return False
else:
if islist:
return True return True
else:
prompt = raw_input('Song with same name has already been downloaded. Re-download? (y/n): ').lower()
if prompt == "y":
os.remove("Music/" + file)
return False
else:
return True
# Remove song from file once downloaded # Remove song from file once downloaded
def fix_metadata(music_file, meta_tags): def fix_metadata(music_file, meta_tags, output_ext):
if meta_tags is None: if meta_tags is None:
print('Could not find meta-tags') print('Could not find meta-tags')
elif args.output_ext == '.m4a': elif output_ext == '.m4a':
print('Fixing meta-tags') print('Fixing meta-tags')
fix_metadata_m4a(music_file, meta_tags) fix_metadata_m4a(music_file, meta_tags, output_ext)
elif args.output_ext == '.mp3': elif output_ext == '.mp3':
print('Fixing meta-tags') print('Fixing meta-tags')
fix_metadata_mp3(music_file, meta_tags) fix_metadata_mp3(music_file, meta_tags, output_ext)
else: else:
print('Cannot embed meta-tags into given output extension') print('Cannot embed meta-tags into given output extension')
def fix_metadata_mp3(music_file, meta_tags): def fix_metadata_mp3(music_file, meta_tags, output_ext):
artists = [] artists = []
for artist in meta_tags['artists']: for artist in meta_tags['artists']:
artists.append(artist['name']) artists.append(artist['name'])
@@ -301,7 +299,7 @@ def fix_metadata_mp3(music_file, meta_tags):
albumart.close() albumart.close()
audiofile.save(v2_version=3) audiofile.save(v2_version=3)
def fix_metadata_m4a(music_file, meta_tags): def fix_metadata_m4a(music_file, meta_tags, output_ext):
# eyed serves only mp3 not aac so using mutagen # eyed serves only mp3 not aac so using mutagen
# Apple has specific tags - see mutagen docs - # Apple has specific tags - see mutagen docs -
# http://mutagen.readthedocs.io/en/latest/api/mp4.html # http://mutagen.readthedocs.io/en/latest/api/mp4.html
@@ -363,7 +361,7 @@ def grab_list(file):
print('') print('')
except KeyboardInterrupt: except KeyboardInterrupt:
grace_quit() grace_quit()
except (URLError, IOError): except (urllib2.URLError, IOError):
lines.append(raw_song) lines.append(raw_song)
trim_song(file) trim_song(file)
with open(file, 'a') as myfile: with open(file, 'a') as myfile:
@@ -380,14 +378,14 @@ def grab_single(raw_song, number=None):
if content is None: if content is None:
return return
print(get_YouTube_title(content, number)) print(get_YouTube_title(content, number))
music_file = generate_filename(content) music_file = generate_filename(content.title)
if not check_exists(music_file, raw_song, islist=islist): if not check_exists(music_file, raw_song, islist=islist):
download_song(content) download_song(content)
print('') print('')
convert_song(music_file) convert_song(music_file)
meta_tags = generate_metadata(raw_song) meta_tags = generate_metadata(raw_song)
if not args.no_metadata: if not args.no_metadata:
fix_metadata(music_file, meta_tags) fix_metadata(music_file, meta_tags, args.output_ext)
if __name__ == '__main__': if __name__ == '__main__':