Fix tests and const.py to hold options

test/test_simple.py

@@ -1,32 +1,26 @@
 # -*- coding: UTF-8 -*-
 
-from spotdl import logger
+from spotdl import const
+from spotdl import handle
 import spotdl
+
 import os
 
+const.args = handle.get_arguments(to_group=False, raw_args='')
+const.args.folder = 'test'
+const.args.overwrite = 'skip'
+const.args.log_level = handle.logging.DEBUG
+
+spotdl.args = const.args
+spotdl.log = const.logzero.setup_logger(formatter=const.formatter,
+                                  level=const.args.log_level)
+
+
 raw_song = "Tony's Videos VERY SHORT VIDEO 28.10.2016"
 
-
-test_args = '-f test -ll debug -m --overwrite skip'.split()
-
-class TestArgs:
-    manual = False
-    input_ext = '.m4a'
-    output_ext = '.mp3'
-    folder = 'test'
-    log_level = logger.logging.DEBUG
-    overwrite = 'skip'
-    music_videos_only = False
-
-setattr(spotdl, "args", TestArgs())
-
-spotdl.log = logger.logzero.setup_logger(formatter=logger.formatter,
-                                  level=spotdl.args.log_level)
-
-
 def test_youtube_url():
     expect_url = 'http://youtube.com/watch?v=qOOcy2-tmbk'
-    url = spotdl.generate_youtube_url(raw_song, meta_tags=None)
+    url = spotdl.youtube_tools.generate_youtube_url(raw_song, meta_tags=None)
     assert url == expect_url
 
 
@@ -34,8 +28,8 @@ def test_youtube_title():
     global content
     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)
+    content = spotdl.youtube_tools.go_pafy(raw_song, meta_tags=None)
+    title = spotdl.youtube_tools.get_youtube_title(content)
     assert title == expect_title
 
 def test_check_exists():
@@ -50,7 +44,7 @@ def test_download():
     expect_download = True
     # prerequisites for determining filename
     file_name = spotdl.internals.sanitize_title(title)
-    download = spotdl.download_song(file_name, content)
+    download = spotdl.youtube_tools.download_song(file_name, content)
     assert download == expect_download
 
 
@@ -61,9 +55,9 @@ def test_convert():
     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)
+    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
 
 
@@ -73,8 +67,8 @@ def test_metadata():
     meta_tags = spotdl.spotify_tools.generate_metadata(raw_song)
     file_name = spotdl.internals.sanitize_title(title)
     if meta_tags:
-        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 = 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)
     else:
         metadata_input = None
         metadata_output = None
@@ -85,7 +79,7 @@ def test_check_exists2():
     expect_check = True
     # prerequisites for determining filename
     file_name = spotdl.internals.sanitize_title(title)
-    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=None)
-    os.remove(os.path.join(spotdl.args.folder, output_song))
+    os.remove(os.path.join(const.args.folder, output_song))
     assert check == expect_check

test/test_spotify.py

@@ -1,54 +1,48 @@
 # -*- coding: UTF-8 -*-
 
-from spotdl import logger
+from spotdl import const
+from spotdl import handle
 import spotdl
+
 import os
 
+const.args = handle.get_arguments(to_group=False, raw_args='')
+const.args.folder = 'test'
+const.args.overwrite = 'skip'
+const.args.log_level = handle.logging.DEBUG
+
+spotdl.args = const.args
+spotdl.log = const.logzero.setup_logger(formatter=const.formatter,
+                                  level=const.args.log_level)
+
+
 raw_song = 'http://open.spotify.com/track/0JlS7BXXD07hRmevDnbPDU'
 
-
-class TestArgs:
-    manual = False
-    input_ext = '.m4a'
-    output_ext = '.mp3'
-    folder = 'test'
-    log_level = 'DEBUG'
-    overwrite = 'skip'
-    music_videos_only = False
-
-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():
     expect_title = 'David André Østby - Intro'
     global meta_tags
     meta_tags = spotdl.spotify_tools.generate_metadata(raw_song)
-    title = spotdl.generate_songname(meta_tags)
+    title = spotdl.internals.generate_songname(meta_tags)
     assert title == expect_title
 
 
-def youtube_url():
-    expect_url = 'youtube.com/watch?v=rg1wfcty0BA'
-    url = spotdl.generate_youtube_url(raw_song, meta_tags)
+def test_youtube_url():
+    expect_url = 'http://youtube.com/watch?v=rg1wfcty0BA'
+    url = spotdl.youtube_tools.generate_youtube_url(raw_song, meta_tags)
     assert url == expect_url
 
 
-def youtube_title():
+def test_youtube_title():
     expect_title = 'Intro - David André Østby'
-    content = spotdl.go_pafy(raw_song, meta_tags)
-    title = spotdl.get_youtube_title(content)
+    content = spotdl.youtube_tools.go_pafy(raw_song, meta_tags)
+    title = spotdl.youtube_tools.get_youtube_title(content)
     assert title == expect_title
 
 
 def test_check_exists():
     expect_check = False
     # prerequisites for determining filename
-    songname = spotdl.generate_songname(meta_tags)
+    songname = spotdl.internals.generate_songname(meta_tags)
     global file_name
     file_name = spotdl.internals.sanitize_title(songname)
     check = spotdl.check_exists(file_name, raw_song, meta_tags)
@@ -58,8 +52,8 @@ def test_check_exists():
 def test_download():
     expect_download = True
     # prerequisites for determining filename
-    content = spotdl.go_pafy(raw_song, meta_tags)
-    download = spotdl.download_song(file_name, content)
+    content = spotdl.youtube_tools.go_pafy(raw_song, meta_tags)
+    download = spotdl.youtube_tools.download_song(file_name, content)
     assert download == expect_download