audiolibrarian 0.16.5__tar.gz → 0.17.0__tar.gz

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: audiolibrarian
-Version: 0.16.5
+Version: 0.17.0
 Summary: Manage my audio library.
 Project-URL: Repository, https://github.com/toadstule/audiolibrarian
 Author-email: Steve Jibson <steve@jibson.com>
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python
 Requires-Python: <3.14,>=3.12
 Requires-Dist: ansicolors
 Requires-Dist: discid
+Requires-Dist: ffmpeg-normalize
 Requires-Dist: filelock
 Requires-Dist: fuzzywuzzy
 Requires-Dist: musicbrainzngs

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/docs/api/audiolibrarian.md

@@ -53,4 +53,4 @@ print(f"Found track: {track_info.title} from {track_info.album}")
 
 ## Contributing
 
-If you want to contribute to the development of audiolibrarian, please read our [contributing guidelines](development/contributing.md).
+If you want to contribute to the development of audiolibrarian, please read our [contributing guidelines](../development/contributing.md).

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/docs/development/contributing.md

@@ -99,11 +99,6 @@ We welcome feature requests! Please open an issue and describe:
 - Why this feature would be useful
 - Any suggestions for implementation
 
-## Code of Conduct
-
-This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md).
-By participating, you are expected to uphold this code.
-
 ## Available Make Commands
 
 For a complete list of available commands, run:

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/docs/index.md

@@ -31,5 +31,6 @@ converting them to multiple formats, and organizing them in a clean directory st
 
 - Found a bug? [Open an issue](https://github.com/toadstule/audiolibrarian/issues).
 - Want to contribute? Read our [contributing guide](development/contributing.md).
+- Check out the [changelog](user-guide/changelog.md) to see what's new.
 
 [MusicBrainz]: https://musicbrainz.org

audiolibrarian-0.17.0/docs/user-guide/changelog.md

@@ -0,0 +1,17 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.17.0] - 2025-06-22
+
+### Added
+
+- Support for `ffmpeg-normalize` for normalization (optional)
+
+### Changed
+
+- Configuration options for normalization selection
+- Configuration options for `ffmpeg-normalize`

audiolibrarian-0.17.0/docs/user-guide/configuration.md

@@ -0,0 +1,95 @@
+# Configuration
+
+`audiolibrarian` uses a flexible configuration system that supports multiple configuration sources,
+listed in order of precedence:
+
+## Configuration Sources
+
+### 1. Environment Variables (highest precedence)
+
+- **Prefix**: `AUDIOLIBRARIAN__`
+- **Nested fields**: Use `__` as delimiter (e.g., `AUDIOLIBRARIAN__MUSICBRAINZ__USERNAME`)
+- **Example**:
+
+```bash
+# Override library directory (library_dir)
+export AUDIOLIBRARIAN__LIBRARY_DIR="/mnt/music/library"
+
+# Set MusicBrainz credentials (musicbrainz.username and musicbrainz.password)
+export AUDIOLIBRARIAN__MUSICBRAINZ__USERNAME="your_username"
+export AUDIOLIBRARIAN__MUSICBRAINZ__PASSWORD="your_password"
+```
+
+### 2. YAML Configuration File (medium precedence)
+
+- **Default location**: `~/.config/audiolibrarian/config.yaml`
+- **Example**:
+
+```yaml
+# Base directory for your music library
+library_dir: "~/music/library"
+
+# Cache and working directory
+work_dir: "~/.cache/audiolibrarian"
+
+# CD/DVD device path (use null for default device)
+discid_device: null
+
+# Audio normalization settings
+normalize:
+  normalizer: "auto"  # "auto", "wavegain", "ffmpeg", or "none"
+  ffmpeg:
+    target_level: -13  # Target LUFS level for ffmpeg normalization
+  wavegain:
+    gain: 5  # dB gain for wavegain normalization (0-10)
+    preset: "radio"  # "album" or "radio"
+
+# MusicBrainz API settings (optional)
+musicbrainz:
+  username: "your_username"  # For personal genre preferences
+  password: "your_password"  # Will be stored securely
+  rate_limit: 1.5  # Seconds between API requests
+```
+
+### 3. Default Values (lowest precedence)
+
+- Built-in defaults from the application
+
+## Available Settings
+
+| Setting                         | Default          | Description                               |
+|---------------------------------|------------------|-------------------------------------------|
+| `library_dir`                   | `./library`      | Directory for storing audio files         |
+| `work_dir`                      | (see below)[^wd] | Directory for temporary files             |
+| `discid_device`                 | `null`           | CD device path (null for default device)  |
+| `normalize.normalizer`          | `"auto"`         | "auto", "wavegain", "ffmpeg", or "none"   |
+| `normalize.ffmpeg.target_level` | `-13`            | Target LUFS level (ffmpeg)                |
+| `normalize.wavegain.gain`       | `5`              | Normalization gain in dB (0-10, wavegain) |
+| `normalize.wavegain.preset`     | `"radio"`        | "album" or "radio" (wavegain)             |
+| `musicbrainz.username`          | (not set)        | MusicBrainz username[^mb]                 |
+| `musicbrainz.password`          | (not set)        | MusicBrainz password[^mb]                 |
+| `musicbrainz.rate_limit`        | `1.5`            | Seconds between requests                  |
+
+[^wd]: The `work_dir` default is `$XDG_CACHE_HOME/audiolibrarian`, which defaults
+  to `~/.cache/audiolibrarian` on Linux and macOS.
+
+[^mb]: The `musicbrainz` username and password are optional but recommended for accessing personal genre
+  preferences on [MusicBrainz](https://musicbrainz.org/).
+
+## Audio Normalization
+
+Audio normalization ensures consistent volume levels across tracks. The following options are available:
+
+- `auto` (default): Automatically selects the best available normalizer (prefers wavegain)
+- `wavegain`: Uses the `wavegain` command-line tool (recommended for better album normalization)
+- `ffmpeg`: Uses the `ffmpeg-normalize` Python package
+- `none`: Skips normalization entirely
+
+### Wavegain Settings
+
+- `gain`: Adjusts the target volume level (in dB, typically 0-10)
+- `preset`: "album" (loudness normalization) or "radio" (peak normalization)
+
+### FFmpeg Settings
+
+- `target_level`: Target LUFS level (typically between -16 and -12)

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/docs/user-guide/getting-started.md

@@ -62,7 +62,7 @@ This will:
 **Sample output:**
 
 ```text
-─➤  audiolibrarian rip
+$ audiolibrarian rip
 
 Gathering search information...
 Finding MusicBrainz release information...

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/docs/user-guide/installation.md

@@ -15,11 +15,12 @@
 - [util-linux](https://github.com/util-linux/util-linux)
 - [faad2](https://github.com/knik0/faad2)
 - [fdkaac](https://github.com/nu774/fdkaac)
+- [ffmpeg](https://ffmpeg.org/) - optional
 - [flac](https://github.com/xiph/flac)
 - [lame](https://lame.sourceforge.io/)
 - [mpg123](https://www.mpg123.de/)
 - [libsndfile](https://github.com/libsndfile/libsndfile)
-- [wavegain](https://github.com/MestreLion/wavegain)
+- [wavegain](https://github.com/MestreLion/wavegain) - optional
 
 It also requires the [libdiscid](https://musicbrainz.org/doc/libdiscid) library.
 
@@ -68,6 +69,7 @@ pip uninstall audiolibrarian
 sudo pacman -S \
     faad2 \
     fdkaac \
+    ffmpeg \
     flac \
     lame \
     libcdio-paranoia \
@@ -92,6 +94,7 @@ sudo apt install -y \
     eject \
     faad \
     fdkaac \
+    ffmpeg \
     flac \
     lame \
     libdiscid0 \
@@ -99,18 +102,3 @@ sudo apt install -y \
     mpg123 \
     python3-pip
 ```
-
-This will get you everything you need except for `wavegain`. You build and install
-`wavegain` from source as follows:
-
-```bash
-sudo apt install -y gcc wget unzip
-wget "https://www.rarewares.org/files/others/wavegain-1.3.1srcs.zip"
-unzip wavegain-1.3.1srcs.zip
-cd WaveGain-1.3.1
-gcc -fcommon *.c -o wavegain -DHAVE_CONFIG_H -lm
-# You'll get some warning here, but they can be ignored.
-sudo cp wavegain /usr/loca/bin/wavegain
-cd ..
-rm -rf WaveGain-1.3.1 wavegain-1.3.1srcs.zip
-```

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/mkdocs.yml

@@ -1,6 +1,7 @@
 site_name: audiolibrarian
 site_url: https://audiolibrarian.readthedocs.io/
 repo_url: https://github.com/toadstule/audiolibrarian
+copyright: Copyright © 2025 Steve Jibson
 
 theme:
   name: readthedocs
@@ -22,14 +23,17 @@ theme:
     - toc.follow
     - toc.sticky
 
-#markdown_extensions:
+markdown_extensions:
 #  - footnotes
 #  - toc:
 #      permalink: true
-#  - pymdownx.highlight:
+#  - pymdownx.highlight
 #      anchor_linenums: true
 #      line_spans: __span
 #  - pymdownx.inlinehilite
+#  - pymdownx.inlinehilite
+#  - pymdownx.superfences
+
 #  - pymdownx.snippets
 #  - attr_list
 #  - md_in_html
@@ -72,7 +76,6 @@ nav:
       - Contributing: development/contributing.md
 
 # Extra configuration
-extra_copyright: Copyright © 2025 Steve Jibson
 extra:
   # Add links to show in the footer
   links:

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/pyproject.toml

@@ -7,9 +7,9 @@ dev = [
     "coverage",
     "hatchling",
     "mypy",
-    "mkdocs-material>=9.0.0",
-    "mkdocs>=1.5.0",
-    "mkdocstrings[python]>=0.23.0",
+    "mkdocs-material",
+    "mkdocs",
+    "mkdocstrings[python]",
     "pymarkdownlnt",
     "pytest",
     "pytest-env",
@@ -30,6 +30,7 @@ description = "Manage my audio library."
 dependencies = [
     "ansicolors",
     "discid",
+    "ffmpeg-normalize",
     "filelock",
     "fuzzywuzzy",
     "musicbrainzngs",

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/scripts/update_links.sh

@@ -1,20 +1,19 @@
 #!/bin/bash
 #
-# Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
-# This file is part of audiolibrarian.
+#  This file is part of audiolibrarian.
 #
-# Audiolibrarian is free software: you can redistribute it and/or modify it under the terms of the
-# GNU General Public License as published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+#  Audiolibrarian is free software: you can redistribute it and/or modify it under the terms of the
+#  GNU General Public License as published by the Free Software Foundation, either version 3 of the
+#  License, or (at your option) any later version.
 #
-# Audiolibrarian is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-# the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with audiolibrarian.
-# If not, see <https://www.gnu.org/licenses/>.
+#  Audiolibrarian is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+#  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+#  the GNU General Public License for more details.
 #
+#  You should have received a copy of the GNU General Public License along with audiolibrarian.
+#  If not, see <https://www.gnu.org/licenses/>.
 #
 
 # This file should be located in the /bin directory of the library (i.e. "/media/music/bin")
@@ -36,7 +35,7 @@ function make_links {
       fi
     fi
     for source in "$d"/*; do
-#      echo "$source"
+#    echo "$source"
       ln -sf ../"$source" "$base"/
     done
   done

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/src/audiolibrarian/__init__.py

@@ -1,7 +1,7 @@
 """The audiolibrarian package."""
 
 #
-#  Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #
@@ -16,4 +16,4 @@
 #  You should have received a copy of the GNU General Public License along with audiolibrarian.
 #  If not, see <https://www.gnu.org/licenses/>.
 #
-__version__ = "0.16.5"
+__version__ = "0.17.0"

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/src/audiolibrarian/audiofile/__init__.py

@@ -1,7 +1,6 @@
 """Audio file library."""
-
 #
-#  Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/src/audiolibrarian/audiofile/audiofile.py

@@ -1,7 +1,7 @@
 """Audio file library."""
 
 #
-#  Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #

audiolibrarian-0.17.0/src/audiolibrarian/audiofile/formats/__init__.py

@@ -0,0 +1,17 @@
+"""AudioFile formats."""
+#
+#  Copyright (c) 2000-2025 Stephen Jibson
+#
+#  This file is part of audiolibrarian.
+#
+#  Audiolibrarian is free software: you can redistribute it and/or modify it under the terms of the
+#  GNU General Public License as published by the Free Software Foundation, either version 3 of the
+#  License, or (at your option) any later version.
+#
+#  Audiolibrarian is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+#  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+#  the GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along with audiolibrarian.
+#  If not, see <https://www.gnu.org/licenses/>.
+#

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/src/audiolibrarian/audiofile/formats/flac.py

@@ -1,7 +1,7 @@
 """AudioFile support for flac files."""
 
 #
-#  Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/src/audiolibrarian/audiofile/formats/m4a.py

@@ -1,7 +1,7 @@
 """AudioFile support for m4a files."""
 
 #
-#  Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/src/audiolibrarian/audiofile/formats/mp3.py

@@ -1,7 +1,7 @@
 """AudioFile support for mp3 files."""
 
 #
-#  Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/src/audiolibrarian/audiofile/tags.py

@@ -1,7 +1,7 @@
 """Manage tags."""
 
 #
-#  Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/src/audiolibrarian/audiosource.py

@@ -1,7 +1,7 @@
 """AudioSource."""
 
 #
-#  Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/src/audiolibrarian/base.py

@@ -4,7 +4,7 @@ Useful stuff: https://help.mp3tag.de/main_tags.html
 """
 
 #
-#  Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #
@@ -27,9 +27,10 @@ import subprocess
 import sys
 import warnings
 from collections.abc import Iterable
-from typing import Any
+from typing import Any, Final
 
 import colors
+import ffmpeg_normalize
 import filelock
 import yaml
 
@@ -46,6 +47,7 @@ class Base:
     """
 
     command: str | None = None
+    _manifest_file: Final[str] = "Manifest.yaml"
 
     def __init__(self, args: argparse.Namespace) -> None:
         """Initialize the base."""
@@ -66,9 +68,10 @@ class Base:
         self._source_dir = self._work_dir / "source"
         self._wav_dir = self._work_dir / "wav"
 
-        self._manifest_file = "Manifest.yaml"
         self._lock = filelock.FileLock(str(self._work_dir) + ".lock")
 
+        self._normalizer = self._which_normalizer()
+
         # Initialize stuff that will be defined later.
         self._audio_source: audiosource.AudioSource | None = None
         self._release: records.Release | None = None
@@ -126,24 +129,6 @@ class Base:
             self._make_mp3()
             self._move_files(move_source=make_source)
 
-    @staticmethod
-    def _find_audio_files(directories: list[str | pathlib.Path]) -> Iterable[audiofile.AudioFile]:
-        """Yield audiofile objects found in the given directories."""
-        paths: list[pathlib.Path] = []
-        # Grab all the paths first because thing may change as files are renamed.
-        for directory in directories:
-            path = pathlib.Path(directory)
-            for ext in audiofile.AudioFile.extensions():
-                paths.extend(path.rglob(f"*{ext}"))
-        paths = sorted(set(paths))
-        # Using yield rather than returning a list saves us from simultaneously storing
-        # potentially thousands of AudioFile objects in memory at the same time.
-        for path in paths:
-            try:
-                yield audiofile.AudioFile.open(path)
-            except FileNotFoundError:
-                continue
-
     def _find_manifests(self, directories: list[str | pathlib.Path]) -> list[pathlib.Path]:
         """Return a sorted, unique list of manifest files anywhere in the given directories."""
         manifests = set()
@@ -283,25 +268,36 @@ class Base:
                 path.rename(source_dir / path.name)
 
     def _normalize(self) -> None:
-        """Normalize the wav files using wavegain."""
-        print("Normalizing wav files...")
-        command = [
-            "wavegain",
-            f"--{SETTINGS.normalize_preset}",
-            f"--gain={SETTINGS.normalize_gain}",
-            "--apply",
-        ]
-        command.extend(str(f) for f in self._wav_filenames)
-        result = subprocess.run(command, capture_output=True, check=False)  # noqa: S603
-        for line in str(result.stderr).split(r"\n"):
-            line_trunc = line[:137] + "..." if len(line) > 140 else line  # noqa: PLR2004
-            log.info("WAVEGAIN: %s", line_trunc)
-        result.check_returncode()
+        """Normalize the wav files using the selected normalizer."""
+        if self._normalizer == "none":
+            return
+        print(f"Normalizing wav files using {self._normalizer}...")
+
+        if self._normalizer == "wavegain":
+            command = [
+                "wavegain",
+                f"--{SETTINGS.normalize.wavegain.preset}",
+                f"--gain={SETTINGS.normalize.wavegain.gain}",
+                "--apply",
+            ]
+            command.extend(str(f) for f in self._wav_filenames)
+            result = subprocess.run(command, capture_output=True, check=False)  # noqa: S603
+            for line in str(result.stderr).split(r"\n"):
+                line_trunc = line[:137] + "..." if len(line) > 140 else line  # noqa: PLR2004
+                log.info("WAVEGAIN: %s", line_trunc)
+            result.check_returncode()
+            return
 
-    @staticmethod
-    def _read_manifest(manifest_path: pathlib.Path) -> dict[Any, Any]:
-        with manifest_path.open(encoding="utf-8") as manifest_file:
-            return dict(yaml.safe_load(manifest_file))
+        normalizer = ffmpeg_normalize.FFmpegNormalize(
+            extension="wav",
+            keep_loudness_range_target=True,
+            target_level=SETTINGS.normalize.ffmpeg.target_level,
+        )
+        for wav_file in self._wav_filenames:
+            normalizer.add_media_file(str(wav_file), str(wav_file))
+        log.info("NORMALIZER: starting ffmpeg normalization...")
+        normalizer.run_normalization()
+        log.info("NORMALIZER: ffmpeg normalization completed successfully")
 
     def _rename_wav(self) -> None:
         """Rename the wav files to a filename-sane representation of the track title."""
@@ -431,3 +427,54 @@ class Base:
         with pathlib.Path(manifest_filename).open("w", encoding="utf-8") as manifest_file:
             yaml.dump(manifest, manifest_file)
         print(f"Wrote {manifest_filename}")
+
+    @staticmethod
+    def _which_normalizer() -> str:
+        """Determine which normalizer to use based on settings and availability.
+
+        Returns:
+            str: The name of the normalizer to use ("wavegain", "ffmpeg" or "none")
+        """
+        normalizer = SETTINGS.normalize.normalizer
+        if normalizer == "none":
+            return "none"
+
+        wavegain_found = shutil.which("wavegain")
+        if normalizer in ("auto", "wavegain") and wavegain_found:
+            return "wavegain"
+
+        ffmpeg_found = shutil.which("ffmpeg")
+        if normalizer in ("auto", "ffmpeg") and ffmpeg_found:
+            return "ffmpeg"
+
+        if wavegain_found:
+            log.warning("ffmpeg not found, using wavegain for normalization")
+            return "wavegain"
+        if ffmpeg_found:
+            log.warning("wavegain not found, using ffmpeg for normalization")
+            return "ffmpeg"
+        log.warning("wavegain not found, ffmpeg not found, using no normalization")
+        return "none"
+
+    @staticmethod
+    def _find_audio_files(directories: list[str | pathlib.Path]) -> Iterable[audiofile.AudioFile]:
+        """Yield audiofile objects found in the given directories."""
+        paths: list[pathlib.Path] = []
+        # Grab all the paths first because thing may change as files are renamed.
+        for directory in directories:
+            path = pathlib.Path(directory)
+            for ext in audiofile.AudioFile.extensions():
+                paths.extend(path.rglob(f"*{ext}"))
+        paths = sorted(set(paths))
+        # Using yield rather than returning a list saves us from simultaneously storing
+        # potentially thousands of AudioFile objects in memory at the same time.
+        for path in paths:
+            try:
+                yield audiofile.AudioFile.open(path)
+            except FileNotFoundError:
+                continue
+
+    @staticmethod
+    def _read_manifest(manifest_path: pathlib.Path) -> dict[Any, Any]:
+        with manifest_path.open(encoding="utf-8") as manifest_file:
+            return dict(yaml.safe_load(manifest_file))

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/src/audiolibrarian/cli.py

@@ -1,7 +1,7 @@
 """Audiolibrarian command line interface."""
 
 #
-#  Copyright (c) 2021 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #
@@ -40,7 +40,6 @@ class CommandLineInterface:
         "lame",
         "mpg123",
         "sndfile-convert",
-        "wavegain",
     }
 
     def __init__(self, *, parse_args: bool = True) -> None:

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/src/audiolibrarian/commands.py

@@ -1,7 +1,7 @@
 """Command line commands."""
 
 #
-#  Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/src/audiolibrarian/genremanager.py

@@ -1,7 +1,7 @@
 """Genre Manager."""
 
 #
-#  Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/src/audiolibrarian/musicbrainz.py

@@ -1,7 +1,7 @@
 """Access the MusicBrainz service."""
 
 #
-#  Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/src/audiolibrarian/output.py

@@ -1,7 +1,7 @@
 """Screen output utilities."""
 
 #
-#  Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/src/audiolibrarian/records.py

@@ -4,7 +4,7 @@ Useful field reference: https://github.com/metabrainz/picard/blob/master/picard/
 """
 
 #
-#  Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #

audiolibrarian-0.17.0/src/audiolibrarian/settings.py

@@ -0,0 +1,114 @@
+"""Configuration module for AudioLibrarian.
+
+This module provides configuration management using pydantic-settings, supporting multiple
+sources of configuration:
+
+1. Environment Variables (highest precedence):
+   - Prefix: "AUDIOLIBRARIAN__"
+   - Nested fields: Use "__" as delimiter (e.g., AUDIOLIBRARIAN__MUSICBRAINZ__USERNAME)
+
+2. YAML Configuration File:
+   - Location: $XDG_CONFIG_HOME/audiolibrarian/config.yaml
+   - Supports nested structure for MusicBrainz settings
+
+3. Default Values:
+   - Defined in Settings class
+   - Lowest precedence
+
+The configuration is immutable (frozen=True) and follows XDG base directory standards for
+configuration and cache locations.
+
+Sensitive fields (like passwords) are handled using pydantic.SecretStr for security.
+"""
+
+#
+#  Copyright (c) 2000-2025 Stephen Jibson
+#
+#  This file is part of audiolibrarian.
+#
+#  Audiolibrarian is free software: you can redistribute it and/or modify it under the terms of the
+#  GNU General Public License as published by the Free Software Foundation, either version 3 of the
+#  License, or (at your option) any later version.
+#
+#  Audiolibrarian is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+#  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+#  the GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along with audiolibrarian.
+#  If not, see <https://www.gnu.org/licenses/>.
+#
+import logging
+import pathlib
+from typing import Literal
+
+import pydantic
+import pydantic_settings
+import xdg_base_dirs
+
+logger = logging.getLogger(__name__)
+
+
+class MusicBrainzSettings(pydantic_settings.BaseSettings):
+    """Configuration settings for MusicBrainz."""
+
+    password: pydantic.SecretStr = pydantic.SecretStr("")
+    username: str = ""
+    rate_limit: pydantic.PositiveFloat = 1.5  # Seconds between requests.
+
+
+class NormalizeFFmpegSettings(pydantic_settings.BaseSettings):
+    """Configuration settings for ffmpeg normalization."""
+
+    target_level: float = -13
+
+
+class NormalizeWavegainSettings(pydantic_settings.BaseSettings):
+    """Configuration settings for wavegain normalization."""
+
+    gain: int = 5  # dB
+    preset: Literal["album", "radio"] = "radio"
+
+
+class NormalizeSettings(pydantic_settings.BaseSettings):
+    """Configuration settings for audio normalization."""
+
+    normalizer: Literal["auto", "wavegain", "ffmpeg", "none"] = "auto"
+    ffmpeg: NormalizeFFmpegSettings = NormalizeFFmpegSettings()
+    wavegain: NormalizeWavegainSettings = NormalizeWavegainSettings()
+
+
+class Settings(pydantic_settings.BaseSettings):
+    """Configuration settings for AudioLibrarian."""
+
+    discid_device: str | None = None  # Use default device.
+    library_dir: pathlib.Path = pathlib.Path("library").resolve()
+    musicbrainz: MusicBrainzSettings = MusicBrainzSettings()
+    normalize: NormalizeSettings = NormalizeSettings()
+    work_dir: pathlib.Path = xdg_base_dirs.xdg_cache_home() / "audiolibrarian"
+
+    model_config = pydantic_settings.SettingsConfigDict(
+        env_nested_delimiter="__",
+        env_prefix="AUDIOLIBRARIAN__",
+        yaml_file=str(xdg_base_dirs.xdg_config_home() / "audiolibrarian" / "config.yaml"),
+        frozen=True,  # Make settings immutable.
+    )
+
+    @classmethod
+    def settings_customise_sources(
+        cls,
+        settings_cls: type[pydantic_settings.BaseSettings],
+        init_settings: pydantic_settings.PydanticBaseSettingsSource,
+        env_settings: pydantic_settings.PydanticBaseSettingsSource,
+        dotenv_settings: pydantic_settings.PydanticBaseSettingsSource,
+        file_secret_settings: pydantic_settings.PydanticBaseSettingsSource,
+    ) -> tuple[pydantic_settings.PydanticBaseSettingsSource, ...]:
+        del dotenv_settings, file_secret_settings  # Unused.
+        return (
+            env_settings,
+            pydantic_settings.YamlConfigSettingsSource(settings_cls),
+            init_settings,
+        )
+
+
+SETTINGS = Settings()
+__all__ = ["SETTINGS"]

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/src/audiolibrarian/sh.py

@@ -1,7 +1,7 @@
 """Command execution helpers."""
 
 #
-#  Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/src/audiolibrarian/text.py

@@ -1,7 +1,7 @@
 """Text utilities."""
 
 #
-#  Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #

audiolibrarian-0.17.0/tools/__init__.py

@@ -0,0 +1,17 @@
+"""Miscellaneous tools."""
+#
+#  Copyright (c) 2000-2025 Stephen Jibson
+#
+#  This file is part of audiolibrarian.
+#
+#  Audiolibrarian is free software: you can redistribute it and/or modify it under the terms of the
+#  GNU General Public License as published by the Free Software Foundation, either version 3 of the
+#  License, or (at your option) any later version.
+#
+#  Audiolibrarian is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+#  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+#  the GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along with audiolibrarian.
+#  If not, see <https://www.gnu.org/licenses/>.
+#

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/tools/diff.py

@@ -1,7 +1,7 @@
 """Show differences in tags between two files."""
 
 #
-#  Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/tools/show_tags.py

@@ -1,7 +1,7 @@
 """Show tags."""
 
 #
-#  Copyright (c) 2020 Stephen Jibson
+#  Copyright (c) 2000-2025 Stephen Jibson
 #
 #  This file is part of audiolibrarian.
 #

{audiolibrarian-0.16.5 → audiolibrarian-0.17.0}/uv.lock

@@ -40,6 +40,7 @@ source = { editable = "." }
 dependencies = [
     { name = "ansicolors" },
     { name = "discid" },
+    { name = "ffmpeg-normalize" },
     { name = "filelock" },
     { name = "fuzzywuzzy" },
     { name = "musicbrainzngs" },
@@ -72,6 +73,7 @@ dev = [
 requires-dist = [
     { name = "ansicolors" },
     { name = "discid" },
+    { name = "ffmpeg-normalize" },
     { name = "filelock" },
     { name = "fuzzywuzzy" },
     { name = "musicbrainzngs" },
@@ -87,9 +89,9 @@ requires-dist = [
 dev = [
     { name = "coverage" },
     { name = "hatchling" },
-    { name = "mkdocs", specifier = ">=1.5.0" },
-    { name = "mkdocs-material", specifier = ">=9.0.0" },
-    { name = "mkdocstrings", extras = ["python"], specifier = ">=0.23.0" },
+    { name = "mkdocs" },
+    { name = "mkdocs-material" },
+    { name = "mkdocstrings", extras = ["python"] },
     { name = "mypy" },
     { name = "pymarkdownlnt" },
     { name = "pytest" },
@@ -187,6 +189,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" },
 ]
 
+[[package]]
+name = "colorlog"
+version = "6.9.0"
+source = { registry = "https://pypi.jibson.com/simple" }
+dependencies = [
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/d3/7a/359f4d5df2353f26172b3cc39ea32daa39af8de522205f512f458923e677/colorlog-6.9.0.tar.gz", hash = "sha256:bfba54a1b93b94f54e1f4fe48395725a3d92fd2a4af702f6bd70946bdc0c6ac2", size = 16624, upload-time = "2024-10-29T18:34:51.011Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e3/51/9b208e85196941db2f0654ad0357ca6388ab3ed67efdbfc799f35d1f83aa/colorlog-6.9.0-py3-none-any.whl", hash = "sha256:5906e71acd67cb07a71e779c47c4bcb45fb8c2993eebe9e5adcd6a6f1b283eff", size = 11424, upload-time = "2024-10-29T18:34:49.815Z" },
+]
+
 [[package]]
 name = "columnar"
 version = "1.4.1"
@@ -248,6 +262,29 @@ version = "1.2.0"
 source = { registry = "https://pypi.jibson.com/simple" }
 sdist = { url = "https://files.pythonhosted.org/packages/d5/fa/c8856ae3eb53393445d84589afbd49ded85527563a7c0457f4e967d5b7af/discid-1.2.0.tar.gz", hash = "sha256:cd9630bc53f5566df92819641040226e290b2047573f2c74a6e92b8eed9e86b9", size = 30777, upload-time = "2019-02-23T11:16:55.652Z" }
 
+[[package]]
+name = "ffmpeg-normalize"
+version = "1.32.5"
+source = { registry = "https://pypi.jibson.com/simple" }
+dependencies = [
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+    { name = "colorlog" },
+    { name = "ffmpeg-progress-yield" },
+    { name = "mutagen" },
+    { name = "tqdm" },
+]
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b1/11/1b1adca14e40084198632d8eab31fdb91cb26bc74b0b76ac7366b8eeab8d/ffmpeg_normalize-1.32.5-py3-none-any.whl", hash = "sha256:c22ab5421726a1736134992efd6b52da570d9f808d2ba9500a21b7ef20de4d6c", size = 36240, upload-time = "2025-06-22T18:22:52.39Z" },
+]
+
+[[package]]
+name = "ffmpeg-progress-yield"
+version = "1.0.1"
+source = { registry = "https://pypi.jibson.com/simple" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/88/b1/1f88ee6006f212e36e2d1867d20bdaffd0f5a065c17d34c7083a3b03b4f3/ffmpeg_progress_yield-1.0.1-py3-none-any.whl", hash = "sha256:3c24844110accc84d48bde8c7c4d5a8c163cc652f1cf0e2f62c803565ae42dae", size = 13704, upload-time = "2025-06-22T18:20:13.827Z" },
+]
+
 [[package]]
 name = "filelock"
 version = "3.18.0"
@@ -980,6 +1017,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/03/98/eb27cc78ad3af8e302c9d8ff4977f5026676e130d28dd7578132a457170c/toolz-1.0.0-py3-none-any.whl", hash = "sha256:292c8f1c4e7516bf9086f8850935c799a874039c8bcf959d47b600e4c44a6236", size = 56383, upload-time = "2024-10-04T16:17:01.533Z" },
 ]
 
+[[package]]
+name = "tqdm"
+version = "4.67.1"
+source = { registry = "https://pypi.jibson.com/simple" }
+dependencies = [
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/a8/4b/29b4ef32e036bb34e4ab51796dd745cdba7ed47ad142a9f4a1eb8e0c744d/tqdm-4.67.1.tar.gz", hash = "sha256:f8aef9c52c08c13a65f30ea34f4e5aac3fd1a34959879d7e59e63027286627f2", size = 169737, upload-time = "2024-11-24T20:12:22.481Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d0/30/dc54f88dd4a2b5dc8a0279bdd7270e735851848b762aeb1c1184ed1f6b14/tqdm-4.67.1-py3-none-any.whl", hash = "sha256:26445eca388f82e72884e0d580d5464cd801a3ea01e63e5601bdff9ba6a48de2", size = 78540, upload-time = "2024-11-24T20:12:19.698Z" },
+]
+
 [[package]]
 name = "trove-classifiers"
 version = "2025.5.9.12"

audiolibrarian-0.16.5/docs/user-guide/configuration.md

@@ -1,70 +0,0 @@
-# Configuration
-
-`audiolibrarian` uses a flexible configuration system that supports multiple configuration sources,
-listed in order of precedence:
-
-## Configuration Sources
-
-### 1. Environment Variables (highest precedence)
-
-- **Prefix**: `AUDIOLIBRARIAN__`
-- **Nested fields**: Use `__` as delimiter (e.g., `AUDIOLIBRARIAN__MUSICBRAINZ__USERNAME`)
-- **Example**:
-
-    ```bash
-    # Override library directory (library_dir)
-    export AUDIOLIBRARIAN__LIBRARY_DIR="/mnt/music/library"
-  
-    # Set MusicBrainz credentials (musicbrainz.username and musicbrainz.password)
-    export AUDIOLIBRARIAN__MUSICBRAINZ__USERNAME="your_username"
-    export AUDIOLIBRARIAN__MUSICBRAINZ__PASSWORD="your_password"
-    ```
-
-### 2. YAML Configuration File (medium precedence)
-
-- **Default location**: `~/.config/audiolibrarian/config.yaml`
-- **Example**:
-
-    ```yaml
-    # Base directory for your music library
-    library_dir: "~/music/library"
-
-    # Cache and working directory
-    work_dir: "~/.cache/audiolibrarian"
-
-    # CD/DVD device path (use null for default device)
-    discid_device: null
-
-    # Audio normalization settings
-    normalize_gain: 5  # dB gain for normalization
-    normalize_preset: "radio"  # "album" or "radio"
-
-    # MusicBrainz API settings (optional)
-    musicbrainz:
-      username: "your_username"  # For personal genre preferences
-      password: "your_password"  # Will be stored securely
-      rate_limit: 1.5  # Seconds between API requests
-    ```
-
-### 3. Default Values (lowest precedence)
-
-- Built-in defaults from the application
-
-## Available Settings
-
-| Setting                  | Default                   | Description                               |
-|--------------------------|---------------------------|-------------------------------------------|
-| `library_dir`            | `./library`               | Directory for storing audio files         |
-| `work_dir`               | `~/.cache/audiolibrarian` | Directory for temporary files[^wd]        |
-| `discid_device`          | `null`                    | CD device path (null for default device)  |
-| `normalize_gain`         | `5`                       | Normalization gain in dB                  |
-| `normalize_preset`       | `"radio"`                 | Normalization preset ("album" or "radio") |
-| `musicbrainz.username`   | (not set)                 | MusicBrainz username[^mb]                 |
-| `musicbrainz.password`   | (not set)                 | MusicBrainz password[^mb]                 |
-| `musicbrainz.rate_limit` | `1.5`                     | Seconds between requests                  |
-
-[^wd]: The `work_dir` default is actually `$XDG_CACHE_HOME/audiolibrarian`, which defaults
-  to `~/.cache/audiolibrarian` on Linux and macOS.
-
-[^mb]: The `musicbrainz` username and password are optional but recommended for accessing personal genre
-  preferences on [MusicBrainz](https://musicbrainz.org/).

audiolibrarian-0.16.5/src/audiolibrarian/audiofile/formats/__init__.py

@@ -1 +0,0 @@
-"""AudioFile formats."""

audiolibrarian-0.16.5/src/audiolibrarian/settings.py

@@ -1,79 +0,0 @@
-"""Configuration module for AudioLibrarian.
-
-This module provides configuration management using pydantic-settings, supporting multiple
-sources of configuration:
-
-1. Environment Variables (highest precedence):
-   - Prefix: "AUDIOLIBRARIAN__"
-   - Nested fields: Use "__" as delimiter (e.g., AUDIOLIBRARIAN__MUSICBRAINZ__USERNAME)
-
-2. YAML Configuration File:
-   - Location: $XDG_CONFIG_HOME/audiolibrarian/config.yaml
-   - Supports nested structure for MusicBrainz settings
-
-3. Default Values:
-   - Defined in Settings class
-   - Lowest precedence
-
-The configuration is immutable (frozen=True) and follows XDG base directory standards for
-configuration and cache locations.
-
-Sensitive fields (like passwords) are handled using pydantic.SecretStr for security.
-"""
-
-import logging
-import pathlib
-from typing import Literal
-
-import pydantic
-import xdg_base_dirs
-from pydantic_settings import (
-    BaseSettings,
-    PydanticBaseSettingsSource,
-    SettingsConfigDict,
-    YamlConfigSettingsSource,
-)
-
-logger = logging.getLogger(__name__)
-
-
-class MusicBrainzSettings(BaseSettings):
-    """Configuration settings for MusicBrainz."""
-
-    password: pydantic.SecretStr = pydantic.SecretStr("")
-    username: str = ""
-    rate_limit: pydantic.PositiveFloat = 1.5  # Seconds between requests.
-
-
-class Settings(BaseSettings):
-    """Configuration settings for AudioLibrarian."""
-
-    discid_device: str | None = None  # Use default device.
-    library_dir: pathlib.Path = pathlib.Path("library").resolve()
-    musicbrainz: MusicBrainzSettings = MusicBrainzSettings()
-    normalize_gain: int = 5  # dB
-    normalize_preset: Literal["album", "radio"] = "radio"
-    work_dir: pathlib.Path = xdg_base_dirs.xdg_cache_home() / "audiolibrarian"
-
-    model_config = SettingsConfigDict(
-        env_nested_delimiter="__",
-        env_prefix="AUDIOLIBRARIAN__",
-        yaml_file=str(xdg_base_dirs.xdg_config_home() / "audiolibrarian" / "config.yaml"),
-        frozen=True,  # Make settings immutable.
-    )
-
-    @classmethod
-    def settings_customise_sources(
-        cls,
-        settings_cls: type[BaseSettings],
-        init_settings: PydanticBaseSettingsSource,
-        env_settings: PydanticBaseSettingsSource,
-        dotenv_settings: PydanticBaseSettingsSource,
-        file_secret_settings: PydanticBaseSettingsSource,
-    ) -> tuple[PydanticBaseSettingsSource, ...]:
-        del dotenv_settings, file_secret_settings  # Unused.
-        return env_settings, YamlConfigSettingsSource(settings_cls), init_settings
-
-
-SETTINGS = Settings()
-__all__ = ["SETTINGS"]

audiolibrarian-0.16.5/tools/__init__.py

@@ -1 +0,0 @@
-"""Miscellaneous tools."""