Accept additional command-line options

spotdl/command_line/__main__.py

@@ -16,12 +16,16 @@ def match_arguments(arguments):
                 track_file=arguments.list
             )
         else:
-            list_dl = downloader.ListDownloader(
-                tracks_file=arguments.list,
-                skip_file=arguments.skip,
-                write_successful_file=arguments.write_successful,
+            command_line.helpers.download_tracks_from_file(
+                arguments.list,
+                arguments,
             )
-            list_dl.download_list()
+            # list_dl = downloader.ListDownloader(
+            #     tracks_file=arguments.list,
+            #     skip_file=arguments.skip,
+            #     write_successful_file=arguments.write_successful,
+            # )
+            # list_dl.download_list()
     elif arguments.playlist:
         spotify_tools.write_playlist(
             playlist_url=arguments.playlist, text_file=arguments.write_to

spotdl/command_line/arguments.py

@@ -134,6 +134,7 @@ def get_arguments(argv=None, to_merge=True):
         "-e",
         "--encoder",
         default=config["encoder"],
+        choices={"ffmpeg", "avconv", "null"},
         help="use this encoder for conversion",
     )
     parser.add_argument(
@@ -145,21 +146,29 @@ def get_arguments(argv=None, to_merge=True):
     parser.add_argument(
         "--overwrite",
         default=config["overwrite"],
-        help="change the overwrite policy",
         choices={"prompt", "force", "skip"},
+        help="change the overwrite policy",
+    )
+    parser.add_argument(
+        "-q",
+        "--quality",
+        default=config["quality"],
+        choices={"best", "worst"},
+        help="preferred audio quality",
     )
     parser.add_argument(
         "-i",
         "--input-ext",
         default=config["input-ext"],
-        help="preferred input format 'm4a' or 'webm' (Opus)",
-        choices={"m4a", "webm"},
+        choices={"automatic", "m4a", "opus"},
+        help="preferred input format",
     )
     parser.add_argument(
         "-o",
         "--output-ext",
         default=config["output-ext"],
-        help="preferred output format: 'mp3', 'm4a' (AAC), 'flac', etc.",
+        choices={"mp3", "m4a", "flac"},
+        help="preferred output format",
     )
     parser.add_argument(
         "--write-to",
@@ -310,7 +319,7 @@ def run_errands(parser, parsed):
     if not encoder_exists:
         # log.warn("Specified encoder () was not found. Will not encode to specified "
         #          "output format".format(parsed.encoder))
-        parsed.output_ext = parsed.input_ext
+        parsed.encoder = "null"
 
     song_parameter_passed = parsed.song is not None and parsed.tracks is None
     if song_parameter_passed:

spotdl/command_line/helpers.py

@@ -1,6 +1,7 @@
 from spotdl.metadata.providers import ProviderSpotify
 from spotdl.metadata.providers import ProviderYouTube
 from spotdl.metadata.embedders import EmbedderDefault
+from spotdl.encode.encoders import EncoderFFmpeg, EncoderAvconv
 from spotdl.lyrics.providers import LyricWikia
 from spotdl.lyrics.providers import Genius
 
@@ -8,6 +9,7 @@ from spotdl.track import Track
 
 import spotdl.util
 
+import os
 import urllib.request
 import threading
 
@@ -46,34 +48,57 @@ def download_track_from_metadata(metadata, arguments):
     track = Track(metadata, cache_albumart=(not arguments.no_metadata))
     # log.info(log_fmt)
 
+    stream = metadata["streams"].get(
+        quality=arguments.quality,
+        preftype=arguments.input_ext,
+    )
+    # log.info(stream)
+
+    Encoder = {
+        "ffmpeg": EncoderFFmpeg,
+        "avconv": EncoderAvconv,
+    }.get(arguments.encoder)
+
+    if Encoder is None:
+        output_extension = stream["encoding"]
+    else:
+        output_extension = arguments.output_ext
+
     filename = spotdl.util.format_string(
         arguments.file_format,
         metadata,
-        output_extension=arguments.output_ext
+        output_extension=output_extension
     )
+    # log.info(filename)
 
-    if arguments.dry_run:
-        return
-
-    if os.path.isfile(filename):
-        if arguments.overwrite == "skip":
-            to_skip = True
+    to_skip = arguments.dry_run
+    if not to_skip and os.path.isfile(filename):
+        if arguments.overwrite == "force":
+            to_skip = False
         elif arguments.overwrite == "prompt":
             to_skip = not input("overwrite? (y/N)").lower() == "y"
+        else:
+            to_skip = True
 
     if to_skip:
         return
 
-    if arguments.no_encode:
-        track.download(filename)
+    if Encoder is None:
+        track.download(stream, filename)
     else:
         track.download_while_re_encoding(
+            stream,
             filename,
-            target_encoding=arguments.output_ext
+            target_encoding=output_extension,
+            encoder=Encoder()
         )
 
     if not arguments.no_metadata:
-        track.apply_metadata(filename, encoding=arguments.output_ext)
+        try:
+            track.apply_metadata(filename, encoding=output_extension)
+        except TypeError:
+            # log.warning("Cannot write metadata to given file")
+            pass
 
 
 def download_tracks_from_file(path, arguments):
@@ -142,9 +167,9 @@ def download_tracks_from_file(path, arguments):
             # log.warning("Failed. Will retry after other songs\n")
             tracks.append(current_track)
         else:
-            # TODO: CONFIG.YML
-            #       Write track to config.write_sucessful
-            pass
+            if arguments.write_successful:
+                with open(arguments.write_successful, "a") as fout:
+                    fout.write(current_track)
         finally:
             with open(path, "w") as fout:
                 fout.writelines(tracks)