audiolibrarian 0.16.2__tar.gz → 0.16.4__tar.gz

{audiolibrarian-0.16.2 → audiolibrarian-0.16.4}/.github/workflows/main.yml

@@ -1,8 +1,6 @@
 name: Makefile CI
 
 on:
-  push:
-    branches: [main]
   pull_request:
     branches: [main]
   release:

{audiolibrarian-0.16.2 → audiolibrarian-0.16.4}/.gitignore

@@ -14,3 +14,5 @@ library/
 new_library/
 workdir/
 venv/
+
+NOTES.md

{audiolibrarian-0.16.2 → audiolibrarian-0.16.4}/CONTRIBUTING.md

@@ -2,9 +2,9 @@
 
 ## Git Hooks
 
-The project includes a git_hooks directory with a pre-push hook that verifies that all code is 
+The project includes a git_hooks directory with a pre-push hook that verifies that all code is
 linted and tests pass. To have git use the hooks in this directory, run:
 
 ```bash
 git config core.hooksPath git_hooks
-```
+```

{audiolibrarian-0.16.2 → audiolibrarian-0.16.4}/Makefile

@@ -4,6 +4,7 @@
 PRESET_VARS := $(.VARIABLES)
 
 # Project variables
+MD_FILES        := $(shell find . -name '*.md' | grep -v "/.venv/" | grep -v "/dist/")
 PROJECT_NAME    := $(shell grep -e '^name =' pyproject.toml | cut -d'"' -f2)
 PY_FILES        := $(shell find . -name '*.py' | grep -v "/.venv/" | grep -v "/dist/")
 PYTHON_VERSION_ := $(shell cat .python-version)
@@ -15,6 +16,7 @@ BROWSER  := $(shell command -v chromium || command -v google-chrome-stable || co
 PYTHON   := $(shell command -v python$(PYTHON_VERSION_))
 UV       := $(shell command -v uv)
 COVERAGE := $(UV) run coverage
+MDLINT   := $(UV) run pymarkdownlnt
 MYPY     := $(UV) run mypy
 PIP      := $(UV) pip
 PYTEST   := $(UV) run pytest
@@ -71,6 +73,7 @@ lint: format  ## Lint the code.
 	@$(RUFF) format --check src
 	@$(RUFF) check src
 	@$(MYPY) --non-interactive $(PY_FILES)
+	@$(MDLINT) scan $(MD_FILES)
 
 .PHONY: publish
 publish: $(WHEEL)  ## Publish the package to PyPI.
@@ -107,7 +110,7 @@ ifndef PYTHON_VERSION
 endif
 endif
 
-uv.lock:
+uv.lock: pyproject.toml
 	@$(UV) lock
 
 $(WHEEL): $(PY_FILES) pyproject.toml uv.lock dep

{audiolibrarian-0.16.2 → audiolibrarian-0.16.4}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: audiolibrarian
-Version: 0.16.2
+Version: 0.16.4
 Summary: Manage my audio library.
-Project-URL: Repository, https://bitbucket.org/toadstule/audiolibrarian/
+Project-URL: Repository, https://github.com/toadstule/audiolibrarian
 Author-email: Steve Jibson <steve@jibson.com>
 License-File: COPYING
 License-File: LICENSE
@@ -27,8 +27,9 @@ Description-Content-Type: text/markdown
 
 ## Overview ##
 
-`audiolibrarian` is a powerful command-line tool for managing digital music libraries. It provides a streamlined 
-workflow for ripping, converting, organizing, and tagging audio files with high-quality metadata from MusicBrainz.
+`audiolibrarian` is a command-line tool for ripping audio from CDs (or taking
+high-quality audio from local files), tagging them with comprehensive metadata from MusicBrainz,
+converting them to multiple formats, and organizing them in a clean directory structure.
 
 ### Key Features ###
 
@@ -45,77 +46,78 @@ workflow for ripping, converting, organizing, and tagging audio files with high-
 - **Consistent Quality**: Maintains audio quality through the conversion process
 - **Accurate Metadata**: Leverages MusicBrainz for comprehensive music information
 - **Automated Workflow**: Reduces manual work in organizing and tagging music
-- **Scriptable**: Perfect for automating large music library management tasks
 - **Open Source**: Free to use and modify under the GPL-3.0 license
 
-Whether you're digitizing a CD collection, organizing existing music files, or managing a large digital library, 
-`audiolibrarian` provides the tools you need to keep your music collection well-organized and properly tagged.
-
+Whether you're digitizing a CD collection, organizing existing music files, or managing a large
+digital library, `audiolibrarian` provides the tools you need to keep your music collection
+well-organized and properly tagged.
 
 ## Installation ##
 
+> **NOTE:** This library has only been tested on Linux. It may not work on other operating
+> systems.
+
 ### External Requirements ###
 
 `audiolibrarian` uses a few command-line tools to run:
 
-* `cd-paranoia`: [cd-paranoia](https://www.gnu.org/software/libcdio/)
-* `eject`: [util-linux](https://github.com/util-linux/util-linux)
-* `faad`: [faad2](https://github.com/knik0/faad2)
-* `fdkaac`: [fdkaac](https://github.com/nu774/fdkaac)
-* `flac`: [flac](https://github.com/xiph/flac)
-* `lame`: [lame](https://lame.sourceforge.io/)
-* `mpg123`: [mpg123](https://www.mpg123.de/)
-* `sndfile-convert`: [libsndfile](https://github.com/libsndfile/libsndfile)
-* `wavegain`: [wavegain](https://rarewares.org/others.php) 
-
-### Install from PyPI ###
+- [cd-paranoia](https://www.gnu.org/software/libcdio/)
+- [util-linux](https://github.com/util-linux/util-linux)
+- [faad2](https://github.com/knik0/faad2)
+- [fdkaac](https://github.com/nu774/fdkaac)
+- [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)
 
-`audiolibrarian` is not available on PyPI, but it can be installed from a local PyPI.
+It also requires the [libdiscid](https://musicbrainz.org/doc/libdiscid) library.
 
-```bash
-pip install --user --extra-index-url=https://pypi.example.com/simple audiolibrarian
-```
+### Install from PyPI ###
 
-### Install from Bitbucket ###
+`audiolibrarian` is available on PyPI:
 
 ```bash
-pip install --user git+https://bitbucket.org/toadstule/audiolibrarian
+pip install audiolibrarian
 ```
 
 ## Configuration ##
 
-`audiolibrarian` uses a flexible configuration system that supports multiple configuration sources, listed in order of precedence:
+`audiolibrarian` uses a flexible configuration system that supports multiple configuration sources,
+listed in order of precedence:
 
 1. **Environment Variables** (highest precedence)
    - Prefix: `AUDIOLIBRARIAN__`
    - Nested fields: Use `__` as delimiter (e.g., `AUDIOLIBRARIAN__MUSICBRAINZ__USERNAME`)
    - Example:
+
      ```bash
-     # Override library directory
+     # Override library directory (library_dir)
      export AUDIOLIBRARIAN__LIBRARY_DIR="/mnt/music/library"
      
-     # Set MusicBrainz credentials
+     # Set MusicBrainz credentials (musicbrainz.username and musicbrainz.password)
      export AUDIOLIBRARIAN__MUSICBRAINZ__USERNAME="your_username"
      export AUDIOLIBRARIAN__MUSICBRAINZ__PASSWORD="your_password"
      ```
 
-2. **YAML Configuration File**
-   - Location: `~/.config/audiolibrarian/config.yaml` (or `$XDG_CONFIG_HOME/audiolibrarian/config.yaml` if set)
+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
@@ -128,18 +130,23 @@ pip install --user git+https://bitbucket.org/toadstule/audiolibrarian
 
 ### Available Settings ###
 
-| Setting                  | Default                          | Description                               |
-|--------------------------|----------------------------------|-------------------------------------------|
-| `library_dir`            | `library` (in the current dir)   | Directory for storing audio files         |
-| `work_dir`               | `$XDG_CACHE_HOME/audiolibrarian` | Directory for temporary files             |
-| `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                      |
-| `musicbrainz.password`   | (not set)                        | MusicBrainz password                      |
-| `musicbrainz.rate_limit` | `1.5`                            | Seconds between requests                  |
-
-> **Note**: The `musicbrainz` section is optional but recommended for accessing personal genre preferences on [MusicBrainz](https://musicbrainz.org/).
+| Setting                  | Default                   | Description                               |
+|--------------------------|---------------------------|-------------------------------------------|
+| `library_dir`            | `./library`               | Directory for storing audio files         |
+| `work_dir`               | `~/.cache/audiolibrarian` | Directory for temporary files             |
+| `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                      |
+| `musicbrainz.password`   | (not set)                 | MusicBrainz password                      |
+| `musicbrainz.rate_limit` | `1.5`                     | Seconds between requests                  |
+
+> **Notes**:
+>
+> - The `musicbrainz` username and password are optional but recommended for accessing personal genre
+>   preferences on [MusicBrainz](https://musicbrainz.org/).
+> - The `work_dir` default is actually `$XDG_CACHE_HOME/audiolibrarian`, which defaults to
+>   `~/.cache/audiolibrarian` on Linux and macOS.
 
 ## Usage ##
 
@@ -168,31 +175,40 @@ audiolibrarian genre /path/to/audio/directories --tag  # Update tags with MB gen
 audiolibrarian --help
 ```
 
-### Combining Configuration Sources ###
-
-Configuration sources are combined with the following precedence (highest to lowest):
-1. Environment variables
-2. YAML configuration file
-3. Default values
-
-For example, with this `config.yaml`:
+### Directory Structure ###
 
-```yaml
-# config.yaml
-library_dir: /media/music/library
-normalize_gain: 5.0
-```
+`audiolibrarian` organizes files in the following structure:
 
-And this environment variable:
-```bash
-export AUDIOLIBRARIAN__NORMALIZE_GAIN="8.0"
-```
+**Processed audio files** (organized by format):
 
-The effective value of `normalize_gain` will be `8.0` (from the environment variable), while `library_dir` will be set to `/media/music/library` from the YAML file.
+   ```text
+   library/
+   ├── flac/
+   │   └── Artist/
+   │       └── YYYY__Album/
+   │           ├── 01__Track_Title.flac
+   │           └── 02__Another_Track.flac
+   ├── m4a/
+   │   └── Artist/
+   │       └── YYYY__Album/
+   │           ├── 01__Track_Title.m4a
+   │           └── 02__Another_Track.m4a
+   ├── mp3/
+   │   └── Artist/
+   │   └── YYYY__Album/
+   │           ├── 01__Track_Title.mp3
+   │           └── 02__Another_Track.mp3
+   ├── source/
+   │   └── Artist/
+   │       └── YYYY__Album/
+   │           ├── 01__Track_Title.flac
+   │           ├── 02__Another_Track.flac
+   │           └── Manifest.yaml
+   ```
 
 ### Advanced Usage ###
 
-1. **Ripping CDs**
+#### Ripping CDs ####
 
 ```bash
 # Basic CD rip
@@ -208,7 +224,7 @@ audiolibrarian rip --mb-release-id "12345678-1234-1234-1234-123456789012"
 audiolibrarian rip --disc "1/2"  # First disc of two
 ```
 
-2. **Converting Audio Files**
+#### Converting Audio Files ####
 
 ```bash
 # Convert with specific artist and album
@@ -221,7 +237,7 @@ audiolibrarian convert --mb-release-id "12345678-1234-1234-1234-123456789012" /p
 audiolibrarian convert --disc "1/2" /path/to/disc1/files
 ```
 
-2. **Working with Manifests**
+#### Working with Manifests ####
 
 ```bash
 # Create manifest for existing files
@@ -231,11 +247,13 @@ audiolibrarian manifest /path/to/audio/files
 audiolibrarian manifest --cd /path/to/audio/files
 
 # Specify MusicBrainz artist and release IDs
-audiolibrarian manifest --mb-artist-id "12345678-1234-1234-1234-123456789012" \
-    --mb-release-id "12345678-1234-1234-1234-123456789012" /path/to/audio/files
+audiolibrarian manifest \
+    --mb-artist-id "12345678-1234-1234-1234-123456789012" \
+    --mb-release-id "87654321-4321-4321-4321-210987654321" \
+    /path/to/audio/files
 ```
 
-3. **Reconverting Files**
+#### Reconverting Files ####
 
 ```bash
 # Reconvert all files in directory
@@ -245,7 +263,7 @@ audiolibrarian reconvert /path/to/source/directories
 audiolibrarian reconvert --dry-run /path/to/source/directories
 ```
 
-4. **Renaming Files**
+#### Renaming Files ####
 
 ```bash
 # Rename files based on tags
@@ -255,7 +273,7 @@ audiolibrarian rename /path/to/audio/directories
 audiolibrarian rename --dry-run /path/to/audio/directories
 ```
 
-5. **Using Different Normalization Presets**
+#### Using Different Normalization Presets ####
 
 ```bash
 # Use radio normalization preset (default)
@@ -265,9 +283,33 @@ export AUDIOLIBRARIAN__NORMALIZE_PRESET="radio"
 export AUDIOLIBRARIAN__NORMALIZE_PRESET="album"
 ```
 
+#### Combining Configuration Sources ####
+
+Configuration sources are combined with the following precedence (highest to lowest):
+1. Environment variables
+2. YAML configuration file
+3. Default values
+
+For example, with this `config.yaml`:
+
+```yaml
+# config.yaml
+library_dir: /media/music/library
+normalize_gain: 5.0
+```
+
+And this environment variable:
+
+```bash
+export AUDIOLIBRARIAN__NORMALIZE_GAIN="8.0"
+```
+
+The effective value of `normalize_gain` will be `8.0` (from the environment variable), while
+`library_dir` will be set to `/media/music/library` from the YAML file.
+
 ### Troubleshooting ###
 
-1. **Increasing Verbosity**
+#### Increasing Verbosity ####
 
 ```bash
 # Show more detailed output
@@ -277,58 +319,15 @@ audiolibrarian --log-level INFO cd
 audiolibrarian --log-level DEBUG cd
 ```
 
-2. **Checking Dependencies**
-
-```bash
-# Verify all required tools are installed
-audiolibrarian --log-level DEBUG cd
-```
-
-3. **MusicBrainz Issues**
+#### MusicBrainz Issues ####
 
 If you encounter MusicBrainz-related errors:
 
 1. Verify your credentials are correct
-2. Check your internet connection
+2. Check your Internet connection
 3. Use the debug log level to get more information
 4. Increase the rate limit if you're hitting rate limits
 
 ```bash
 export AUDIOLIBRARIAN__MUSICBRAINZ__RATE_LIMIT="2.0"
 ```
-
-### Directory Structure ###
-
-`audiolibrarian` organizes files in the following structure:
-
-1. **Source files** (original audio files):
-   ```
-   library/source/
-   └── Artist/
-       └── YYYY__Album/
-           ├── 01__Track_Title.flac
-           ├── 02__Another_Track.flac
-           └── Manifest.yaml
-   ```
-
-2. **Processed audio files** (organized by format):
-   ```
-   library/
-   ├── flac/
-   │   └── Artist/
-   │       └── YYYY__Album/
-   │           ├── 01__Track_Title.flac
-   │           └── 02__Another_Track.flac
-   ├── m4a/
-   │   └── Artist/
-   │       └── YYYY__Album/
-   │           ├── 01__Track_Title.m4a
-   │           └── 02__Another_Track.m4a
-   └── mp3/
-       └── Artist/
-           └── YYYY__Album/
-               ├── 01__Track_Title.mp3
-               └── 02__Another_Track.mp3
-   ```
-
-Each track filename follows the format: `track_number__track_name.extension` (e.g., `01__Call_to_Arms.flac`).

{audiolibrarian-0.16.2 → audiolibrarian-0.16.4}/README.md

@@ -2,8 +2,9 @@
 
 ## Overview ##
 
-`audiolibrarian` is a powerful command-line tool for managing digital music libraries. It provides a streamlined 
-workflow for ripping, converting, organizing, and tagging audio files with high-quality metadata from MusicBrainz.
+`audiolibrarian` is a command-line tool for ripping audio from CDs (or taking
+high-quality audio from local files), tagging them with comprehensive metadata from MusicBrainz,
+converting them to multiple formats, and organizing them in a clean directory structure.
 
 ### Key Features ###
 
@@ -20,77 +21,78 @@ workflow for ripping, converting, organizing, and tagging audio files with high-
 - **Consistent Quality**: Maintains audio quality through the conversion process
 - **Accurate Metadata**: Leverages MusicBrainz for comprehensive music information
 - **Automated Workflow**: Reduces manual work in organizing and tagging music
-- **Scriptable**: Perfect for automating large music library management tasks
 - **Open Source**: Free to use and modify under the GPL-3.0 license
 
-Whether you're digitizing a CD collection, organizing existing music files, or managing a large digital library, 
-`audiolibrarian` provides the tools you need to keep your music collection well-organized and properly tagged.
-
+Whether you're digitizing a CD collection, organizing existing music files, or managing a large
+digital library, `audiolibrarian` provides the tools you need to keep your music collection
+well-organized and properly tagged.
 
 ## Installation ##
 
+> **NOTE:** This library has only been tested on Linux. It may not work on other operating
+> systems.
+
 ### External Requirements ###
 
 `audiolibrarian` uses a few command-line tools to run:
 
-* `cd-paranoia`: [cd-paranoia](https://www.gnu.org/software/libcdio/)
-* `eject`: [util-linux](https://github.com/util-linux/util-linux)
-* `faad`: [faad2](https://github.com/knik0/faad2)
-* `fdkaac`: [fdkaac](https://github.com/nu774/fdkaac)
-* `flac`: [flac](https://github.com/xiph/flac)
-* `lame`: [lame](https://lame.sourceforge.io/)
-* `mpg123`: [mpg123](https://www.mpg123.de/)
-* `sndfile-convert`: [libsndfile](https://github.com/libsndfile/libsndfile)
-* `wavegain`: [wavegain](https://rarewares.org/others.php) 
-
-### Install from PyPI ###
+- [cd-paranoia](https://www.gnu.org/software/libcdio/)
+- [util-linux](https://github.com/util-linux/util-linux)
+- [faad2](https://github.com/knik0/faad2)
+- [fdkaac](https://github.com/nu774/fdkaac)
+- [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)
 
-`audiolibrarian` is not available on PyPI, but it can be installed from a local PyPI.
+It also requires the [libdiscid](https://musicbrainz.org/doc/libdiscid) library.
 
-```bash
-pip install --user --extra-index-url=https://pypi.example.com/simple audiolibrarian
-```
+### Install from PyPI ###
 
-### Install from Bitbucket ###
+`audiolibrarian` is available on PyPI:
 
 ```bash
-pip install --user git+https://bitbucket.org/toadstule/audiolibrarian
+pip install audiolibrarian
 ```
 
 ## Configuration ##
 
-`audiolibrarian` uses a flexible configuration system that supports multiple configuration sources, listed in order of precedence:
+`audiolibrarian` uses a flexible configuration system that supports multiple configuration sources,
+listed in order of precedence:
 
 1. **Environment Variables** (highest precedence)
    - Prefix: `AUDIOLIBRARIAN__`
    - Nested fields: Use `__` as delimiter (e.g., `AUDIOLIBRARIAN__MUSICBRAINZ__USERNAME`)
    - Example:
+
      ```bash
-     # Override library directory
+     # Override library directory (library_dir)
      export AUDIOLIBRARIAN__LIBRARY_DIR="/mnt/music/library"
      
-     # Set MusicBrainz credentials
+     # Set MusicBrainz credentials (musicbrainz.username and musicbrainz.password)
      export AUDIOLIBRARIAN__MUSICBRAINZ__USERNAME="your_username"
      export AUDIOLIBRARIAN__MUSICBRAINZ__PASSWORD="your_password"
      ```
 
-2. **YAML Configuration File**
-   - Location: `~/.config/audiolibrarian/config.yaml` (or `$XDG_CONFIG_HOME/audiolibrarian/config.yaml` if set)
+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
@@ -103,18 +105,23 @@ pip install --user git+https://bitbucket.org/toadstule/audiolibrarian
 
 ### Available Settings ###
 
-| Setting                  | Default                          | Description                               |
-|--------------------------|----------------------------------|-------------------------------------------|
-| `library_dir`            | `library` (in the current dir)   | Directory for storing audio files         |
-| `work_dir`               | `$XDG_CACHE_HOME/audiolibrarian` | Directory for temporary files             |
-| `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                      |
-| `musicbrainz.password`   | (not set)                        | MusicBrainz password                      |
-| `musicbrainz.rate_limit` | `1.5`                            | Seconds between requests                  |
-
-> **Note**: The `musicbrainz` section is optional but recommended for accessing personal genre preferences on [MusicBrainz](https://musicbrainz.org/).
+| Setting                  | Default                   | Description                               |
+|--------------------------|---------------------------|-------------------------------------------|
+| `library_dir`            | `./library`               | Directory for storing audio files         |
+| `work_dir`               | `~/.cache/audiolibrarian` | Directory for temporary files             |
+| `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                      |
+| `musicbrainz.password`   | (not set)                 | MusicBrainz password                      |
+| `musicbrainz.rate_limit` | `1.5`                     | Seconds between requests                  |
+
+> **Notes**:
+>
+> - The `musicbrainz` username and password are optional but recommended for accessing personal genre
+>   preferences on [MusicBrainz](https://musicbrainz.org/).
+> - The `work_dir` default is actually `$XDG_CACHE_HOME/audiolibrarian`, which defaults to
+>   `~/.cache/audiolibrarian` on Linux and macOS.
 
 ## Usage ##
 
@@ -143,31 +150,40 @@ audiolibrarian genre /path/to/audio/directories --tag  # Update tags with MB gen
 audiolibrarian --help
 ```
 
-### Combining Configuration Sources ###
-
-Configuration sources are combined with the following precedence (highest to lowest):
-1. Environment variables
-2. YAML configuration file
-3. Default values
-
-For example, with this `config.yaml`:
+### Directory Structure ###
 
-```yaml
-# config.yaml
-library_dir: /media/music/library
-normalize_gain: 5.0
-```
+`audiolibrarian` organizes files in the following structure:
 
-And this environment variable:
-```bash
-export AUDIOLIBRARIAN__NORMALIZE_GAIN="8.0"
-```
+**Processed audio files** (organized by format):
 
-The effective value of `normalize_gain` will be `8.0` (from the environment variable), while `library_dir` will be set to `/media/music/library` from the YAML file.
+   ```text
+   library/
+   ├── flac/
+   │   └── Artist/
+   │       └── YYYY__Album/
+   │           ├── 01__Track_Title.flac
+   │           └── 02__Another_Track.flac
+   ├── m4a/
+   │   └── Artist/
+   │       └── YYYY__Album/
+   │           ├── 01__Track_Title.m4a
+   │           └── 02__Another_Track.m4a
+   ├── mp3/
+   │   └── Artist/
+   │   └── YYYY__Album/
+   │           ├── 01__Track_Title.mp3
+   │           └── 02__Another_Track.mp3
+   ├── source/
+   │   └── Artist/
+   │       └── YYYY__Album/
+   │           ├── 01__Track_Title.flac
+   │           ├── 02__Another_Track.flac
+   │           └── Manifest.yaml
+   ```
 
 ### Advanced Usage ###
 
-1. **Ripping CDs**
+#### Ripping CDs ####
 
 ```bash
 # Basic CD rip
@@ -183,7 +199,7 @@ audiolibrarian rip --mb-release-id "12345678-1234-1234-1234-123456789012"
 audiolibrarian rip --disc "1/2"  # First disc of two
 ```
 
-2. **Converting Audio Files**
+#### Converting Audio Files ####
 
 ```bash
 # Convert with specific artist and album
@@ -196,7 +212,7 @@ audiolibrarian convert --mb-release-id "12345678-1234-1234-1234-123456789012" /p
 audiolibrarian convert --disc "1/2" /path/to/disc1/files
 ```
 
-2. **Working with Manifests**
+#### Working with Manifests ####
 
 ```bash
 # Create manifest for existing files
@@ -206,11 +222,13 @@ audiolibrarian manifest /path/to/audio/files
 audiolibrarian manifest --cd /path/to/audio/files
 
 # Specify MusicBrainz artist and release IDs
-audiolibrarian manifest --mb-artist-id "12345678-1234-1234-1234-123456789012" \
-    --mb-release-id "12345678-1234-1234-1234-123456789012" /path/to/audio/files
+audiolibrarian manifest \
+    --mb-artist-id "12345678-1234-1234-1234-123456789012" \
+    --mb-release-id "87654321-4321-4321-4321-210987654321" \
+    /path/to/audio/files
 ```
 
-3. **Reconverting Files**
+#### Reconverting Files ####
 
 ```bash
 # Reconvert all files in directory
@@ -220,7 +238,7 @@ audiolibrarian reconvert /path/to/source/directories
 audiolibrarian reconvert --dry-run /path/to/source/directories
 ```
 
-4. **Renaming Files**
+#### Renaming Files ####
 
 ```bash
 # Rename files based on tags
@@ -230,7 +248,7 @@ audiolibrarian rename /path/to/audio/directories
 audiolibrarian rename --dry-run /path/to/audio/directories
 ```
 
-5. **Using Different Normalization Presets**
+#### Using Different Normalization Presets ####
 
 ```bash
 # Use radio normalization preset (default)
@@ -240,9 +258,33 @@ export AUDIOLIBRARIAN__NORMALIZE_PRESET="radio"
 export AUDIOLIBRARIAN__NORMALIZE_PRESET="album"
 ```
 
+#### Combining Configuration Sources ####
+
+Configuration sources are combined with the following precedence (highest to lowest):
+1. Environment variables
+2. YAML configuration file
+3. Default values
+
+For example, with this `config.yaml`:
+
+```yaml
+# config.yaml
+library_dir: /media/music/library
+normalize_gain: 5.0
+```
+
+And this environment variable:
+
+```bash
+export AUDIOLIBRARIAN__NORMALIZE_GAIN="8.0"
+```
+
+The effective value of `normalize_gain` will be `8.0` (from the environment variable), while
+`library_dir` will be set to `/media/music/library` from the YAML file.
+
 ### Troubleshooting ###
 
-1. **Increasing Verbosity**
+#### Increasing Verbosity ####
 
 ```bash
 # Show more detailed output
@@ -252,58 +294,15 @@ audiolibrarian --log-level INFO cd
 audiolibrarian --log-level DEBUG cd
 ```
 
-2. **Checking Dependencies**
-
-```bash
-# Verify all required tools are installed
-audiolibrarian --log-level DEBUG cd
-```
-
-3. **MusicBrainz Issues**
+#### MusicBrainz Issues ####
 
 If you encounter MusicBrainz-related errors:
 
 1. Verify your credentials are correct
-2. Check your internet connection
+2. Check your Internet connection
 3. Use the debug log level to get more information
 4. Increase the rate limit if you're hitting rate limits
 
 ```bash
 export AUDIOLIBRARIAN__MUSICBRAINZ__RATE_LIMIT="2.0"
 ```
-
-### Directory Structure ###
-
-`audiolibrarian` organizes files in the following structure:
-
-1. **Source files** (original audio files):
-   ```
-   library/source/
-   └── Artist/
-       └── YYYY__Album/
-           ├── 01__Track_Title.flac
-           ├── 02__Another_Track.flac
-           └── Manifest.yaml
-   ```
-
-2. **Processed audio files** (organized by format):
-   ```
-   library/
-   ├── flac/
-   │   └── Artist/
-   │       └── YYYY__Album/
-   │           ├── 01__Track_Title.flac
-   │           └── 02__Another_Track.flac
-   ├── m4a/
-   │   └── Artist/
-   │       └── YYYY__Album/
-   │           ├── 01__Track_Title.m4a
-   │           └── 02__Another_Track.m4a
-   └── mp3/
-       └── Artist/
-           └── YYYY__Album/
-               ├── 01__Track_Title.mp3
-               └── 02__Another_Track.mp3
-   ```
-
-Each track filename follows the format: `track_number__track_name.extension` (e.g., `01__Call_to_Arms.flac`).

{audiolibrarian-0.16.2 → audiolibrarian-0.16.4}/git_hooks/README.md

@@ -5,4 +5,3 @@ To have git use the hooks in this directory, run
 ```bash
 git config core.hooksPath git_hooks
 ```
-

{audiolibrarian-0.16.2 → audiolibrarian-0.16.4}/pyproject.toml

@@ -7,6 +7,7 @@ dev = [
     "coverage",
     "hatchling",
     "mypy",
+    "pymarkdownlnt",
     "pytest",
     "ruff",
     "types-pyyaml",
@@ -46,7 +47,7 @@ requires-python = "==3.13.*"
 audiolibrarian = "audiolibrarian:cli.main"
 
 [project.urls]
-Repository = "https://bitbucket.org/toadstule/audiolibrarian/"
+Repository = "https://github.com/toadstule/audiolibrarian"
 
 [tool.hatch.build.targets.sdist]
 exclude= [
@@ -77,6 +78,12 @@ strict = true
 module = "picard_src.*"
 ignore_errors = true  # This is not our code.
 
+[tool.pymarkdown]
+plugins.md013.line_length = 100
+plugins.md013.code_block_line_length = 100
+#plugins.md007.enabled = true
+#plugins.md007.code_block_line_length = 160
+
 [tool.ruff]
 extend-exclude = [
     "picard_src",  # This is not our code.

{audiolibrarian-0.16.2 → audiolibrarian-0.16.4}/src/audiolibrarian/__init__.py

@@ -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.2"
+__version__ = "0.16.4"

{audiolibrarian-0.16.2 → audiolibrarian-0.16.4}/src/picard_src/README.md

@@ -2,10 +2,10 @@
 
 Code in this directory comes from (or is derived from) the super-cool Picard project.
 
-https://github.com/metabrainz/picard
+[Picard](https://github.com/metabrainz/picard)
 
 I'd like to express my thanks to all of have contributed to that project.
 
-Note: we could have just set the Picard library as a dependency of audiolibrarian, but 
-it includes other dependencies (such as PyQT) that add a lot of overhead not required 
+Note: we could have just set the Picard library as a dependency of audiolibrarian, but
+it includes other dependencies (such as PyQT) that add a lot of overhead not required
 by this project.

{audiolibrarian-0.16.2 → audiolibrarian-0.16.4}/uv.lock

@@ -20,6 +20,20 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/53/18/a56e2fe47b259bb52201093a3a9d4a32014f9d85071ad07e9d60600890ca/ansicolors-1.1.8-py2.py3-none-any.whl", hash = "sha256:00d2dde5a675579325902536738dd27e4fac1fd68f773fe36c21044eb559e187", size = 13847, upload-time = "2017-06-02T21:22:12.67Z" },
 ]
 
+[[package]]
+name = "application-properties"
+version = "0.8.2"
+source = { registry = "https://pypi.jibson.com/simple" }
+dependencies = [
+    { name = "pyyaml" },
+    { name = "tomli" },
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/c1/5e/29ec0fa553ee5befc6a1e47eb0c8ffea75eed941251524678700e2d3e747/application_properties-0.8.2.tar.gz", hash = "sha256:e5e6918c8e29ab57175567d51dfa39c00a1d75b3205625559bb02250f50f0420", size = 29595, upload-time = "2024-01-28T23:43:07.403Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/06/27/ea2b77232385ec1c4b5cb766ee13b5a3085ed2fa789d61374e7af36b79e1/application_properties-0.8.2-py3-none-any.whl", hash = "sha256:a4fe684e4d95fc45054d3316acf763a7b0f29342ccea02eee09de53004f0139c", size = 18399, upload-time = "2024-01-28T23:43:05.631Z" },
+]
+
 [[package]]
 name = "audiolibrarian"
 source = { editable = "." }
@@ -42,6 +56,7 @@ dev = [
     { name = "coverage" },
     { name = "hatchling" },
     { name = "mypy" },
+    { name = "pymarkdownlnt" },
     { name = "pytest" },
     { name = "ruff" },
     { name = "types-pyyaml" },
@@ -69,6 +84,7 @@ dev = [
     { name = "coverage" },
     { name = "hatchling" },
     { name = "mypy" },
+    { name = "pymarkdownlnt" },
     { name = "pytest" },
     { name = "ruff" },
     { name = "types-pyyaml" },
@@ -116,6 +132,19 @@ 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 = "columnar"
+version = "1.4.1"
+source = { registry = "https://pypi.jibson.com/simple" }
+dependencies = [
+    { name = "toolz" },
+    { name = "wcwidth" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/5e/0d/a0b2fd781050d29c9df64ac6df30b5f18b775724b79779f56fc5a8298fe9/Columnar-1.4.1.tar.gz", hash = "sha256:c3cb57273333b2ff9cfaafc86f09307419330c97faa88dcfe23df05e6fbb9c72", size = 11386, upload-time = "2021-12-27T21:58:56.123Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/06/00/a17a5657bf090b9dffdb310ac273c553a38f9252f60224da9fe62d9b60e9/Columnar-1.4.1-py3-none-any.whl", hash = "sha256:8efb692a7e6ca07dcc8f4ea889960421331a5dffa8e5af81f0a67ad8ea1fc798", size = 11845, upload-time = "2021-12-27T21:58:54.388Z" },
+]
+
 [[package]]
 name = "coverage"
 version = "7.8.2"
@@ -370,6 +399,20 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/8a/0b/9fcc47d19c48b59121088dd6da2488a49d5f72dacf8262e2790a1d2c7d15/pygments-2.19.1-py3-none-any.whl", hash = "sha256:9ea1544ad55cecf4b8242fab6dd35a93bbce657034b0611ee383099054ab6d8c", size = 1225293, upload-time = "2025-01-06T17:26:25.553Z" },
 ]
 
+[[package]]
+name = "pymarkdownlnt"
+version = "0.9.30"
+source = { registry = "https://pypi.jibson.com/simple" }
+dependencies = [
+    { name = "application-properties" },
+    { name = "columnar" },
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/86/00/4156086d7f32e3058cebb6b813e93f5a227ae2590ac528b2344d2c669973/pymarkdownlnt-0.9.30.tar.gz", hash = "sha256:cf274935b128abd7f30c44314510d0f4d36965149bb9dae84f6cac9491dc1f58", size = 416281, upload-time = "2025-05-20T02:26:30.652Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/28/92/81059c9eecd973168890e6b730f852abfd310389f67d4fb6b132a3976338/pymarkdownlnt-0.9.30-py3-none-any.whl", hash = "sha256:29b881434def9d3796be4a89cb277ab9f8f4fbb558379ce7836c653c9c351d2c", size = 500322, upload-time = "2025-05-20T02:26:29.098Z" },
+]
+
 [[package]]
 name = "pytest"
 version = "8.4.0"
@@ -487,6 +530,34 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ec/bf/b273dd11673fed8a6bd46032c0ea2a04b2ac9bfa9c628756a5856ba113b0/ruff-0.11.13-py3-none-win_arm64.whl", hash = "sha256:b4385285e9179d608ff1d2fb9922062663c658605819a6876d8beef0c30b7f3b", size = 10683928, upload-time = "2025-06-05T21:00:13.758Z" },
 ]
 
+[[package]]
+name = "tomli"
+version = "2.2.1"
+source = { registry = "https://pypi.jibson.com/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/18/87/302344fed471e44a87289cf4967697d07e532f2421fdaf868a303cbae4ff/tomli-2.2.1.tar.gz", hash = "sha256:cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff", size = 17175, upload-time = "2024-11-27T22:38:36.873Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/04/90/2ee5f2e0362cb8a0b6499dc44f4d7d48f8fff06d28ba46e6f1eaa61a1388/tomli-2.2.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7", size = 132708, upload-time = "2024-11-27T22:38:21.659Z" },
+    { url = "https://files.pythonhosted.org/packages/c0/ec/46b4108816de6b385141f082ba99e315501ccd0a2ea23db4a100dd3990ea/tomli-2.2.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:286f0ca2ffeeb5b9bd4fcc8d6c330534323ec51b2f52da063b11c502da16f30c", size = 123582, upload-time = "2024-11-27T22:38:22.693Z" },
+    { url = "https://files.pythonhosted.org/packages/a0/bd/b470466d0137b37b68d24556c38a0cc819e8febe392d5b199dcd7f578365/tomli-2.2.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a92ef1a44547e894e2a17d24e7557a5e85a9e1d0048b0b5e7541f76c5032cb13", size = 232543, upload-time = "2024-11-27T22:38:24.367Z" },
+    { url = "https://files.pythonhosted.org/packages/d9/e5/82e80ff3b751373f7cead2815bcbe2d51c895b3c990686741a8e56ec42ab/tomli-2.2.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9316dc65bed1684c9a98ee68759ceaed29d229e985297003e494aa825ebb0281", size = 241691, upload-time = "2024-11-27T22:38:26.081Z" },
+    { url = "https://files.pythonhosted.org/packages/05/7e/2a110bc2713557d6a1bfb06af23dd01e7dde52b6ee7dadc589868f9abfac/tomli-2.2.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e85e99945e688e32d5a35c1ff38ed0b3f41f43fad8df0bdf79f72b2ba7bc5272", size = 251170, upload-time = "2024-11-27T22:38:27.921Z" },
+    { url = "https://files.pythonhosted.org/packages/64/7b/22d713946efe00e0adbcdfd6d1aa119ae03fd0b60ebed51ebb3fa9f5a2e5/tomli-2.2.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ac065718db92ca818f8d6141b5f66369833d4a80a9d74435a268c52bdfa73140", size = 236530, upload-time = "2024-11-27T22:38:29.591Z" },
+    { url = "https://files.pythonhosted.org/packages/38/31/3a76f67da4b0cf37b742ca76beaf819dca0ebef26d78fc794a576e08accf/tomli-2.2.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:d920f33822747519673ee656a4b6ac33e382eca9d331c87770faa3eef562aeb2", size = 258666, upload-time = "2024-11-27T22:38:30.639Z" },
+    { url = "https://files.pythonhosted.org/packages/07/10/5af1293da642aded87e8a988753945d0cf7e00a9452d3911dd3bb354c9e2/tomli-2.2.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:a198f10c4d1b1375d7687bc25294306e551bf1abfa4eace6650070a5c1ae2744", size = 243954, upload-time = "2024-11-27T22:38:31.702Z" },
+    { url = "https://files.pythonhosted.org/packages/5b/b9/1ed31d167be802da0fc95020d04cd27b7d7065cc6fbefdd2f9186f60d7bd/tomli-2.2.1-cp313-cp313-win32.whl", hash = "sha256:d3f5614314d758649ab2ab3a62d4f2004c825922f9e370b29416484086b264ec", size = 98724, upload-time = "2024-11-27T22:38:32.837Z" },
+    { url = "https://files.pythonhosted.org/packages/c7/32/b0963458706accd9afcfeb867c0f9175a741bf7b19cd424230714d722198/tomli-2.2.1-cp313-cp313-win_amd64.whl", hash = "sha256:a38aa0308e754b0e3c67e344754dff64999ff9b513e691d0e786265c93583c69", size = 109383, upload-time = "2024-11-27T22:38:34.455Z" },
+    { url = "https://files.pythonhosted.org/packages/6e/c2/61d3e0f47e2b74ef40a68b9e6ad5984f6241a942f7cd3bbfbdbd03861ea9/tomli-2.2.1-py3-none-any.whl", hash = "sha256:cb55c73c5f4408779d0cf3eef9f762b9c9f147a77de7b258bef0a5628adc85cc", size = 14257, upload-time = "2024-11-27T22:38:35.385Z" },
+]
+
+[[package]]
+name = "toolz"
+version = "1.0.0"
+source = { registry = "https://pypi.jibson.com/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/8a/0b/d80dfa675bf592f636d1ea0b835eab4ec8df6e9415d8cfd766df54456123/toolz-1.0.0.tar.gz", hash = "sha256:2c86e3d9a04798ac556793bced838816296a2f085017664e4995cb40a1047a02", size = 66790, upload-time = "2024-10-04T16:17:04.001Z" }
+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 = "trove-classifiers"
 version = "2025.5.9.12"
@@ -556,6 +627,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/6b/11/cc635220681e93a0183390e26485430ca2c7b5f9d33b15c74c2861cb8091/urllib3-2.4.0-py3-none-any.whl", hash = "sha256:4e16665048960a0900c702d4a66415956a584919c03361cac9f1df5c5dd7e813", size = 128680, upload-time = "2025-04-10T15:23:37.377Z" },
 ]
 
+[[package]]
+name = "wcwidth"
+version = "0.2.13"
+source = { registry = "https://pypi.jibson.com/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/6c/63/53559446a878410fc5a5974feb13d31d78d752eb18aeba59c7fef1af7598/wcwidth-0.2.13.tar.gz", hash = "sha256:72ea0c06399eb286d978fdedb6923a9eb47e1c486ce63e9b4e64fc18303972b5", size = 101301, upload-time = "2024-01-06T02:10:57.829Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/fd/84/fd2ba7aafacbad3c4201d395674fc6348826569da3c0937e75505ead3528/wcwidth-0.2.13-py2.py3-none-any.whl", hash = "sha256:3da69048e4540d84af32131829ff948f1e022c1c6bdb8d6102117aac784f6859", size = 34166, upload-time = "2024-01-06T02:10:55.763Z" },
+]
+
 [[package]]
 name = "xdg-base-dirs"
 version = "6.0.2"