backpack-backcrack 0.2.0__tar.gz → 0.3.0__tar.gz

{backpack_backcrack-0.2.0 → backpack_backcrack-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: backpack-backcrack
-Version: 0.2.0
+Version: 0.3.0
 Summary: CD/DVD/Blu-ray rip pipeline - MakeMKV/HandBrake for video, cdparanoia for audio, dynamic %token% library patterning.
 License: MIT
 Project-URL: Homepage, https://github.com/RedEraRrow/backcrack
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: backpack-backbone<0.3,>=0.2
+Requires-Dist: backpack-backbone<0.4,>=0.3.2
 Dynamic: license-file
 
 # backcrack
@@ -29,15 +29,27 @@ Python, stdlib only apart from `backbone`, the library the back* tools share
 
 ## Install
 
-macOS only (it drives the drives through diskutil and drutil):
+macOS only (it drives the drives through diskutil and drutil). Starting from
+nothing:
+
+    # Homebrew, if you don't have it yet (it asks for your password)
+    /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+    # put brew on your PATH, now and in new windows (Apple Silicon; does
+    # nothing on an Intel Mac)
+    echo 'eval "$(/opt/homebrew/bin/brew shellenv 2>/dev/null)"' >> ~/.zprofile
+    eval "$(/opt/homebrew/bin/brew shellenv 2>/dev/null)"
 
     brew install pipx
+    pipx ensurepath             # then open a new terminal window
     pipx install backpack-backcrack
     backcrack doctor
 
+macOS's own `python3` is too old (3.9); pipx from Homebrew brings a current
+one. `pipx ensurepath` puts `backcrack` on your PATH for new terminal windows.
+
 `backcrack doctor` lists the rippers and encoders it drives, found or how to
 install each. For everything: `brew install --cask makemkv` and
-`brew install handbrake cdparanoia flac cd-discid`. Paths it can't find
+`brew install handbrake libcdio-paranoia flac`. Paths it can't find
 itself go in `settings.env` (`MKVCON`, `HBCLI`, …).
 
 Every tool is a subcommand of the one command, `backcrack` (`backcrack
@@ -87,15 +99,21 @@ Check progress any time:
     backcrack watch      # live view
 
 In `watch`, `q` quits (and offers to stop ripd, encd and sortd with it) and
-`s` opens the settings screen - see [Settings](#settings). Both keys, and those of every
-list, can be changed under Key bindings on that screen.
+`s` opens the settings screen - see [Settings](#settings). `?` shows or hides
+the keys along the bottom. The keys, and those of every list, can be changed
+under Key bindings on that screen.
+
+Each part of `watch` is in its own box: the overview, what's ripping, what's
+encoding, and the latest rip events. In a short window the boxes that matter
+least give up their room first (Recent, then the overview, then Encoding);
+too small for any box, it asks for a bigger window.
 
 ## What it detects
 
 - **DVD / Blu-ray** - MakeMKV rips each title to a lossless MKV, HandBrake
   encodes the ones matching a configured duration class - see
   `DURATION_CLASSES` below.
-- **Audio CD** - cdparanoia extracts each track losslessly
+- **Audio CD** - cd-paranoia extracts each track losslessly
   (`track01.cdda.wav`...), then each is compressed to `AUDIO_FORMAT` (flac
   by default) as `track01.flac`...
 
@@ -104,8 +122,8 @@ Both land in the same shape: `source/` (lossless rip) and `encoded/`
 than the main window.
 
 A video disc is known by its volume label. An audio CD has no useful label,
-so it is named `AudioCD-<n>tracks-<id>`, where the id is cd-discid's disc id
-(or, without cd-discid, a hash of cdparanoia's track table). That name is
+so it is named `AudioCD-<n>tracks-<id>`, where the id is the freedb disc id worked
+out from its track table. That name is
 what shows in the log and in `UNSORTED/`, and what a `labels.map` line for
 the CD has to use.
 
@@ -184,7 +202,7 @@ you see combing, set `DEINTERLACE_ARGS` to HandBrake's deinterlace flags,
 e.g. `DEINTERLACE_ARGS=--comb-detect --decomb`. Leave it empty for
 progressive sources.
 
-For audio, `cdparanoia -Q -d <device>` lists a disc's tracks directly if you
+For audio, `cd-paranoia -Q -d <device>` lists a disc's tracks directly if you
 want to sanity-check before ripping.
 
 ## Encoding throughput
@@ -251,17 +269,20 @@ Each setting is read, in order, from an environment variable, then
 `backcrack/config.py`. So a one-off `LIBRARY=... ripd` overrides
 everything, and `settings.env` holds what you want every time.
 
-`s` in `watch` opens a settings screen over most of them and writes your
-changes to `settings.env`. The tool paths below aren't on it; set those in
+`s` in `watch` opens the Settings screen: most of them, in sections, each
+with its value beside it. Enter changes one (space flips an on/off one), and
+it's saved to `settings.env` at once. A number or a duration class that
+can't be read isn't taken. The tool paths below aren't on it; set those in
 `settings.env` or the environment. The daemons read their settings at
-startup, so restart `ripd`, `encd` or `sortd` to pick a change up.
+startup, so after a change the screen says which running ones to restart.
 
 The ones not covered elsewhere in this README:
 
 | Setting | Default | What it does |
 |---|---|---|
-| `MKVCON`, `HBCLI`, `CDPARANOIA`, `CD_DISCID`, `FLAC`, `FFMPEG` | found on PATH (MakeMKV at `/Applications/MakeMKV.app`) | tool paths |
+| `MKVCON`, `HBCLI`, `CDPARANOIA`, `FLAC`, `FFMPEG` | found on PATH (MakeMKV at `/Applications/MakeMKV.app`) | tool paths |
 | `NOTIFY_ENCODES` | `0` | also push when a disc finishes encoding |
+| `DEBUG` | `0` | the diagnostics log, `backcrack.log` in your config directory: what failed quietly (a MusicBrainz lookup, a HandBrake scan, a crashed rip) and why |
 | `ACCENT` | `green` | the accent colour: `green`, `red`, `yellow`, `blue`, `magenta`, `cyan` (your terminal's own), `amber`, `coral`, `rose`, `lavender`, `sky`, `mint`, or `#RRGGBB` |
 | `WATCH_INTERVAL` | `1` | seconds between `watch` refreshes |
 | `SORT_INTERVAL` | `5` | seconds between `sortd` passes |
@@ -293,7 +314,7 @@ The directory is `$BACKCRACK_CONFIG_DIR` if set, else
 first run. Point `BACKCRACK_CONFIG_DIR` somewhere else to keep separate sets
 of overrides for separate shelves.
 
-The same screen has an entry for adding a `labels.map` line, which is the
+The same screen has Add a labels.map line…, which is the
 manual escape hatch for a disc whose %tokens% couldn't be resolved - pick it
 out of `UNSORTED/`, fill in the tokens the active pattern needs, and `sortd`
 files it within a few seconds.
@@ -339,16 +360,15 @@ names). With another pattern or other folder names, don't use it.
 
 - **MakeMKV** (`makemkvcon`) - for DVD/Blu-ray. `brew install --cask makemkv`.
 - **HandBrakeCLI** - to encode video. `brew install handbrake`.
-- **cdparanoia** - for audio CDs. `brew install cdparanoia`.
+- **cd-paranoia** - for audio CDs: ripping, and the track table that names
+  each CD and looks up its artist and album. `brew install libcdio-paranoia`
+  (or `cdparanoia` from your Linux package manager).
 - **flac** (or ffmpeg) - to compress ripped audio. `brew install flac`.
   With neither, tracks are copied to `encoded/` as `.wav`.
-- **cd-discid** - optional, for automatic artist/album lookup on audio CDs.
-  `brew install cd-discid`. Without it, every CD goes to `UNSORTED/` until
-  you add a `labels.map` line.
 
 `backcrack doctor` checks all of them. A missing tool also gets a warning at
-startup rather than a silent failure: `ripd` warns about makemkvcon,
-cdparanoia and cd-discid, and `encd` about HandBrakeCLI and flac/ffmpeg. The
+startup rather than a silent failure: `ripd` warns about makemkvcon and
+cd-paranoia, and `encd` about HandBrakeCLI and flac/ffmpeg. The
 daemon still runs; that disc kind just won't rip or encode until the tool is
 installed.
 

{backpack_backcrack-0.2.0 → backpack_backcrack-0.3.0}/README.md

@@ -10,15 +10,27 @@ Python, stdlib only apart from `backbone`, the library the back* tools share
 
 ## Install
 
-macOS only (it drives the drives through diskutil and drutil):
+macOS only (it drives the drives through diskutil and drutil). Starting from
+nothing:
+
+    # Homebrew, if you don't have it yet (it asks for your password)
+    /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+    # put brew on your PATH, now and in new windows (Apple Silicon; does
+    # nothing on an Intel Mac)
+    echo 'eval "$(/opt/homebrew/bin/brew shellenv 2>/dev/null)"' >> ~/.zprofile
+    eval "$(/opt/homebrew/bin/brew shellenv 2>/dev/null)"
 
     brew install pipx
+    pipx ensurepath             # then open a new terminal window
     pipx install backpack-backcrack
     backcrack doctor
 
+macOS's own `python3` is too old (3.9); pipx from Homebrew brings a current
+one. `pipx ensurepath` puts `backcrack` on your PATH for new terminal windows.
+
 `backcrack doctor` lists the rippers and encoders it drives, found or how to
 install each. For everything: `brew install --cask makemkv` and
-`brew install handbrake cdparanoia flac cd-discid`. Paths it can't find
+`brew install handbrake libcdio-paranoia flac`. Paths it can't find
 itself go in `settings.env` (`MKVCON`, `HBCLI`, …).
 
 Every tool is a subcommand of the one command, `backcrack` (`backcrack
@@ -68,15 +80,21 @@ Check progress any time:
     backcrack watch      # live view
 
 In `watch`, `q` quits (and offers to stop ripd, encd and sortd with it) and
-`s` opens the settings screen - see [Settings](#settings). Both keys, and those of every
-list, can be changed under Key bindings on that screen.
+`s` opens the settings screen - see [Settings](#settings). `?` shows or hides
+the keys along the bottom. The keys, and those of every list, can be changed
+under Key bindings on that screen.
+
+Each part of `watch` is in its own box: the overview, what's ripping, what's
+encoding, and the latest rip events. In a short window the boxes that matter
+least give up their room first (Recent, then the overview, then Encoding);
+too small for any box, it asks for a bigger window.
 
 ## What it detects
 
 - **DVD / Blu-ray** - MakeMKV rips each title to a lossless MKV, HandBrake
   encodes the ones matching a configured duration class - see
   `DURATION_CLASSES` below.
-- **Audio CD** - cdparanoia extracts each track losslessly
+- **Audio CD** - cd-paranoia extracts each track losslessly
   (`track01.cdda.wav`...), then each is compressed to `AUDIO_FORMAT` (flac
   by default) as `track01.flac`...
 
@@ -85,8 +103,8 @@ Both land in the same shape: `source/` (lossless rip) and `encoded/`
 than the main window.
 
 A video disc is known by its volume label. An audio CD has no useful label,
-so it is named `AudioCD-<n>tracks-<id>`, where the id is cd-discid's disc id
-(or, without cd-discid, a hash of cdparanoia's track table). That name is
+so it is named `AudioCD-<n>tracks-<id>`, where the id is the freedb disc id worked
+out from its track table. That name is
 what shows in the log and in `UNSORTED/`, and what a `labels.map` line for
 the CD has to use.
 
@@ -165,7 +183,7 @@ you see combing, set `DEINTERLACE_ARGS` to HandBrake's deinterlace flags,
 e.g. `DEINTERLACE_ARGS=--comb-detect --decomb`. Leave it empty for
 progressive sources.
 
-For audio, `cdparanoia -Q -d <device>` lists a disc's tracks directly if you
+For audio, `cd-paranoia -Q -d <device>` lists a disc's tracks directly if you
 want to sanity-check before ripping.
 
 ## Encoding throughput
@@ -232,17 +250,20 @@ Each setting is read, in order, from an environment variable, then
 `backcrack/config.py`. So a one-off `LIBRARY=... ripd` overrides
 everything, and `settings.env` holds what you want every time.
 
-`s` in `watch` opens a settings screen over most of them and writes your
-changes to `settings.env`. The tool paths below aren't on it; set those in
+`s` in `watch` opens the Settings screen: most of them, in sections, each
+with its value beside it. Enter changes one (space flips an on/off one), and
+it's saved to `settings.env` at once. A number or a duration class that
+can't be read isn't taken. The tool paths below aren't on it; set those in
 `settings.env` or the environment. The daemons read their settings at
-startup, so restart `ripd`, `encd` or `sortd` to pick a change up.
+startup, so after a change the screen says which running ones to restart.
 
 The ones not covered elsewhere in this README:
 
 | Setting | Default | What it does |
 |---|---|---|
-| `MKVCON`, `HBCLI`, `CDPARANOIA`, `CD_DISCID`, `FLAC`, `FFMPEG` | found on PATH (MakeMKV at `/Applications/MakeMKV.app`) | tool paths |
+| `MKVCON`, `HBCLI`, `CDPARANOIA`, `FLAC`, `FFMPEG` | found on PATH (MakeMKV at `/Applications/MakeMKV.app`) | tool paths |
 | `NOTIFY_ENCODES` | `0` | also push when a disc finishes encoding |
+| `DEBUG` | `0` | the diagnostics log, `backcrack.log` in your config directory: what failed quietly (a MusicBrainz lookup, a HandBrake scan, a crashed rip) and why |
 | `ACCENT` | `green` | the accent colour: `green`, `red`, `yellow`, `blue`, `magenta`, `cyan` (your terminal's own), `amber`, `coral`, `rose`, `lavender`, `sky`, `mint`, or `#RRGGBB` |
 | `WATCH_INTERVAL` | `1` | seconds between `watch` refreshes |
 | `SORT_INTERVAL` | `5` | seconds between `sortd` passes |
@@ -274,7 +295,7 @@ The directory is `$BACKCRACK_CONFIG_DIR` if set, else
 first run. Point `BACKCRACK_CONFIG_DIR` somewhere else to keep separate sets
 of overrides for separate shelves.
 
-The same screen has an entry for adding a `labels.map` line, which is the
+The same screen has Add a labels.map line…, which is the
 manual escape hatch for a disc whose %tokens% couldn't be resolved - pick it
 out of `UNSORTED/`, fill in the tokens the active pattern needs, and `sortd`
 files it within a few seconds.
@@ -320,16 +341,15 @@ names). With another pattern or other folder names, don't use it.
 
 - **MakeMKV** (`makemkvcon`) - for DVD/Blu-ray. `brew install --cask makemkv`.
 - **HandBrakeCLI** - to encode video. `brew install handbrake`.
-- **cdparanoia** - for audio CDs. `brew install cdparanoia`.
+- **cd-paranoia** - for audio CDs: ripping, and the track table that names
+  each CD and looks up its artist and album. `brew install libcdio-paranoia`
+  (or `cdparanoia` from your Linux package manager).
 - **flac** (or ffmpeg) - to compress ripped audio. `brew install flac`.
   With neither, tracks are copied to `encoded/` as `.wav`.
-- **cd-discid** - optional, for automatic artist/album lookup on audio CDs.
-  `brew install cd-discid`. Without it, every CD goes to `UNSORTED/` until
-  you add a `labels.map` line.
 
 `backcrack doctor` checks all of them. A missing tool also gets a warning at
-startup rather than a silent failure: `ripd` warns about makemkvcon,
-cdparanoia and cd-discid, and `encd` about HandBrakeCLI and flac/ffmpeg. The
+startup rather than a silent failure: `ripd` warns about makemkvcon and
+cd-paranoia, and `encd` about HandBrakeCLI and flac/ffmpeg. The
 daemon still runs; that disc kind just won't rip or encode until the tool is
 installed.
 

{backpack_backcrack-0.2.0 → backpack_backcrack-0.3.0}/backcrack/common.py

@@ -3,6 +3,7 @@ import json
 import subprocess
 
 from backbone.files import log_line
+from backbone.log import log as diag
 from backbone.notify import ntfy
 from backbone.procs import find_processes, spawn_module, stop_processes
 
@@ -71,15 +72,18 @@ def hb_json(input_path: str) -> dict:
             [cfg.HBCLI, "-i", input_path, "--title", "0", "--scan", "--json"],
             capture_output=True, text=True, timeout=120,
         ).stdout
-    except (OSError, subprocess.TimeoutExpired):
+    except (OSError, subprocess.TimeoutExpired) as e:
+        diag.warning("HandBrake scan of %s failed: %s", input_path, e)
         return {}
     marker = "JSON Title Set:"
     idx = out.find(marker)
     if idx < 0:
+        diag.warning("HandBrake scan of %s gave no title set", input_path)
         return {}
     try:
         return json.loads(out[idx + len(marker):])
-    except json.JSONDecodeError:
+    except json.JSONDecodeError as e:
+        diag.warning("HandBrake scan of %s: unreadable JSON: %s", input_path, e)
         return {}
 
 

{backpack_backcrack-0.2.0 → backpack_backcrack-0.3.0}/backcrack/config.py

@@ -26,8 +26,8 @@ def _default_config_dir() -> Path:
 CONFIG_DIR = Path(os.getenv("BACKCRACK_CONFIG_DIR") or _default_config_dir())
 CONFIG_DIR.mkdir(parents=True, exist_ok=True)
 
-# backbone keeps the key bindings, the hints switch and its log here too.
-from backbone import app as _app  # noqa: E402
+# backbone keeps the key bindings, the hints switch and its diagnostics log here too.
+from backbone import app as _app, log as _log  # noqa: E402
 _app.configure("backcrack", CONFIG_DIR)
 
 # Settings changed from `backcrack watch`'s settings screen land here rather
@@ -65,7 +65,7 @@ def save_setting(name: str, value: str) -> None:
     """Persist one setting to SETTINGS_FILE, replacing its line if already
     present. Only processes started afterwards see it (ripd/encd need
     restarting); a caller that wants it in its own running `cfg` has to set
-    that too (see watch.py).
+    that too (see settings.py).
     """
     lines = SETTINGS_FILE.read_text().splitlines() if SETTINGS_FILE.exists() else []
     out, found = [], False
@@ -125,8 +125,7 @@ LIBRARY = Path(_env("LIBRARY", str(Path.home() / "Media" / "rips"))).expanduser(
 MKVCON = _env("MKVCON", _env("MKV", shutil.which("makemkvcon")
                                    or "/Applications/MakeMKV.app/Contents/MacOS/makemkvcon"))
 HBCLI = _env("HBCLI", shutil.which("HandBrakeCLI") or "/opt/homebrew/bin/HandBrakeCLI")
-CDPARANOIA = _env("CDPARANOIA", shutil.which("cdparanoia") or "")
-CD_DISCID = _env("CD_DISCID", shutil.which("cd-discid") or "")
+CDPARANOIA = _env("CDPARANOIA", shutil.which("cd-paranoia") or shutil.which("cdparanoia") or "")
 FLAC = _env("FLAC", shutil.which("flac") or "")
 FFMPEG = _env("FFMPEG", shutil.which("ffmpeg") or "")
 
@@ -224,39 +223,16 @@ PATTERN_AUDIO = _env("PATTERN_AUDIO", "%artist%/%album%")
 # on. A failed disc is deliberately left in the drive so it retries itself.
 MAX_RETRIES = _env_int("MAX_RETRIES", 3)
 
-# ---- settings exposed to `backcrack watch`'s settings screen -------------
-# (env var, type, one-line label). Add a tuple here for any setting above
-# that should be editable there - type is "str", "int", "bool", or "path".
-# Nothing else in the pipeline reads this list; it's UI metadata only.
-SETTINGS = [
-    ("LIBRARY", "path", "Library root"),
-    ("RIP_MODE", "str", "Rip mode (titles / video_ts)"),
-    ("DURATION_CLASSES", "str", "Duration classes (name:min-max:folder:quality[:dedup],...)"),
-    ("ENCODE_JOBS", "int", "Concurrent encode jobs"),
-    ("VIDEO_ENCODER", "str", "HandBrake video encoder"),
-    ("ENCODER_PRESET", "str", "HandBrake encoder preset"),
-    ("ENCODE_THREADS", "int", "Threads per encode job"),
-    ("DEINTERLACE_ARGS", "str", "Deinterlace args (blank = off)"),
-    ("AUDIO_FORMAT", "str", "Audio rip format"),
-    ("PATTERN_VIDEO", "str", "Video destination pattern"),
-    ("PATTERN_AUDIO", "str", "Audio destination pattern"),
-    ("MAX_RETRIES", "int", "Max retries before giving up on a disc"),
-    ("NOTIFY_ENCODES", "bool", "Notify on encode complete"),
-    ("LAUNCH_RIPD", "bool", "Bare `backcrack` also launches ripd"),
-    ("LAUNCH_ENCD", "bool", "Bare `backcrack` also launches encd"),
-    ("LAUNCH_SORTD", "bool", "Bare `backcrack` also launches sortd"),
-    ("LAUNCH_WATCH", "bool", "Bare `backcrack` also launches watch"),
-    ("MIN_TITLE_S", "int", "Shortest title MakeMKV rips (seconds)"),
-    ("NTFY_TOPIC", "str", "ntfy topic (blank = no pushes)"),
-    ("NTFY_SERVER", "str", "ntfy server"),
-    ("ACCENT", "accent", "Accent colour (green, red, blue, amber… or #RRGGBB)"),
-]
-
 # The accent colour of every screen (backbone.ui.ACCENT_PRESETS key or
 # "#RRGGBB"), applied here once so each tool gets it by importing config.
 ACCENT = _env("ACCENT", "green")
 _ui.set_accent(ACCENT)
 
+# backbone's diagnostics log, CONFIG_DIR/backcrack.log: what failed quietly
+# (a lookup, a scan, a crashed rip thread) and why. Every process writes it.
+DEBUG = _env("DEBUG", "0") == "1"
+_log.configure(DEBUG)
+
 # Derived. Don't edit.
 # Your files, in CONFIG_DIR (see the top of this file): manual disc->token
 # overrides, and the per-season episode titles namer.py renames from.

{backpack_backcrack-0.2.0 → backpack_backcrack-0.3.0}/backcrack/deps.py

@@ -21,12 +21,10 @@ def deps() -> list[Dep]:
         Dep("HandBrake", _path(cfg.HBCLI), "encoding video", hints={
             "macos": "brew install handbrake", "debian": "sudo apt install handbrake-cli",
             "other": "https://handbrake.fr/downloads2.php"}),
-        Dep("cdparanoia", _path(cfg.CDPARANOIA), "ripping audio CDs", hints={
-            "macos": "brew install cdparanoia", "debian": "sudo apt install cdparanoia"}),
+        Dep("cd-paranoia", _path(cfg.CDPARANOIA), "ripping and looking up audio CDs", hints={
+            "macos": "brew install libcdio-paranoia", "debian": "sudo apt install cdparanoia"}),
         Dep("flac", _path(cfg.FLAC), "encoding CD audio", hints={
             "macos": "brew install flac", "debian": "sudo apt install flac"}),
-        Dep("cd-discid", _path(cfg.CD_DISCID), "looking up CDs", hints={
-            "macos": "brew install cd-discid", "debian": "sudo apt install cd-discid"}),
         Dep("ffmpeg", _path(cfg.FFMPEG), "audio formats other than FLAC", hints={
             "macos": "brew install ffmpeg", "debian": "sudo apt install ffmpeg"}),
     ]
@@ -36,4 +34,4 @@ def doctor() -> None:
     """backcrack doctor: every tool it drives, found or how to install it."""
     from backbone.deps import report_lines
     print("\n".join(report_lines(deps())))
-    print("Paths can be set in settings.env (MKVCON, HBCLI, CDPARANOIA, FLAC, CD_DISCID, FFMPEG).")
+    print("Paths can be set in settings.env (MKVCON, HBCLI, CDPARANOIA, FLAC, FFMPEG).")

{backpack_backcrack-0.2.0 → backpack_backcrack-0.3.0}/backcrack/disc.py

@@ -8,11 +8,14 @@ import subprocess
 import time
 from pathlib import Path
 
+from backbone.log import log as diag
+
 from backcrack import config as cfg
 
 
-# Optical drive speeds are quoted in multiples of DVD 1x.
+# Optical drive speeds are quoted in multiples of 1x for that kind of disc.
 DVD_1X_BPS = 1_385_000
+CD_1X_BPS = 176_400
 
 
 def raw(dev: str) -> str:
@@ -68,41 +71,35 @@ def pending_discs():
         yield dev, "audio", Path(dev).name
 
 
-def cd_discid(rdev: str) -> list:
-    """cd-discid's fields for the CD in `rdev` (freedb id, track count,
-    offsets..., seconds), or [] if it isn't installed or can't read it."""
-    if not cfg.CD_DISCID:
-        return []
-    try:
-        return subprocess.run([cfg.CD_DISCID, rdev], capture_output=True, text=True, timeout=15).stdout.split()
-    except (OSError, subprocess.TimeoutExpired):
-        return []
-
-
 def cd_toc(rdev: str):
     """The CD's table of contents as MusicBrainz wants it: (first track, last
-    track, lead-out, [track offsets]) in sectors, or None. Uses cd-discid's
-    exact --musicbrainz output; an older cd-discid only gives the length in
-    whole seconds, so the lead-out is then approximate (MusicBrainz's toc
-    lookup still finds near matches)."""
-    if not cfg.CD_DISCID:
+    track, lead-out, [track offsets]) in sectors from the disc's start, or
+    None. Read from cd-paranoia's track list, which counts from track 1's
+    pregap, hence the 150. Audio tracks only, so on an enhanced CD the
+    lead-out is the last audio track's end (MusicBrainz's toc lookup still
+    finds the near match)."""
+    if not cfg.CDPARANOIA:
         return None
     try:
-        out = subprocess.run([cfg.CD_DISCID, "--musicbrainz", rdev], capture_output=True, text=True, timeout=15).stdout.split()
-    except (OSError, subprocess.TimeoutExpired):
-        out = []
-    nums = [int(x) for x in out if x.isdigit()]
-    if len(nums) >= 3 and nums[0] == len(nums) - 2:          # count, offsets..., lead-out
-        return 1, nums[0], nums[-1], nums[1:-1]
-    fields = cd_discid(rdev)                                 # freedb: id, count, offsets..., seconds
-    if len(fields) < 3 or not fields[1].isdigit():
+        out = subprocess.run([cfg.CDPARANOIA, "-Q", "-d", rdev], capture_output=True, text=True, timeout=30).stderr
+    except (OSError, subprocess.TimeoutExpired) as e:
+        diag.warning("cd-paranoia -Q on %s failed: %s", rdev, e)
         return None
-    n = int(fields[1])
-    try:
-        offsets = [int(x) for x in fields[2:2 + n]]
-        return 1, n, int(fields[2 + n]) * 75, offsets
-    except (ValueError, IndexError):
+    # "  1.    16503 [03:40.03]        0 [00:00.00]    no   no  2": number, length, begin
+    tracks = [(int(m[1]), int(m[2]), int(m[3]))
+              for m in re.finditer(r"^\s*(\d+)\.\s+(\d+)\s+\[[^]]*\]\s+(\d+)", out, re.M)]
+    if not tracks:
+        diag.warning("cd-paranoia -Q on %s listed no tracks: %s", rdev, out.strip()[-300:])
         return None
+    first, last = tracks[0][0], tracks[-1][0]
+    return first, last, tracks[-1][2] + tracks[-1][1] + 150, [begin + 150 for _, _, begin in tracks]
+
+
+def freedb_id(toc) -> str:
+    """The freedb (CDDB) disc id for a toc, as cd-discid printed it."""
+    _, _, leadout, offsets = toc
+    digits = sum(sum(map(int, str(o // 75))) for o in offsets)
+    return f"{(digits % 255) << 24 | (leadout // 75 - offsets[0] // 75) << 8 | len(offsets):08x}"
 
 
 def musicbrainz_discid(toc) -> str:
@@ -116,26 +113,22 @@ def musicbrainz_discid(toc) -> str:
     return digest.translate(str.maketrans("+/=", "._-"))
 
 
-def audio_label(rdev: str):
-    """A name for the CD in `rdev` that stays the same whichever drive it is
-    in: "AudioCD-<n>tracks-<id>". The id is cd-discid's, or a hash of
-    cdparanoia's track table when cd-discid isn't installed. None if
-    neither can read the disc.
-    """
-    fields = cd_discid(rdev)
-    if len(fields) >= 2 and fields[1].isdigit():
-        return f"AudioCD-{fields[1]}tracks-{fields[0]}"
-    if not cfg.CDPARANOIA:
-        return None
-    try:
-        toc = subprocess.run([cfg.CDPARANOIA, "-Q", "-d", rdev], capture_output=True, text=True, timeout=30).stderr
-    except (OSError, subprocess.TimeoutExpired):
-        return None
-    tracks = [line.split() for line in toc.splitlines() if re.match(r"^\s*\d+\.\s+\d+", line)]
-    if not tracks:
-        return None
-    digest = hashlib.sha1(" ".join(t[1] for t in tracks).encode()).hexdigest()[:8]
-    return f"AudioCD-{len(tracks)}tracks-{digest}"
+def audio_label(toc) -> str:
+    """A name for a CD that stays the same whichever drive it is in."""
+    return f"AudioCD-{len(toc[3])}tracks-{freedb_id(toc)}"
+
+
+# Holds audio_bytes() for a rip in progress, in its folder, for watch's
+# progress bar: cd-paranoia runs inside the folder rather than naming it, so
+# watch can't match the rip to its drive the way it does for MakeMKV.
+DISC_BYTES_FILE = ".disc-bytes"
+
+
+def audio_bytes(toc) -> int:
+    """What ripping every track to WAV comes to: 2352 bytes a sector, plus
+    each file's 44-byte header."""
+    _, _, leadout, offsets = toc
+    return (leadout - offsets[0]) * 2352 + 44 * len(offsets)
 
 
 _DRV_RE = re.compile(r'^DRV:(\d+),2,\d+,\d+,"([^"]*)","([^"]*)","([^"]*)"')
@@ -147,7 +140,8 @@ def mkv_drives(timeout: int = 60) -> list:
     try:
         out = subprocess.run([cfg.MKVCON, "-r", "--cache=1", "info", "disc:9999"],
                              capture_output=True, text=True, timeout=timeout).stdout
-    except (OSError, subprocess.TimeoutExpired):
+    except (OSError, subprocess.TimeoutExpired) as e:
+        diag.warning("makemkvcon drive listing failed: %s", e)
         return []
     return [m.groups() for m in map(_DRV_RE.match, out.splitlines()) if m]
 

{backpack_backcrack-0.2.0 → backpack_backcrack-0.3.0}/backcrack/encode.py

@@ -159,7 +159,7 @@ def process_audio_job(label: str, dest: Path) -> None:
     jobs = []
     ext = audio_ext()
     for f in sorted(src.glob("*.wav")):
-        # cdparanoia -B names tracks track01.cdda.wav
+        # cd-paranoia -B names tracks track01.cdda.wav
         out = dest / "encoded" / f"{f.stem.removesuffix('.cdda')}.{ext}"
         if out.exists() and out.stat().st_size > 0:
             n_skip += 1

{backpack_backcrack-0.2.0 → backpack_backcrack-0.3.0}/backcrack/pattern.py

@@ -7,6 +7,8 @@ import urllib.request
 from pathlib import Path
 from typing import Optional
 
+from backbone.log import log as diag
+
 from backcrack import config as cfg
 from backcrack import disc
 
@@ -93,8 +95,8 @@ def auto_audio_tokens(dev: Optional[str]) -> Optional[dict]:
     toc = disc.cd_toc(dev) if dev else None
     if not toc:
         return None
-    # The MusicBrainz disc id (cd-discid's own id is freedb's, which MusicBrainz
-    # doesn't know), plus the toc so a near match is found when there's no exact one.
+    # The MusicBrainz disc id (the label's freedb id is one MusicBrainz doesn't
+    # know), plus the toc so a near match is found when there's no exact one.
     toc_param = "+".join(str(n) for n in (toc[0], toc[1], toc[2], *toc[3]))
     try:
         req = urllib.request.Request(
@@ -104,10 +106,12 @@ def auto_audio_tokens(dev: Optional[str]) -> Optional[dict]:
         )
         with urllib.request.urlopen(req, timeout=10) as resp:
             data = json.loads(resp.read())
-    except Exception:
+    except Exception as e:
+        diag.warning("MusicBrainz lookup for %s failed: %s: %s", dev, type(e).__name__, e)
         return None
     releases = data.get("releases") or []
     if not releases:
+        diag.info("MusicBrainz has no release for disc id %s", disc.musicbrainz_discid(toc))
         return None
     release = releases[0]
     artist_credit = release.get("artist-credit") or []

{backpack_backcrack-0.2.0 → backpack_backcrack-0.3.0}/backcrack/rip.py

@@ -139,6 +139,7 @@ def mark_unsorted_kind(dest: Path, kind: str) -> None:
 
 
 def finish_rip(label: str, dest: Path, cdev: str, ok: bool, mins: int, kind: str) -> None:
+    (dest / disc.DISC_BYTES_FILE).unlink(missing_ok=True)
     kb = dir_size_kb(dest)
     gb = human_gb(kb)
     rel = str(dest.relative_to(cfg.LIBRARY))
@@ -243,7 +244,9 @@ def rip_audio_disc(dev: str, label: str) -> None:
     # is only the device name there, so name the CD itself now this thread
     # holds the drive.
     cdev, rdev = dev, disc.raw(dev)
-    label = disc.audio_label(rdev) or label
+    toc = disc.cd_toc(rdev)
+    if toc:
+        label = disc.audio_label(toc)
     if already_handled(label, cdev):
         return
 
@@ -256,6 +259,8 @@ def rip_audio_disc(dev: str, label: str) -> None:
     mark_unsorted_kind(dest, "audio")
 
     nsrc = dest / "source"; nsrc.mkdir(parents=True, exist_ok=True)
+    if toc:
+        (dest / disc.DISC_BYTES_FILE).write_text(f"{disc.audio_bytes(toc)}\n")
     t0 = time.monotonic()
     rc = subprocess.run(
         [cfg.CDPARANOIA, "-d", rdev, "-B", "1-"], cwd=nsrc, capture_output=True, timeout=None,

{backpack_backcrack-0.2.0 → backpack_backcrack-0.3.0}/backcrack/ripd.py

@@ -10,6 +10,8 @@ import os
 import time
 from pathlib import Path
 
+from backbone.log import log as diag
+
 from backcrack import config as cfg
 from backcrack import disc
 from backcrack.rip import rip_video_disc, rip_audio_disc
@@ -40,9 +42,7 @@ def main() -> None:
     if not Path(cfg.MKVCON).exists():
         print(f"WARNING: makemkvcon not found at {cfg.MKVCON} - video discs will fail. See `backcrack doctor`.")
     if not cfg.CDPARANOIA:
-        print("WARNING: cdparanoia not found - audio CDs will fail. See `backcrack doctor`.")
-    if not cfg.CD_DISCID:
-        print("WARNING: cd-discid not found - audio CDs will go to UNSORTED/. See `backcrack doctor`.")
+        print("WARNING: cd-paranoia not found - audio CDs will fail. See `backcrack doctor`.")
     if not cfg.NTFY_TOPIC:
         print("WARNING: NTFY_TOPIC is not set (env var or settings.env) - no pushes will be sent.")
 
@@ -68,6 +68,9 @@ def main() -> None:
                 def _run(dev=dev, label=label, target=target, lock=lock):
                     try:
                         target(dev, label)
+                    except Exception:
+                        diag.exception("rip of %s in %s crashed", label, dev)
+                        raise
                     finally:
                         lock.unlink(missing_ok=True)