trackfetch 2.2.0__tar.gz → 2.2.6__tar.gz

{trackfetch-2.2.0/trackfetch.egg-info → trackfetch-2.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trackfetch
-Version: 2.2.0
+Version: 2.2.6
 Summary: Turn a text file of songs into tagged MP3s: Spotify metadata and cover art, best-match YouTube audio via yt-dlp.
 Author: ByteMe6
 License-Expression: GPL-3.0-or-later
@@ -213,12 +213,13 @@ trackfetch "My Playlist.txt" -o ~/Music/"My Playlist"
 ## Usage
 
 ```text
-trackfetch [-h] [-o OUTPUT] [--config CONFIG] [-f {mp3,m4a,opus}] [--title-only] [--delay DELAY] [--spotify-client-id ID] [--spotify-client-secret SECRET] [input]
+trackfetch [-h] [--track ARTIST - TITLE ...] [-o OUTPUT] [--config CONFIG] [-f {mp3,m4a,opus}] [--title-only] [--delay DELAY] [--spotify-client-id ID] [--spotify-client-secret SECRET] [INPUT ...]
 ```
 
 | Option | Default | What it does |
 | --- | --- | --- |
-| `input` | required | Text file with one `Artist - Title` per line. Can also be set in the [config file](#configuration-file). |
+| `INPUT` | required | Text file with one `Artist - Title` per line, or an inline `Artist - Title` track. Can also be set in the [config file](#configuration-file). |
+| `--track` | — | Track to download inline, `Artist - Title`. Can be given several times. |
 | `-o`, `--output` | current directory | Folder to save the files in. It's created if it doesn't exist. |
 | `--config` | auto-detected | Path to a [config file](#configuration-file). |
 | `-f`, `--format` | `m4a` | Audio format: `mp3`, `m4a` or `opus`. See [Audio formats](#audio-formats). |
@@ -232,8 +233,24 @@ trackfetch songs.txt -o ~/Music/RoadTrip          # save to a specific folder
 trackfetch songs.txt -o /media/usb --title-only   # short names for a car stereo
 trackfetch big-list.txt --delay 3                 # go easy on rate limits
 trackfetch songs.txt --format opus                # original YouTube audio, no re-encode
+trackfetch "Daft Punk - One More Time"             # one track, no file needed
+trackfetch "A - B" "C - D" --track "E - F"         # a few tracks in one go
 ```
 
+### Inline tracks
+
+Skip the file and name the tracks right on the command line:
+
+```bash
+trackfetch "Daft Punk - One More Time"
+trackfetch "Daft Punk - One More Time" "Radiohead - Paranoid Android"
+trackfetch --track "Daft Punk - One More Time" --track "Radiohead - Paranoid Android"
+```
+
+A file and inline tracks can be mixed: `trackfetch songs.txt --track "Blur - Song 2"`.
+The separator is the same ` - ` as in the file, and the first ` - ` splits the
+artist from the title.
+
 ### Configuration file
 
 Put your defaults in an INI file and forget the flags:
@@ -249,8 +266,9 @@ spotify_client_id = your-client-id
 spotify_client_secret = your-client-secret
 ```
 
-Every option above can be set there, under the `[trackfetch]` section. The
-precedence is always the same:
+Every option above can be set there, under the `[trackfetch]` section, except
+`--track`, which only makes sense on the command line. The precedence is
+always the same:
 
 1. the command-line flag,
 2. the config file,
@@ -258,8 +276,8 @@ precedence is always the same:
 
 trackfetch looks for the config file in this order: the path given with
 `--config`, the path in `$TRACKFETCH_CONFIG`, `trackfetch.ini` in the current
-directory, `$XDG_CONFIG_HOME/trackfetch/trackfetch.ini` (usually
-`~/.config/trackfetch/trackfetch.ini`) and `~/.trackfetch.ini`.
+directory, `$XDG_CONFIG_HOME/trackfetch/trackfetch.ini`,
+`~/.config/trackfetch/trackfetch.ini` and `~/.trackfetch.ini`.
 
 ### Spotify credentials
 
@@ -305,7 +323,8 @@ Daft Punk - One More Time
 Sufjan Stevens - Mystery of Love - Remastered   ← only the first " - " separates artist and title
 ```
 
-The separator is space, hyphen, space (` - `). Lines without it are skipped. See [`examples/songs.txt`](https://github.com/ByteMe6/trackfetch/blob/master/examples/songs.txt).
+The separator is space, hyphen, space (` - `). Lines without it are skipped,
+and trackfetch prints how many lines it skipped and which ones they were. See [`examples/songs.txt`](https://github.com/ByteMe6/trackfetch/blob/master/examples/songs.txt).
 
 ### Output folder
 

{trackfetch-2.2.0 → trackfetch-2.2.6}/README.md

@@ -182,12 +182,13 @@ trackfetch "My Playlist.txt" -o ~/Music/"My Playlist"
 ## Usage
 
 ```text
-trackfetch [-h] [-o OUTPUT] [--config CONFIG] [-f {mp3,m4a,opus}] [--title-only] [--delay DELAY] [--spotify-client-id ID] [--spotify-client-secret SECRET] [input]
+trackfetch [-h] [--track ARTIST - TITLE ...] [-o OUTPUT] [--config CONFIG] [-f {mp3,m4a,opus}] [--title-only] [--delay DELAY] [--spotify-client-id ID] [--spotify-client-secret SECRET] [INPUT ...]
 ```
 
 | Option | Default | What it does |
 | --- | --- | --- |
-| `input` | required | Text file with one `Artist - Title` per line. Can also be set in the [config file](#configuration-file). |
+| `INPUT` | required | Text file with one `Artist - Title` per line, or an inline `Artist - Title` track. Can also be set in the [config file](#configuration-file). |
+| `--track` | — | Track to download inline, `Artist - Title`. Can be given several times. |
 | `-o`, `--output` | current directory | Folder to save the files in. It's created if it doesn't exist. |
 | `--config` | auto-detected | Path to a [config file](#configuration-file). |
 | `-f`, `--format` | `m4a` | Audio format: `mp3`, `m4a` or `opus`. See [Audio formats](#audio-formats). |
@@ -201,8 +202,24 @@ trackfetch songs.txt -o ~/Music/RoadTrip          # save to a specific folder
 trackfetch songs.txt -o /media/usb --title-only   # short names for a car stereo
 trackfetch big-list.txt --delay 3                 # go easy on rate limits
 trackfetch songs.txt --format opus                # original YouTube audio, no re-encode
+trackfetch "Daft Punk - One More Time"             # one track, no file needed
+trackfetch "A - B" "C - D" --track "E - F"         # a few tracks in one go
 ```
 
+### Inline tracks
+
+Skip the file and name the tracks right on the command line:
+
+```bash
+trackfetch "Daft Punk - One More Time"
+trackfetch "Daft Punk - One More Time" "Radiohead - Paranoid Android"
+trackfetch --track "Daft Punk - One More Time" --track "Radiohead - Paranoid Android"
+```
+
+A file and inline tracks can be mixed: `trackfetch songs.txt --track "Blur - Song 2"`.
+The separator is the same ` - ` as in the file, and the first ` - ` splits the
+artist from the title.
+
 ### Configuration file
 
 Put your defaults in an INI file and forget the flags:
@@ -218,8 +235,9 @@ spotify_client_id = your-client-id
 spotify_client_secret = your-client-secret
 ```
 
-Every option above can be set there, under the `[trackfetch]` section. The
-precedence is always the same:
+Every option above can be set there, under the `[trackfetch]` section, except
+`--track`, which only makes sense on the command line. The precedence is
+always the same:
 
 1. the command-line flag,
 2. the config file,
@@ -227,8 +245,8 @@ precedence is always the same:
 
 trackfetch looks for the config file in this order: the path given with
 `--config`, the path in `$TRACKFETCH_CONFIG`, `trackfetch.ini` in the current
-directory, `$XDG_CONFIG_HOME/trackfetch/trackfetch.ini` (usually
-`~/.config/trackfetch/trackfetch.ini`) and `~/.trackfetch.ini`.
+directory, `$XDG_CONFIG_HOME/trackfetch/trackfetch.ini`,
+`~/.config/trackfetch/trackfetch.ini` and `~/.trackfetch.ini`.
 
 ### Spotify credentials
 
@@ -274,7 +292,8 @@ Daft Punk - One More Time
 Sufjan Stevens - Mystery of Love - Remastered   ← only the first " - " separates artist and title
 ```
 
-The separator is space, hyphen, space (` - `). Lines without it are skipped. See [`examples/songs.txt`](https://github.com/ByteMe6/trackfetch/blob/master/examples/songs.txt).
+The separator is space, hyphen, space (` - `). Lines without it are skipped,
+and trackfetch prints how many lines it skipped and which ones they were. See [`examples/songs.txt`](https://github.com/ByteMe6/trackfetch/blob/master/examples/songs.txt).
 
 ### Output folder
 

{trackfetch-2.2.0 → trackfetch-2.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "trackfetch"
-version = "2.2.0"
+version = "2.2.6"
 description = "Turn a text file of songs into tagged MP3s: Spotify metadata and cover art, best-match YouTube audio via yt-dlp."
 readme = "README.md"
 license = "GPL-3.0-or-later"

{trackfetch-2.2.0 → trackfetch-2.2.6}/tests/test_config.py

@@ -261,7 +261,7 @@ class TestMainWithConfig:
             run_cli(monkeypatch)
 
         assert exc.value.code == 1
-        assert "No input file" in capsys.readouterr().out
+        assert "No input" in capsys.readouterr().out
 
     def test_input_can_come_from_the_config(self, pipeline, monkeypatch, tmp_path):
         songs = tmp_path / "songs.txt"

trackfetch-2.2.6/tests/test_inline.py

@@ -0,0 +1,208 @@
+import shutil
+import sys
+
+import pytest
+from conftest import FIXTURES, make_track
+
+import trackfetch as m
+
+
+@pytest.fixture
+def pipeline(monkeypatch):
+    state = {
+        "track": make_track("One More Time", ["Daft Punk"], album="Discovery", track_number=1),
+        "video": {"title": "Daft Punk - One More Time (Official Audio)", "id": "abc"},
+        "searched": [],
+    }
+
+    def fake_find_spotify(sp, artist, title):
+        state["searched"].append((artist, title))
+        return state["track"]
+
+    def fake_download_audio(url, temp_dir, audio_format="mp3"):
+        path = temp_dir / f"audio.{audio_format}"
+        if audio_format == "mp3":
+            path.write_bytes(b"\x00" * 64)
+        else:
+            shutil.copy(FIXTURES / f"silence.{audio_format}", path)
+        return path
+
+    monkeypatch.setattr(m, "find_spotify_track", fake_find_spotify)
+    monkeypatch.setattr(m, "find_youtube_video", lambda a, t: state["video"])
+    monkeypatch.setattr(m, "download_audio", fake_download_audio)
+    monkeypatch.setattr(m, "download_cover", lambda url, dest: dest.write_bytes(b"x"))
+    monkeypatch.setattr(m, "get_spotify", lambda *a, **k: object())
+    monkeypatch.setattr(m.time, "sleep", lambda s: None)
+    return state
+
+
+def run_cli(monkeypatch, *args):
+    monkeypatch.setattr(sys, "argv", ["trackfetch", *map(str, args)])
+    m.main()
+
+
+class TestInlineTracks:
+    def test_single_inline_track(self, pipeline, monkeypatch, tmp_path):
+        out = tmp_path / "o"
+
+        run_cli(monkeypatch, "Daft Punk - One More Time", "-o", out)
+
+        assert pipeline["searched"] == [("Daft Punk", "One More Time")]
+        assert (out / "Daft Punk - One More Time.m4a").exists()
+
+    def test_several_inline_tracks(self, pipeline, monkeypatch, tmp_path):
+        out = tmp_path / "o"
+
+        run_cli(
+            monkeypatch,
+            "Daft Punk - One More Time",
+            "Radiohead - Paranoid Android",
+            "-o",
+            out,
+        )
+
+        assert [artist for artist, _ in pipeline["searched"]] == [
+            "Daft Punk",
+            "Radiohead",
+        ]
+
+    def test_track_flag(self, pipeline, monkeypatch, tmp_path):
+        out = tmp_path / "o"
+
+        run_cli(
+            monkeypatch,
+            "--track",
+            "Daft Punk - One More Time",
+            "--track",
+            "Radiohead - Paranoid Android",
+            "-o",
+            out,
+        )
+
+        assert len(pipeline["searched"]) == 2
+
+    def test_track_flag_with_several_values(self, pipeline, monkeypatch, tmp_path):
+        out = tmp_path / "o"
+
+        run_cli(
+            monkeypatch,
+            "--track",
+            "Daft Punk - One More Time",
+            "Radiohead - Paranoid Android",
+            "-o",
+            out,
+        )
+
+        assert len(pipeline["searched"]) == 2
+
+    def test_file_and_inline_track_together(self, pipeline, monkeypatch, tmp_path):
+        songs = tmp_path / "songs.txt"
+        songs.write_text("Daft Punk - One More Time\n", encoding="utf-8")
+        out = tmp_path / "o"
+
+        run_cli(monkeypatch, songs, "--track", "Radiohead - Paranoid Android", "-o", out)
+
+        assert len(pipeline["searched"]) == 2
+
+    def test_inline_track_and_file_in_one_call(self, pipeline, monkeypatch, tmp_path):
+        songs = tmp_path / "songs.txt"
+        songs.write_text("Daft Punk - One More Time\n", encoding="utf-8")
+        out = tmp_path / "o"
+
+        run_cli(monkeypatch, "Radiohead - Paranoid Android", songs, "-o", out)
+
+        assert len(pipeline["searched"]) == 2
+
+    def test_missing_file_exits(self, pipeline, monkeypatch, tmp_path, capsys):
+        with pytest.raises(SystemExit) as exc:
+            run_cli(monkeypatch, "songs.txt", "-o", tmp_path / "o")
+
+        assert exc.value.code == 1
+        assert "Input file not found" in capsys.readouterr().out
+
+    def test_unparsable_track_flag_exits(self, pipeline, monkeypatch, tmp_path, capsys):
+        with pytest.raises(SystemExit) as exc:
+            run_cli(monkeypatch, "--track", "nonsense", "-o", tmp_path / "o")
+
+        assert exc.value.code == 1
+        assert "Could not parse track" in capsys.readouterr().out
+
+    def test_inline_track_without_artist_exits(self, pipeline, monkeypatch, tmp_path, capsys):
+        with pytest.raises(SystemExit) as exc:
+            run_cli(monkeypatch, " - One More Time", "-o", tmp_path / "o")
+
+        assert exc.value.code == 1
+        assert "Could not parse track" in capsys.readouterr().out
+
+    def test_inline_track_without_title_exits(self, pipeline, monkeypatch, tmp_path, capsys):
+        with pytest.raises(SystemExit) as exc:
+            run_cli(monkeypatch, "Daft Punk - ", "-o", tmp_path / "o")
+
+        assert exc.value.code == 1
+        assert "Could not parse track" in capsys.readouterr().out
+
+    def test_wrong_separator_hints_at_the_track_format(
+        self, pipeline, monkeypatch, tmp_path, capsys
+    ):
+        with pytest.raises(SystemExit) as exc:
+            run_cli(monkeypatch, "Daft Punk -One More Time", "-o", tmp_path / "o")
+
+        assert exc.value.code == 1
+        assert "Artist - Title" in capsys.readouterr().out
+
+    def test_unparsable_lines_in_a_file_are_reported(
+        self, pipeline, monkeypatch, tmp_path, capsys
+    ):
+        songs = tmp_path / "songs.txt"
+        songs.write_text(
+            "Daft Punk -One More Time\nRadiohead - Paranoid Android\n",
+            encoding="utf-8",
+        )
+
+        run_cli(monkeypatch, songs, "-o", tmp_path / "o")
+        log = capsys.readouterr().out
+
+        assert "WARNING: skipped 1 line(s)" in log
+        assert "Daft Punk -One More Time" in log
+
+    def test_inline_track_uses_the_output_rules(self, pipeline, monkeypatch, tmp_path):
+        out = tmp_path / "o"
+        config = tmp_path / "cfg.ini"
+        config.write_text(f"[trackfetch]\noutput = {out}\n", encoding="utf-8")
+
+        run_cli(monkeypatch, "Daft Punk - One More Time", "--config", config)
+
+        assert (out / "Daft Punk - One More Time.m4a").exists()
+
+
+class TestCollectSources:
+    def test_config_input_is_a_file(self, tmp_path):
+        songs = tmp_path / "songs.txt"
+        songs.write_text("A - B\n", encoding="utf-8")
+
+        class Args:
+            inputs = []
+            track = None
+
+        sources = m.collect_sources(Args(), {"input": str(songs)})
+
+        assert sources == [songs]
+
+    def test_missing_config_input_raises(self, tmp_path):
+        class Args:
+            inputs = []
+            track = None
+
+        with pytest.raises(ValueError) as exc:
+            m.collect_sources(Args(), {"input": str(tmp_path / "nope.txt")})
+
+        assert "Input file not found" in str(exc.value)
+
+    def test_read_song_file_skips_comments(self, tmp_path):
+        songs = tmp_path / "songs.txt"
+        songs.write_text("# comment\n\nA - B\nbroken line\nC - D\n", encoding="utf-8")
+
+        parsed, skipped = m.read_song_file(songs)
+
+        assert parsed == [("A", "B"), ("C", "D")]
+        assert skipped == ["broken line"]

{trackfetch-2.2.0 → trackfetch-2.2.6/trackfetch.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trackfetch
-Version: 2.2.0
+Version: 2.2.6
 Summary: Turn a text file of songs into tagged MP3s: Spotify metadata and cover art, best-match YouTube audio via yt-dlp.
 Author: ByteMe6
 License-Expression: GPL-3.0-or-later
@@ -213,12 +213,13 @@ trackfetch "My Playlist.txt" -o ~/Music/"My Playlist"
 ## Usage
 
 ```text
-trackfetch [-h] [-o OUTPUT] [--config CONFIG] [-f {mp3,m4a,opus}] [--title-only] [--delay DELAY] [--spotify-client-id ID] [--spotify-client-secret SECRET] [input]
+trackfetch [-h] [--track ARTIST - TITLE ...] [-o OUTPUT] [--config CONFIG] [-f {mp3,m4a,opus}] [--title-only] [--delay DELAY] [--spotify-client-id ID] [--spotify-client-secret SECRET] [INPUT ...]
 ```
 
 | Option | Default | What it does |
 | --- | --- | --- |
-| `input` | required | Text file with one `Artist - Title` per line. Can also be set in the [config file](#configuration-file). |
+| `INPUT` | required | Text file with one `Artist - Title` per line, or an inline `Artist - Title` track. Can also be set in the [config file](#configuration-file). |
+| `--track` | — | Track to download inline, `Artist - Title`. Can be given several times. |
 | `-o`, `--output` | current directory | Folder to save the files in. It's created if it doesn't exist. |
 | `--config` | auto-detected | Path to a [config file](#configuration-file). |
 | `-f`, `--format` | `m4a` | Audio format: `mp3`, `m4a` or `opus`. See [Audio formats](#audio-formats). |
@@ -232,8 +233,24 @@ trackfetch songs.txt -o ~/Music/RoadTrip          # save to a specific folder
 trackfetch songs.txt -o /media/usb --title-only   # short names for a car stereo
 trackfetch big-list.txt --delay 3                 # go easy on rate limits
 trackfetch songs.txt --format opus                # original YouTube audio, no re-encode
+trackfetch "Daft Punk - One More Time"             # one track, no file needed
+trackfetch "A - B" "C - D" --track "E - F"         # a few tracks in one go
 ```
 
+### Inline tracks
+
+Skip the file and name the tracks right on the command line:
+
+```bash
+trackfetch "Daft Punk - One More Time"
+trackfetch "Daft Punk - One More Time" "Radiohead - Paranoid Android"
+trackfetch --track "Daft Punk - One More Time" --track "Radiohead - Paranoid Android"
+```
+
+A file and inline tracks can be mixed: `trackfetch songs.txt --track "Blur - Song 2"`.
+The separator is the same ` - ` as in the file, and the first ` - ` splits the
+artist from the title.
+
 ### Configuration file
 
 Put your defaults in an INI file and forget the flags:
@@ -249,8 +266,9 @@ spotify_client_id = your-client-id
 spotify_client_secret = your-client-secret
 ```
 
-Every option above can be set there, under the `[trackfetch]` section. The
-precedence is always the same:
+Every option above can be set there, under the `[trackfetch]` section, except
+`--track`, which only makes sense on the command line. The precedence is
+always the same:
 
 1. the command-line flag,
 2. the config file,
@@ -258,8 +276,8 @@ precedence is always the same:
 
 trackfetch looks for the config file in this order: the path given with
 `--config`, the path in `$TRACKFETCH_CONFIG`, `trackfetch.ini` in the current
-directory, `$XDG_CONFIG_HOME/trackfetch/trackfetch.ini` (usually
-`~/.config/trackfetch/trackfetch.ini`) and `~/.trackfetch.ini`.
+directory, `$XDG_CONFIG_HOME/trackfetch/trackfetch.ini`,
+`~/.config/trackfetch/trackfetch.ini` and `~/.trackfetch.ini`.
 
 ### Spotify credentials
 
@@ -305,7 +323,8 @@ Daft Punk - One More Time
 Sufjan Stevens - Mystery of Love - Remastered   ← only the first " - " separates artist and title
 ```
 
-The separator is space, hyphen, space (` - `). Lines without it are skipped. See [`examples/songs.txt`](https://github.com/ByteMe6/trackfetch/blob/master/examples/songs.txt).
+The separator is space, hyphen, space (` - `). Lines without it are skipped,
+and trackfetch prints how many lines it skipped and which ones they were. See [`examples/songs.txt`](https://github.com/ByteMe6/trackfetch/blob/master/examples/songs.txt).
 
 ### Output folder
 

{trackfetch-2.2.0 → trackfetch-2.2.6}/trackfetch.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ README.md
 pyproject.toml
 trackfetch.py
 tests/test_config.py
+tests/test_inline.py
 tests/test_pipeline.py
 tests/test_spotify.py
 tests/test_tags_and_files.py

{trackfetch-2.2.0 → trackfetch-2.2.6}/trackfetch.py

@@ -226,7 +226,7 @@ def download_cover(url: str, destination: Path):
         url,
         timeout=30,
         headers={
-            "User-Agent": "trackfetch/2.2"
+            "User-Agent": "trackfetch/2.2.6"
         },
     )
 
@@ -846,7 +846,7 @@ def apply_config(args, parser, settings):
     for action in parser._actions:
         dest = action.dest
 
-        if dest in ("help", "version", "config"):
+        if dest in ("help", "version", "config", "inputs", "track"):
             continue
 
         if getattr(args, dest, None) is not None:
@@ -874,19 +874,124 @@ def apply_config(args, parser, settings):
         setattr(args, dest, value)
 
 
+def read_song_file(path: Path):
+    """Read Artist - Title pairs from a text file.
+
+    Returns a (songs, skipped) tuple, where skipped holds the lines that
+    could not be parsed.
+    """
+    songs = []
+    skipped = []
+
+    for line in path.read_text(
+        encoding="utf-8",
+        errors="replace",
+    ).splitlines():
+
+        line = line.strip()
+
+        if not line or line.startswith("#"):
+            continue
+
+        song = parse_song(line)
+
+        if song:
+            songs.append(song)
+
+        else:
+            skipped.append(line)
+
+    return songs, skipped
+
+
+def collect_sources(args, settings):
+    """Build the ordered list of inputs: file paths and inline tracks.
+
+    Every item is either a Path to a text file or an inline
+    "Artist - Title" string.
+    """
+    sources = []
+
+    config_input = config_str_value(settings, "input")
+
+    if config_input:
+        path = Path(config_input).expanduser()
+
+        if not path.is_file():
+            raise ValueError(f"Input file not found: {path}")
+
+        sources.append(path)
+
+    for item in args.inputs:
+        path = Path(item).expanduser()
+
+        if path.is_file():
+            sources.append(path)
+
+        elif " - " in item:
+            if not parse_song(item):
+                raise ValueError(
+                    f"Could not parse track: {item} "
+                    f"(expected 'Artist - Title')"
+                )
+
+            sources.append(item)
+
+        else:
+            raise ValueError(
+                f"Input file not found: {item} "
+                f"(if this is a track, use the 'Artist - Title' format)"
+            )
+
+    for group in args.track or []:
+        for spec in group:
+            if not parse_song(spec):
+                raise ValueError(
+                    f"Could not parse track: {spec} "
+                    f"(expected 'Artist - Title')"
+                )
+
+            sources.append(spec)
+
+    return sources
+
+
 def main():
     parser = argparse.ArgumentParser(
         description=(
             "Download music using Spotify metadata "
             "and YouTube audio"
-        )
+        ),
+        epilog=(
+            "A config file with the defaults can be used as well. It is "
+            "looked up in --config, $TRACKFETCH_CONFIG, ./trackfetch.ini, "
+            "$XDG_CONFIG_HOME/trackfetch/trackfetch.ini, "
+            "~/.config/trackfetch/trackfetch.ini and ~/.trackfetch.ini. "
+            "A command-line flag wins over the config file, and the config "
+            "file wins over the built-in default."
+        ),
+        formatter_class=argparse.RawDescriptionHelpFormatter,
     )
 
     parser.add_argument(
-        "input",
-        type=Path,
-        nargs="?",
-        help="Text file with Artist - Title",
+        "inputs",
+        nargs="*",
+        metavar="INPUT",
+        help=(
+            "Text file with Artist - Title, "
+            "or an inline 'Artist - Title' track"
+        ),
+    )
+
+    parser.add_argument(
+        "--track",
+        action="append",
+        nargs="+",
+        metavar="ARTIST - TITLE",
+        help=(
+            "Track to download inline, "
+            "can be given several times"
+        ),
     )
 
     parser.add_argument(
@@ -905,7 +1010,10 @@ def main():
         "--config",
         type=Path,
         default=None,
-        help="Path to a config file",
+        help=(
+            "Path to a config file "
+            "(default: auto-detected, see below)"
+        ),
     )
 
     parser.add_argument(
@@ -913,21 +1021,21 @@ def main():
         "--format",
         choices=list(AUDIO_FORMATS),
         default=None,
-        help="Audio format",
+        help="Audio format (default: m4a)",
     )
 
     parser.add_argument(
         "--title-only",
         action="store_true",
         default=None,
-        help="Use only title in filename",
+        help="Use only title in filename (default: off)",
     )
 
     parser.add_argument(
         "--delay",
         type=float,
         default=None,
-        help="Delay between songs in seconds",
+        help="Delay between songs in seconds (default: 1.0)",
     )
 
     parser.add_argument(
@@ -974,15 +1082,19 @@ def main():
     if args.delay is None:
         args.delay = DEFAULT_DELAY
 
-    if args.input is None:
-        print(
-            "ERROR: No input file. "
-            "Pass it as an argument or set 'input' in the config file."
-        )
+    try:
+        sources = collect_sources(args, settings)
+
+    except ValueError as error:
+        print(f"ERROR: {error}")
         sys.exit(1)
 
-    if not args.input.exists():
-        print(f"ERROR: Input file not found: {args.input}")
+    if not sources:
+        print(
+            "ERROR: No input. "
+            "Pass a file or an inline 'Artist - Title' track, "
+            "or set 'input' in the config file."
+        )
         sys.exit(1)
 
     args.output.mkdir(
@@ -994,27 +1106,41 @@ def main():
     failed_file = args.output / "failed.txt"
 
     songs = []
+    skipped = []
 
-    for line in args.input.read_text(
-        encoding="utf-8",
-        errors="replace",
-    ).splitlines():
+    for source in sources:
+        if isinstance(source, Path):
+            file_songs, file_skipped = read_song_file(source)
 
-        line = line.strip()
+            songs.extend(file_songs)
 
-        if not line or line.startswith("#"):
-            continue
+            skipped.extend(
+                (source, line) for line in file_skipped
+            )
 
-        song = parse_song(line)
+        else:
+            song = parse_song(source)
 
-        if song:
-            songs.append(song)
+            if song:
+                songs.append(song)
 
     done = read_done(done_file)
 
     print(f"Found {len(songs)} songs")
     print(f"Already completed: {len(done)}")
 
+    if skipped:
+        print(
+            f"WARNING: skipped {len(skipped)} line(s) "
+            f"that are not 'Artist - Title':"
+        )
+
+        for path, line in skipped[:5]:
+            print(f"  {path}: {line}")
+
+        if len(skipped) > 5:
+            print(f"  ... and {len(skipped) - 5} more")
+
     if config_path:
         print(f"Config: {config_path}")