KevinMidboe/spotify-downloader
1
0
Fork 0
mirror of https://github.com/KevinMidboe/spotify-downloader.git synced 2026-01-14 13:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Save file names using a custom format specifiers (#205)

Browse Source 
* Use custom formats to generate file name

* Do not mess up search term

* Fix tests

* Fix conflicting names

* Fix subprocess call on file paths with spaces

* Create directories and keep spaces as defaults

* Fix config merge

* Remove underscores from default file format

* Remove debug info

* Show possible formats in usage help
This commit is contained in:
Ritiek Malhotra
2018-01-19 13:58:27 +05:30
committed by GitHub
parent ed235610ad
commit fcfebc55e6
11 changed files with 145 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/loader.py
View File

@@ -4,10 +4,8 @@ import spotdl
def load_defaults():
const.args = handle.get_arguments(to_group=False, raw_args='')
const.args.folder = 'test'
const.args = handle.get_arguments(raw_args='', to_group=False, to_merge=False)
const.args.overwrite = 'skip'
const.args.log_level = handle.logging.DEBUG
spotdl.args = const.args
spotdl.log = const.logzero.setup_logger(formatter=const.formatter,

37
test/test_simple.py
View File

@@ -1,5 +1,10 @@
from core import const
from core import handle
from core import internals
from core import spotify_tools
from core import youtube_tools
from core import convert
from core import metadata
import spotdl
import loader
@@ -7,12 +12,13 @@ import loader
import os
loader.load_defaults()
internals.filter_path(const.args.folder)
raw_song = "Tony's Videos VERY SHORT VIDEO 28.10.2016"
def test_youtube_url():
expect_url = 'http://youtube.com/watch?v=qOOcy2-tmbk'
url = spotdl.youtube_tools.generate_youtube_url(raw_song, meta_tags=None)
url = youtube_tools.generate_youtube_url(raw_song, meta_tags=None)
assert url == expect_url
@@ -20,48 +26,43 @@ def test_youtube_title():
global content
global title
expect_title = "Tony's Videos VERY SHORT VIDEO 28.10.2016"
content = spotdl.youtube_tools.go_pafy(raw_song, meta_tags=None)
title = spotdl.youtube_tools.get_youtube_title(content)
content = youtube_tools.go_pafy(raw_song, meta_tags=None)
title = youtube_tools.get_youtube_title(content)
assert title == expect_title
def test_check_exists():
expect_check = False
# prerequisites for determining filename
file_name = spotdl.internals.sanitize_title(title)
global file_name
file_name = internals.sanitize_title(title)
check = spotdl.check_exists(file_name, raw_song, meta_tags=None)
assert check == expect_check
def test_download():
expect_download = True
# prerequisites for determining filename
file_name = spotdl.internals.sanitize_title(title)
download = spotdl.youtube_tools.download_song(file_name, content)
download = youtube_tools.download_song(file_name, content)
assert download == expect_download
def test_convert():
# exit code 0 = success
expect_convert = 0
# prerequisites for determining filename
file_name = spotdl.internals.sanitize_title(title)
expect_converted = 0
global input_song
global output_song
input_song = file_name + const.args.input_ext
output_song = file_name + const.args.output_ext
convert = spotdl.convert.song(input_song, output_song, const.args.folder)
assert convert == expect_convert
converted = convert.song(input_song, output_song, const.args.folder)
assert converted == expect_converted
def test_metadata():
expect_metadata = None
# prerequisites for determining filename
meta_tags = spotdl.spotify_tools.generate_metadata(raw_song)
file_name = spotdl.internals.sanitize_title(title)
meta_tags = spotify_tools.generate_metadata(raw_song)
if meta_tags:
metadata_output = spotdl.metadata.embed(os.path.join(const.args.folder, output_song), meta_tags)
metadata_input = spotdl.metadata.embed(os.path.join(const.args.folder, input_song), meta_tags)
metadata_output = metadata.embed(os.path.join(const.args.folder, output_song), meta_tags)
metadata_input = metadata.embed(os.path.join(const.args.folder, input_song), meta_tags)
else:
metadata_input = None
metadata_output = None
@@ -70,8 +71,6 @@ def test_metadata():
def test_check_exists2():
expect_check = True
# prerequisites for determining filename
file_name = spotdl.internals.sanitize_title(title)
os.remove(os.path.join(const.args.folder, input_song))
check = spotdl.check_exists(file_name, raw_song, meta_tags=None)
os.remove(os.path.join(const.args.folder, output_song))

42
test/test_spotify.py
View File

@@ -1,6 +1,11 @@
from core import const
from core import handle
from core import internals
from core import spotify_tools
from core import youtube_tools
from core import convert
from core import metadata
import spotdl
@@ -8,35 +13,36 @@ import loader
import os
loader.load_defaults()
internals.filter_path(const.args.folder)
raw_song = 'http://open.spotify.com/track/0JlS7BXXD07hRmevDnbPDU'
def test_spotify_title():
expect_title = 'David André Østby - Intro'
global meta_tags
meta_tags = spotdl.spotify_tools.generate_metadata(raw_song)
title = spotdl.internals.generate_songname(meta_tags)
meta_tags = spotify_tools.generate_metadata(raw_song)
title = internals.generate_songname(const.args.file_format, meta_tags)
assert title == expect_title
def test_youtube_url():
expect_url = 'http://youtube.com/watch?v=rg1wfcty0BA'
url = spotdl.youtube_tools.generate_youtube_url(raw_song, meta_tags)
url = youtube_tools.generate_youtube_url(raw_song, meta_tags)
assert url == expect_url
def test_youtube_title():
expect_title = 'Intro - David André Østby'
content = spotdl.youtube_tools.go_pafy(raw_song, meta_tags)
title = spotdl.youtube_tools.get_youtube_title(content)
content = youtube_tools.go_pafy(raw_song, meta_tags)
title = youtube_tools.get_youtube_title(content)
assert title == expect_title
def test_check_exists():
expect_check = False
# prerequisites for determining filename
songname = spotdl.internals.generate_songname(meta_tags)
songname = internals.generate_songname(const.args.file_format, meta_tags)
global file_name
file_name = spotdl.internals.sanitize_title(songname)
file_name = internals.sanitize_title(songname)
check = spotdl.check_exists(file_name, raw_song, meta_tags)
assert check == expect_check
@@ -44,35 +50,35 @@ def test_check_exists():
def test_download():
expect_download = True
# prerequisites for determining filename
content = spotdl.youtube_tools.go_pafy(raw_song, meta_tags)
download = spotdl.youtube_tools.download_song(file_name, content)
content = youtube_tools.go_pafy(raw_song, meta_tags)
download = youtube_tools.download_song(file_name, content)
assert download == expect_download
def test_convert():
# exit code 0 = success
expect_convert = 0
expect_converted = 0
# prerequisites for determining filename
global input_song
global output_song
input_song = file_name + spotdl.args.input_ext
output_song = file_name + spotdl.args.output_ext
convert = spotdl.convert.song(input_song, output_song, spotdl.args.folder)
assert convert == expect_convert
input_song = file_name + const.args.input_ext
output_song = file_name + const.args.output_ext
converted = convert.song(input_song, output_song, const.args.folder)
assert converted == expect_converted
def test_metadata():
expect_metadata = True
# prerequisites for determining filename
metadata_output = spotdl.metadata.embed(os.path.join(spotdl.args.folder, output_song), meta_tags)
metadata_input = spotdl.metadata.embed(os.path.join(spotdl.args.folder, input_song), meta_tags)
metadata_output = metadata.embed(os.path.join(const.args.folder, output_song), meta_tags)
metadata_input = metadata.embed(os.path.join(const.args.folder, input_song), meta_tags)
assert metadata_output == (metadata_input == expect_metadata)
def test_check_exists2():
expect_check = True
# prerequisites for determining filename
os.remove(os.path.join(spotdl.args.folder, input_song))
os.remove(os.path.join(const.args.folder, input_song))
check = spotdl.check_exists(file_name, raw_song, meta_tags)
os.remove(os.path.join(spotdl.args.folder, output_song))
os.remove(os.path.join(const.args.folder, output_song))
assert check == expect_check