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

Switch to class for embedding metadata

Browse Source
This commit is contained in:
Ritiek
2017-06-16 14:35:14 +05:30
parent 06853a03d4
commit e9c247ead9
3 changed files with 115 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spotdl.py
View File

@@ -1,10 +1,9 @@
#!/usr/bin/env python
# -*- coding: UTF-8 -*-
from core.embed_metadata import compare_metadata
from core.embed_metadata import embed_metadata
from core.embed_metadata import metadata_mp3
from core.embed_metadata import metadata_m4a
#from core.metadata import embed_metadata
#from core.metadata import compare_metadata
from core import metadata
from core.misc import input_link
from core.misc import trim_song
from core.misc import get_arguments
@@ -235,15 +234,17 @@ def check_exists(music_file, raw_song, islist):
if file.startswith(generate_filename(music_file)):
already_tagged = compare_metadata(file, generate_metadata(raw_song))
already_tagged = metadata.compare_metadata(file, generate_metadata(raw_song))
if is_spotify(raw_song) and not already_tagged:
os.remove("Music/" + file)
return False
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)
return False
@@ -251,8 +252,8 @@ def check_exists(music_file, raw_song, islist):
return True
def grab_list(file):
lines = open(file, 'r').read()
lines = lines.splitlines()
with open(file, 'r') as listed:
lines = (listed.read()).splitlines()
# Ignore blank lines in file (if any)
try:
lines.remove('')
@@ -301,7 +302,7 @@ def grab_single(raw_song, number=None):
convert_song(music_file)
meta_tags = generate_metadata(raw_song)
if not args.no_metadata:
embed_metadata(music_file, meta_tags, args.output_ext)
metadata.embed_metadata(music_file, meta_tags, args.output_ext)
if __name__ == '__main__':