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

Make functions and class names a little verbose

Browse Source
This commit is contained in:
Ritiek
2017-06-16 14:40:12 +05:30
parent e9c247ead9
commit 280ff41633
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/metadata.py
View File

@@ -4,7 +4,7 @@ from mutagen.id3 import ID3, APIC
from mutagen.mp4 import MP4, MP4Cover from mutagen.mp4 import MP4, MP4Cover
def compare_metadata(file, metadata): def compare(file, metadata):
try: try:
if file.endswith('.mp3'): if file.endswith('.mp3'):
audiofile = EasyID3('Music/' + file) audiofile = EasyID3('Music/' + file)
@@ -17,7 +17,7 @@ def compare_metadata(file, metadata):
already_tagged = False already_tagged = False
return already_tagged return already_tagged
class embed_metadata(object): class embed(object):
def __init__(self, music_file, meta_tags, output_ext): def __init__(self, music_file, meta_tags, output_ext):
@@ -25,14 +25,14 @@ class embed_metadata(object):
print('Could not find meta-tags') print('Could not find meta-tags')
elif output_ext == '.m4a': elif output_ext == '.m4a':
print('Fixing meta-tags') print('Fixing meta-tags')
self.metadata_m4a(music_file, meta_tags, output_ext) self.embed_m4a(music_file, meta_tags, output_ext)
elif output_ext == '.mp3': elif output_ext == '.mp3':
print('Fixing meta-tags') print('Fixing meta-tags')
self.metadata_mp3(music_file, meta_tags, output_ext) self.embed_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 metadata_mp3(self, music_file, meta_tags, output_ext): def embed_mp3(self, 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'])
@@ -64,7 +64,7 @@ class embed_metadata(object):
albumart.close() albumart.close()
audiofile.save(v2_version=3) audiofile.save(v2_version=3)
def metadata_m4a(self, music_file, meta_tags, output_ext): def embed_m4a(self, 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

6
spotdl.py
View File

@@ -1,8 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: UTF-8 -*- # -*- coding: UTF-8 -*-
#from core.metadata import embed_metadata
#from core.metadata import compare_metadata
from core import metadata from core import metadata
from core.misc import input_link from core.misc import input_link
from core.misc import trim_song from core.misc import trim_song
@@ -234,7 +232,7 @@ def check_exists(music_file, raw_song, islist):
if file.startswith(generate_filename(music_file)): if file.startswith(generate_filename(music_file)):
already_tagged = metadata.compare_metadata(file, generate_metadata(raw_song)) already_tagged = metadata.compare(file, generate_metadata(raw_song))
if is_spotify(raw_song) and not already_tagged: if is_spotify(raw_song) and not already_tagged:
os.remove("Music/" + file) os.remove("Music/" + file)
@@ -302,7 +300,7 @@ def grab_single(raw_song, number=None):
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:
metadata.embed_metadata(music_file, meta_tags, args.output_ext) metadata.embed(music_file, meta_tags, args.output_ext)
if __name__ == '__main__': if __name__ == '__main__':