Add tests for encoders

and some refactoring

spotdl/encode/encoders/avconv.py

@@ -1,13 +1,15 @@
 import subprocess
 import os
 from logzero import logger as log
+
 from spotdl.encode import EncoderBase
 from spotdl.encode.exceptions import EncoderNotFoundError
 from spotdl.encode.exceptions import AvconvNotFoundError
 
+
 class EncoderAvconv(EncoderBase):
     def __init__(self, encoder_path="avconv"):
-        print("Using EncoderAvconv is deprecated and will be removed"
+        print("Using EncoderAvconv is deprecated and will be removed",
               "in future versions. Use EncoderFFmpeg instead.")
         encoder_path = encoder_path
         _loglevel = "-loglevel 0"

spotdl/encode/encoders/ffmpeg.py

@@ -9,8 +9,8 @@ from spotdl.encode.exceptions import FFmpegNotFoundError
 RULES = {
     "m4a": {
         "mp3": "-codec:v copy -codec:a libmp3lame -ar 48000",
-        "webm": "-codec:a libopus -vbr on ",
-        "m4a": "-acodec copy ",
+        "webm": "-codec:a libopus -vbr on",
+        "m4a": "-acodec copy",
         "flac": "-codec:a flac -ar 48000",
     },
     "webm": {

spotdl/encode/encoders/tests/test_avconv.py

@@ -0,0 +1,58 @@
+from spotdl.encode import EncoderBase
+from spotdl.encode.exceptions import AvconvNotFoundError
+from spotdl.encode.encoders import EncoderAvconv
+
+import pytest
+
+
+class TestEncoderAvconv:
+    def test_subclass(self):
+        assert issubclass(EncoderAvconv, EncoderBase)
+
+    def test_avconv_not_found_error(self):
+        with pytest.raises(AvconvNotFoundError):
+            EncoderAvconv(encoder_path="/a/nonexistent/path")
+
+
+class TestEncodingDefaults:
+    def encode_command(input_file, output_file):
+        command = [
+            'avconv', '-y', '-loglevel', '0',
+            '-i', input_file,
+            '-ab', '192k',
+            output_file,
+        ]
+        return command
+
+    @pytest.mark.parametrize("files, expected_command", [
+        (("test.m4a", "test.mp3"), encode_command("test.m4a", "test.mp3")),
+        (("abc.m4a", "cba.webm"), encode_command("abc.m4a", "cba.webm")),
+        (("bla bla.m4a", "ble ble.m4a"), encode_command("bla bla.m4a", "ble ble.m4a")),
+        (("😛.m4a", "• tongue.flac"), encode_command("😛.m4a", "• tongue.flac")),
+    ])
+    def test_generate_encode_command(self, files, expected_command):
+        encoder = EncoderAvconv()
+        assert encoder._generate_encode_command(*files) == expected_command
+
+
+class TestEncodingInDebugMode:
+    def debug_encode_command(input_file, output_file):
+        command = [
+            'avconv', '-y', '-loglevel', 'debug',
+            '-i', input_file,
+            '-ab', '192k',
+            output_file,
+        ]
+        return command
+
+    @pytest.mark.parametrize("files, expected_command", [
+        (("test.m4a", "test.mp3"), debug_encode_command("test.m4a", "test.mp3")),
+        (("abc.m4a", "cba.webm"), debug_encode_command("abc.m4a", "cba.webm")),
+        (("bla bla.m4a", "ble ble.m4a"), debug_encode_command("bla bla.m4a", "ble ble.m4a")),
+        (("😛.m4a", "• tongue.flac"), debug_encode_command("😛.m4a", "• tongue.flac")),
+    ])
+    def test_generate_encode_command_with_debug(self, files, expected_command):
+        encoder = EncoderAvconv()
+        encoder.set_debuglog()
+        assert encoder._generate_encode_command(*files) == expected_command
+

spotdl/encode/encoders/tests/test_ffmpeg.py

@@ -1,5 +1,5 @@
 from spotdl.encode import EncoderBase
-# from spotdl.encode import exceptions
+from spotdl.encode.exceptions import FFmpegNotFoundError
 from spotdl.encode.encoders import EncoderFFmpeg
 
 import pytest
@@ -9,6 +9,10 @@ class TestEncoderFFmpeg:
     def test_subclass(self):
         assert issubclass(EncoderFFmpeg, EncoderBase)
 
+    def test_ffmpeg_not_found_error(self):
+        with pytest.raises(FFmpegNotFoundError):
+            EncoderFFmpeg(encoder_path="/a/nonexistent/path")
+
 
 class TestEncodingDefaults:
     def m4a_to_mp3_encoder(input_file, output_file):