mirror of
https://github.com/KevinMidboe/spotify-downloader.git
synced 2025-10-29 18:00:15 +00:00
Add logging capability (#175)
* Refactoring and addition of logzero (#172) * Refactored convert.py and added logging. * Added logging and refactored. * Added logzero to requirements.txt * Added logging to metadata.py * Created a log in misc.py. Updated slugify import. * Some general improvement * Improve message layout * Improve test mechanism * Implement debug level logging * Fix some minor mistakes * Make pytest happy * Remove unimplemented --verbose option * Update ISSUE_TEMPLATE.md * Rename LICENSE * Remove obvious from log.debug() * Show track URL when writing to file (debug)
This commit is contained in:
@@ -1,31 +1,44 @@
|
||||
# -*- coding: UTF-8 -*-
|
||||
|
||||
from spotdl import logger
|
||||
import spotdl
|
||||
import os
|
||||
|
||||
raw_song = "Tony's Videos VERY SHORT VIDEO 28.10.2016"
|
||||
|
||||
for x in os.listdir(spotdl.args.folder):
|
||||
os.remove(os.path.join(spotdl.args.folder, x))
|
||||
|
||||
class TestArgs:
|
||||
manual = False
|
||||
input_ext = '.m4a'
|
||||
output_ext = '.mp3'
|
||||
folder = 'test'
|
||||
log_level = logger.logging.DEBUG
|
||||
|
||||
test_args = TestArgs()
|
||||
setattr(spotdl, "args", test_args)
|
||||
|
||||
spotdl.log = logger.logzero.setup_logger(formatter=logger.formatter,
|
||||
level=spotdl.args.log_level)
|
||||
|
||||
|
||||
def test_youtube_url():
|
||||
expect_url = 'youtube.com/watch?v=qOOcy2-tmbk'
|
||||
expect_url = 'http://youtube.com/watch?v=qOOcy2-tmbk'
|
||||
url = spotdl.generate_youtube_url(raw_song, meta_tags=None)
|
||||
assert url == expect_url
|
||||
|
||||
|
||||
def test_youtube_title():
|
||||
expect_title = "Tony's Videos VERY SHORT VIDEO 28.10.2016"
|
||||
global content
|
||||
content = spotdl.go_pafy(raw_song, meta_tags=None)
|
||||
global title
|
||||
expect_title = "Tony's Videos VERY SHORT VIDEO 28.10.2016"
|
||||
content = spotdl.go_pafy(raw_song, meta_tags=None)
|
||||
title = spotdl.get_youtube_title(content)
|
||||
assert title == expect_title
|
||||
|
||||
def test_check_exists():
|
||||
expect_check = False
|
||||
# prerequisites for determining filename
|
||||
file_name = spotdl.misc.sanitize_title(title)
|
||||
file_name = spotdl.internals.sanitize_title(title)
|
||||
check = spotdl.check_exists(file_name, raw_song, meta_tags=None, islist=True)
|
||||
assert check == expect_check
|
||||
|
||||
@@ -33,7 +46,7 @@ def test_check_exists():
|
||||
def test_download():
|
||||
expect_download = True
|
||||
# prerequisites for determining filename
|
||||
file_name = spotdl.misc.sanitize_title(title)
|
||||
file_name = spotdl.internals.sanitize_title(title)
|
||||
download = spotdl.download_song(file_name, content)
|
||||
assert download == expect_download
|
||||
|
||||
@@ -42,7 +55,9 @@ def test_convert():
|
||||
# exit code 0 = success
|
||||
expect_convert = 0
|
||||
# prerequisites for determining filename
|
||||
file_name = spotdl.misc.sanitize_title(title)
|
||||
file_name = spotdl.internals.sanitize_title(title)
|
||||
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)
|
||||
@@ -53,11 +68,8 @@ def test_metadata():
|
||||
expect_metadata = None
|
||||
# prerequisites for determining filename
|
||||
meta_tags = spotdl.generate_metadata(raw_song)
|
||||
meta_tags = spotdl.generate_metadata(raw_song)
|
||||
file_name = spotdl.misc.sanitize_title(title)
|
||||
output_song = file_name + spotdl.args.output_ext
|
||||
file_name = spotdl.internals.sanitize_title(title)
|
||||
metadata_output = spotdl.metadata.embed(os.path.join(spotdl.args.folder, output_song), meta_tags)
|
||||
input_song = file_name + spotdl.args.input_ext
|
||||
metadata_input = spotdl.metadata.embed(os.path.join(spotdl.args.folder, input_song), meta_tags)
|
||||
assert (metadata_output == expect_metadata) and (metadata_input == expect_metadata)
|
||||
|
||||
@@ -65,8 +77,8 @@ def test_metadata():
|
||||
def test_check_exists2():
|
||||
expect_check = True
|
||||
# prerequisites for determining filename
|
||||
file_name = spotdl.misc.sanitize_title(title)
|
||||
input_song = file_name + spotdl.args.input_ext
|
||||
file_name = spotdl.internals.sanitize_title(title)
|
||||
os.remove(os.path.join(spotdl.args.folder, input_song))
|
||||
check = spotdl.check_exists(file_name, raw_song, meta_tags=None, islist=True)
|
||||
os.remove(os.path.join(spotdl.args.folder, output_song))
|
||||
assert check == expect_check
|
||||
|
||||
@@ -1,12 +1,25 @@
|
||||
# -*- coding: UTF-8 -*-
|
||||
|
||||
from spotdl import logger
|
||||
import spotdl
|
||||
import os
|
||||
|
||||
raw_song = 'http://open.spotify.com/track/0JlS7BXXD07hRmevDnbPDU'
|
||||
|
||||
for x in os.listdir(spotdl.args.folder):
|
||||
os.remove(os.path.join(spotdl.args.folder, x))
|
||||
|
||||
class TestArgs:
|
||||
manual = False
|
||||
input_ext = '.m4a'
|
||||
output_ext = '.mp3'
|
||||
folder = 'test'
|
||||
log_level = 'DEBUG'
|
||||
|
||||
test_args = TestArgs()
|
||||
setattr(spotdl, "args", test_args)
|
||||
|
||||
spotdl.log = logger.logzero.setup_logger(formatter=logger.formatter,
|
||||
level=spotdl.args.log_level)
|
||||
spotdl.internals.filter_path(spotdl.args.folder)
|
||||
|
||||
|
||||
def test_spotify_title():
|
||||
@@ -35,7 +48,7 @@ def test_check_exists():
|
||||
# prerequisites for determining filename
|
||||
songname = spotdl.generate_songname(meta_tags)
|
||||
global file_name
|
||||
file_name = spotdl.misc.sanitize_title(songname)
|
||||
file_name = spotdl.internals.sanitize_title(songname)
|
||||
check = spotdl.check_exists(file_name, raw_song, meta_tags, islist=True)
|
||||
assert check == expect_check
|
||||
|
||||
@@ -52,6 +65,8 @@ def test_convert():
|
||||
# exit code 0 = success
|
||||
expect_convert = 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)
|
||||
@@ -61,9 +76,7 @@ def test_convert():
|
||||
def test_metadata():
|
||||
expect_metadata = True
|
||||
# prerequisites for determining filename
|
||||
output_song = file_name + spotdl.args.output_ext
|
||||
metadata_output = spotdl.metadata.embed(os.path.join(spotdl.args.folder, output_song), meta_tags)
|
||||
input_song = file_name + spotdl.args.input_ext
|
||||
metadata_input = spotdl.metadata.embed(os.path.join(spotdl.args.folder, input_song), meta_tags)
|
||||
assert metadata_output == (metadata_input == expect_metadata)
|
||||
|
||||
@@ -71,7 +84,7 @@ def test_metadata():
|
||||
def test_check_exists2():
|
||||
expect_check = True
|
||||
# prerequisites for determining filename
|
||||
input_song = file_name + spotdl.args.input_ext
|
||||
os.remove(os.path.join(spotdl.args.folder, input_song))
|
||||
check = spotdl.check_exists(file_name, raw_song, meta_tags, islist=True)
|
||||
os.remove(os.path.join(spotdl.args.folder, output_song))
|
||||
assert check == expect_check
|
||||
|
||||
@@ -33,8 +33,7 @@ def test_tracks():
|
||||
try:
|
||||
fout.write(track['external_urls']['spotify'] + '\n')
|
||||
except KeyError:
|
||||
title = track['name'] + ' by '+ track['artists'][0]['name']
|
||||
print('Skipping track ' + title + ' (local only?)')
|
||||
pass
|
||||
# 1 page = 50 results
|
||||
# check if there are more pages
|
||||
if tracks['next']:
|
||||
@@ -45,7 +44,7 @@ def test_tracks():
|
||||
with open('list.txt', 'r') as listed:
|
||||
expect_song = (listed.read()).splitlines()[0]
|
||||
|
||||
spotdl.misc.trim_song('list.txt')
|
||||
spotdl.internals.trim_song('list.txt')
|
||||
with open('list.txt', 'a') as myfile:
|
||||
myfile.write(expect_song)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user