Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 71fa64a960 | |||
| 09167e44c7 | |||
| 508eecd0bd | |||
| 577fe1f7a7 | |||
| 826428f380 | |||
| 4ad5b8a574 |
@@ -2,6 +2,7 @@ __pycache__/
|
||||
*.pyc
|
||||
.env
|
||||
.venv/
|
||||
*.egg-info/
|
||||
reports/
|
||||
*.sqlite
|
||||
*.db
|
||||
@@ -11,3 +12,6 @@ reports/
|
||||
# Never commit personal Serato data
|
||||
database V2
|
||||
*.crate
|
||||
|
||||
# macOS
|
||||
.DS_Store
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
# Contributing
|
||||
|
||||
## Branching
|
||||
|
||||
- `main` is stable.
|
||||
- `develop` is the integration branch.
|
||||
- Feature branches use: `feature/<name>`.
|
||||
|
||||
## Safety Rules
|
||||
|
||||
Never commit personal music library files, Serato databases, or crates.
|
||||
|
||||
Never write repair code without dry-run mode, backup plan, and rollback log.
|
||||
|
||||
## Testing
|
||||
|
||||
Install development dependencies with `python3 -m pip install -e '.[dev]'`.
|
||||
|
||||
Run `pytest` before committing. Tests and fixtures must use synthetic library data.
|
||||
+48
@@ -0,0 +1,48 @@
|
||||
# Serato Doctor Roadmap
|
||||
|
||||
## v0.1 — Library Inspector
|
||||
|
||||
- [x] Project repository
|
||||
- [x] Filesystem scanner
|
||||
- [x] Serato crate parser
|
||||
- [x] Missing reference CSV report
|
||||
- [x] Grouped missing reference report
|
||||
- [ ] HTML health dashboard
|
||||
- [x] Test suite
|
||||
- [ ] Sample library fixtures
|
||||
- [ ] Database V2 read-only parser
|
||||
|
||||
## v0.2 — Diagnostics
|
||||
|
||||
- [ ] Duplicate filename detection
|
||||
- [ ] Duplicate audio hash detection
|
||||
- [ ] Broken symlink detection
|
||||
- [ ] Orphaned audio detection
|
||||
- [ ] OneDrive rename detection
|
||||
- [ ] Crate classification: static vs smart/dynamic
|
||||
- [ ] Library health score
|
||||
|
||||
## v0.3 — Safe Repair
|
||||
|
||||
- [ ] Dry-run repair plan
|
||||
- [ ] Backup before repair
|
||||
- [ ] Compatibility symlink creation
|
||||
- [ ] Compatibility copy creation
|
||||
- [ ] Rename repair
|
||||
- [ ] Rollback log
|
||||
|
||||
## v0.4 — Migration Wizard
|
||||
|
||||
- [ ] Move library root
|
||||
- [ ] Cloud provider migration
|
||||
- [ ] External drive migration
|
||||
- [ ] Verify moved library
|
||||
- [ ] Update application references
|
||||
|
||||
## v1.0 — DJ Library Doctor
|
||||
|
||||
- [ ] Desktop UI
|
||||
- [ ] Serato support
|
||||
- [ ] Rekordbox support
|
||||
- [ ] VirtualDJ support
|
||||
- [ ] Engine DJ support
|
||||
@@ -0,0 +1,11 @@
|
||||
# Architecture
|
||||
|
||||
Serato Doctor is designed as a DJ library inspection, repair, and migration platform.
|
||||
|
||||
## Design Principles
|
||||
|
||||
1. Read-only by default.
|
||||
2. Every repair must support preview/dry-run.
|
||||
3. Every repair must create a backup or rollback path.
|
||||
4. Application-specific logic lives in engines.
|
||||
5. Core matching and scanning logic should be application-agnostic.
|
||||
@@ -0,0 +1,26 @@
|
||||
# Case Study: OneDrive Mac Migration
|
||||
|
||||
## Scenario
|
||||
|
||||
A large Serato DJ library was migrated from an older Mac to a newer Mac using OneDrive.
|
||||
|
||||
## Symptoms
|
||||
|
||||
- OneDrive client stuck syncing
|
||||
- Duplicate OneDrive folders
|
||||
- Thousands of files renamed with trailing ` 2`
|
||||
- Serato reported many tracks as missing
|
||||
- Some files existed on disk but still appeared orange in Serato
|
||||
|
||||
## Findings
|
||||
|
||||
- OneDrive sync state was rebuilt successfully
|
||||
- Thousands of orphaned filename conflicts were repaired
|
||||
- Some Serato references were stale database objects, not missing files
|
||||
- Smart/dynamic crates should be classified separately from static user crates
|
||||
|
||||
## Lessons
|
||||
|
||||
- Filesystem health and Serato database health are separate problems
|
||||
- Smart crates should not be treated the same as static crates
|
||||
- Repair tools must be read-only by default and generate a plan before changing anything
|
||||
@@ -0,0 +1,24 @@
|
||||
# Test Foundation
|
||||
|
||||
## Problem
|
||||
|
||||
The crate parser handles unusual binary text and known extension artifacts. Without
|
||||
automated tests, a small refactor could silently change library counts or reports.
|
||||
|
||||
## Architecture
|
||||
|
||||
Tests cover the read-only pipeline from crate and filesystem inputs through the
|
||||
core library model to CSV, text, and CLI output. All test data is synthetic and is
|
||||
created in temporary directories.
|
||||
|
||||
## Edge Cases
|
||||
|
||||
- Known MP3, M4A, WAV, and AIF decode artifacts.
|
||||
- Crate records without a recognized stop marker.
|
||||
- Supported extensions with mixed case and unsupported files.
|
||||
- References that exist by filename and references that remain missing.
|
||||
|
||||
## Verification
|
||||
|
||||
Run `pytest`. No test reads a real Serato library or writes outside pytest's
|
||||
temporary directory.
|
||||
@@ -0,0 +1,22 @@
|
||||
[build-system]
|
||||
requires = ["setuptools>=61"]
|
||||
build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "serato-doctor"
|
||||
version = "0.1.0"
|
||||
description = "Inspect, diagnose, repair, and migrate DJ libraries."
|
||||
requires-python = ">=3.9"
|
||||
dependencies = []
|
||||
|
||||
[project.optional-dependencies]
|
||||
dev = ["pytest>=8,<9"]
|
||||
|
||||
[project.scripts]
|
||||
serato-doctor = "serato_doctor.cli:main"
|
||||
|
||||
[tool.pytest.ini_options]
|
||||
testpaths = ["tests"]
|
||||
|
||||
[tool.setuptools.packages.find]
|
||||
include = ["serato_doctor*"]
|
||||
+11
-19
@@ -2,6 +2,7 @@ from pathlib import Path
|
||||
import argparse
|
||||
|
||||
from serato_doctor.crate_parser import parse_crates
|
||||
from serato_doctor.models.library import Library
|
||||
from serato_doctor.scanner import scan_audio
|
||||
from serato_doctor.report import write_csv, write_missing_report
|
||||
|
||||
@@ -19,27 +20,18 @@ def main():
|
||||
out = Path(args.out)
|
||||
report = Path(args.report)
|
||||
|
||||
refs = parse_crates(serato / "Subcrates")
|
||||
disk = scan_audio(music)
|
||||
library = Library.build(
|
||||
references=parse_crates(serato / "Subcrates"),
|
||||
tracks=scan_audio(music),
|
||||
)
|
||||
results = library.reconcile_by_filename()
|
||||
missing_count = sum(1 for result in results if not result.exists_by_filename)
|
||||
|
||||
disk_names = {t.filename for t in disk}
|
||||
write_csv(results, out)
|
||||
write_missing_report(results, report)
|
||||
|
||||
rows = []
|
||||
for ref in refs:
|
||||
rows.append({
|
||||
"crate": str(ref.source),
|
||||
"serato_path": str(ref.path),
|
||||
"filename": ref.filename,
|
||||
"exists_by_filename": ref.filename in disk_names,
|
||||
})
|
||||
|
||||
missing_count = sum(1 for r in rows if not r["exists_by_filename"])
|
||||
|
||||
write_csv(rows, out)
|
||||
write_missing_report(rows, report)
|
||||
|
||||
print(f"Crate references: {len(refs)}")
|
||||
print(f"Disk tracks: {len(disk)}")
|
||||
print(f"Crate references: {len(library.references)}")
|
||||
print(f"Disk tracks: {len(library.tracks)}")
|
||||
print(f"Missing by filename: {missing_count}")
|
||||
print(f"CSV: {out}")
|
||||
print(f"Report: {report}")
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
from pathlib import Path
|
||||
|
||||
from serato_doctor.models.crate import Crate
|
||||
from serato_doctor.models.reference import TrackReference
|
||||
|
||||
|
||||
def read_crate_text(crate_path: Path) -> str:
|
||||
return crate_path.read_bytes().decode("utf-16-le", errors="ignore").replace("\x00", "")
|
||||
|
||||
|
||||
def clean_path(raw: str) -> str:
|
||||
# Common Serato decode artifacts where final extension char gets merged.
|
||||
raw = raw.replace(".mp漳", ".mp3")
|
||||
raw = raw.replace(".MP漳", ".MP3")
|
||||
raw = raw.replace(".m4愠", ".m4a")
|
||||
raw = raw.replace(".M4愠", ".M4A")
|
||||
raw = raw.replace(".wa瘠", ".wav")
|
||||
raw = raw.replace(".WA瘠", ".WAV")
|
||||
raw = raw.replace(".ai映", ".aif")
|
||||
raw = raw.replace(".AI映", ".AIF")
|
||||
return raw.strip()
|
||||
|
||||
|
||||
def load_crate(crate_path: Path) -> Crate:
|
||||
text = read_crate_text(crate_path)
|
||||
refs = []
|
||||
|
||||
marker = "Users/djsplice/OneDrive/Jukebox/"
|
||||
|
||||
# Serato record markers seen after paths in UTF-16-LE decoded crate data.
|
||||
stop_markers = ["牴k", "otrk", "ptrk", "tvcn", "ovct"]
|
||||
|
||||
for part in text.split(marker)[1:]:
|
||||
candidate = marker + part
|
||||
|
||||
stops = [candidate.find(m) for m in stop_markers if candidate.find(m) != -1]
|
||||
if not stops:
|
||||
continue
|
||||
|
||||
raw_path = "/" + candidate[: min(stops)]
|
||||
raw_path = clean_path(raw_path)
|
||||
|
||||
path = Path(raw_path)
|
||||
refs.append(
|
||||
TrackReference(
|
||||
source=crate_path,
|
||||
path=path,
|
||||
filename=path.name,
|
||||
)
|
||||
)
|
||||
|
||||
return Crate(path=crate_path, references=tuple(refs))
|
||||
|
||||
|
||||
def parse_crate(crate_path: Path) -> list[TrackReference]:
|
||||
"""Parse references from one crate, preserving the prototype API."""
|
||||
|
||||
return list(load_crate(crate_path).references)
|
||||
|
||||
|
||||
def parse_crates(root: Path) -> list[TrackReference]:
|
||||
refs = []
|
||||
for crate in root.rglob("*.crate"):
|
||||
refs.extend(parse_crate(crate))
|
||||
return refs
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
from serato_doctor.models.crate import Crate
|
||||
from serato_doctor.models.library import Library
|
||||
from serato_doctor.models.reference import ReferenceResult, TrackReference
|
||||
from serato_doctor.models.track import DiskTrack
|
||||
|
||||
__all__ = ["Crate", "DiskTrack", "Library", "ReferenceResult", "TrackReference"]
|
||||
@@ -0,0 +1,13 @@
|
||||
from dataclasses import dataclass
|
||||
from pathlib import Path
|
||||
from typing import Tuple
|
||||
|
||||
from serato_doctor.models.reference import TrackReference
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class Crate:
|
||||
"""A Serato crate and the track references parsed from it."""
|
||||
|
||||
path: Path
|
||||
references: Tuple[TrackReference, ...]
|
||||
@@ -0,0 +1,31 @@
|
||||
from dataclasses import dataclass
|
||||
from typing import Iterable, Tuple
|
||||
|
||||
from serato_doctor.models.reference import ReferenceResult, TrackReference
|
||||
from serato_doctor.models.track import DiskTrack
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class Library:
|
||||
"""The read-only view of crate references and audio found on disk."""
|
||||
|
||||
references: Tuple[TrackReference, ...]
|
||||
tracks: Tuple[DiskTrack, ...]
|
||||
|
||||
@classmethod
|
||||
def build(
|
||||
cls,
|
||||
references: Iterable[TrackReference],
|
||||
tracks: Iterable[DiskTrack],
|
||||
) -> "Library":
|
||||
return cls(tuple(references), tuple(tracks))
|
||||
|
||||
def reconcile_by_filename(self) -> Tuple[ReferenceResult, ...]:
|
||||
disk_names = {track.filename for track in self.tracks}
|
||||
return tuple(
|
||||
ReferenceResult(
|
||||
reference=reference,
|
||||
exists_by_filename=reference.filename in disk_names,
|
||||
)
|
||||
for reference in self.references
|
||||
)
|
||||
@@ -0,0 +1,27 @@
|
||||
from dataclasses import dataclass
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class TrackReference:
|
||||
"""A track path referenced by a Serato crate."""
|
||||
|
||||
source: Path
|
||||
path: Path
|
||||
filename: str
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ReferenceResult:
|
||||
"""The filename-level reconciliation result for a crate reference."""
|
||||
|
||||
reference: TrackReference
|
||||
exists_by_filename: bool
|
||||
|
||||
def as_row(self) -> dict:
|
||||
return {
|
||||
"crate": str(self.reference.source),
|
||||
"serato_path": str(self.reference.path),
|
||||
"filename": self.reference.filename,
|
||||
"exists_by_filename": self.exists_by_filename,
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
from dataclasses import dataclass
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class DiskTrack:
|
||||
"""An audio file discovered on disk."""
|
||||
|
||||
path: Path
|
||||
filename: str
|
||||
size: int
|
||||
suffix: str
|
||||
@@ -1,9 +1,13 @@
|
||||
from collections import Counter, defaultdict
|
||||
from pathlib import Path
|
||||
from typing import Iterable
|
||||
import csv
|
||||
|
||||
from serato_doctor.models.reference import ReferenceResult
|
||||
|
||||
def write_missing_report(rows: list[dict], out: Path) -> None:
|
||||
|
||||
def write_missing_report(results: Iterable[ReferenceResult], out: Path) -> None:
|
||||
rows = [result.as_row() for result in results]
|
||||
missing = [r for r in rows if not r["exists_by_filename"]]
|
||||
|
||||
crate_counts = Counter(r["crate"] for r in missing)
|
||||
@@ -32,7 +36,8 @@ def write_missing_report(rows: list[dict], out: Path) -> None:
|
||||
f.write(f"- {name}\n")
|
||||
|
||||
|
||||
def write_csv(rows: list[dict], out: Path) -> None:
|
||||
def write_csv(results: Iterable[ReferenceResult], out: Path) -> None:
|
||||
rows = [result.as_row() for result in results]
|
||||
with out.open("w", newline="", encoding="utf-8") as f:
|
||||
writer = csv.DictWriter(
|
||||
f,
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
from pathlib import Path
|
||||
|
||||
from serato_doctor.models.track import DiskTrack
|
||||
|
||||
AUDIO_SUFFIXES = {".mp3", ".m4a", ".wav", ".aif", ".aiff", ".flac"}
|
||||
|
||||
|
||||
def scan_audio(folder: Path) -> list[DiskTrack]:
|
||||
tracks = []
|
||||
|
||||
for path in folder.rglob("*"):
|
||||
if not path.is_file():
|
||||
continue
|
||||
if path.suffix.lower() not in AUDIO_SUFFIXES:
|
||||
continue
|
||||
|
||||
try:
|
||||
stat = path.stat()
|
||||
except OSError:
|
||||
continue
|
||||
|
||||
tracks.append(
|
||||
DiskTrack(
|
||||
path=path,
|
||||
filename=path.name,
|
||||
size=stat.st_size,
|
||||
suffix=path.suffix.lower(),
|
||||
)
|
||||
)
|
||||
|
||||
return tracks
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
import csv
|
||||
import sys
|
||||
|
||||
from serato_doctor.cli import main
|
||||
|
||||
|
||||
def test_cli_writes_reports_and_prints_counts(tmp_path, monkeypatch, capsys):
|
||||
serato = tmp_path / "serato"
|
||||
subcrates = serato / "Subcrates"
|
||||
music = tmp_path / "music"
|
||||
subcrates.mkdir(parents=True)
|
||||
music.mkdir()
|
||||
|
||||
crate_text = (
|
||||
"Users/djsplice/OneDrive/Jukebox/Found.mp漳牴k"
|
||||
"Users/djsplice/OneDrive/Jukebox/Missing.mp漳牴k"
|
||||
)
|
||||
(subcrates / "Test.crate").write_bytes(crate_text.encode("utf-16-le"))
|
||||
(music / "Found.mp3").write_bytes(b"synthetic audio")
|
||||
csv_path = tmp_path / "scan.csv"
|
||||
report_path = tmp_path / "report.txt"
|
||||
monkeypatch.setattr(
|
||||
sys,
|
||||
"argv",
|
||||
[
|
||||
"serato-doctor",
|
||||
"--serato",
|
||||
str(serato),
|
||||
"--music",
|
||||
str(music),
|
||||
"--out",
|
||||
str(csv_path),
|
||||
"--report",
|
||||
str(report_path),
|
||||
],
|
||||
)
|
||||
|
||||
main()
|
||||
|
||||
output = capsys.readouterr().out
|
||||
assert "Crate references: 2" in output
|
||||
assert "Disk tracks: 1" in output
|
||||
assert "Missing by filename: 1" in output
|
||||
assert f"CSV: {csv_path}" in output
|
||||
assert f"Report: {report_path}" in output
|
||||
with csv_path.open(newline="", encoding="utf-8") as csv_file:
|
||||
rows = list(csv.DictReader(csv_file))
|
||||
assert [row["exists_by_filename"] for row in rows] == ["True", "False"]
|
||||
assert "Total missing references: 1" in report_path.read_text(encoding="utf-8")
|
||||
@@ -0,0 +1,47 @@
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
from serato_doctor.crate_parser import clean_path, load_crate, parse_crate
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
("artifact", "expected"),
|
||||
[
|
||||
("song.mp漳", "song.mp3"),
|
||||
("song.m4愠", "song.m4a"),
|
||||
("song.wa瘠", "song.wav"),
|
||||
("song.ai映", "song.aif"),
|
||||
],
|
||||
)
|
||||
def test_clean_path_repairs_known_extension_artifacts(artifact, expected):
|
||||
assert clean_path(artifact) == expected
|
||||
|
||||
|
||||
def test_parse_crate_extracts_references(tmp_path):
|
||||
crate_path = tmp_path / "House.crate"
|
||||
crate_text = (
|
||||
"header"
|
||||
"Users/djsplice/OneDrive/Jukebox/House/First.mp漳牴k"
|
||||
"metadata"
|
||||
"Users/djsplice/OneDrive/Jukebox/House/Second.m4愠otrk"
|
||||
)
|
||||
crate_path.write_bytes(crate_text.encode("utf-16-le"))
|
||||
|
||||
crate = load_crate(crate_path)
|
||||
|
||||
assert crate.path == crate_path
|
||||
assert [reference.filename for reference in crate.references] == [
|
||||
"First.mp3",
|
||||
"Second.m4a",
|
||||
]
|
||||
assert parse_crate(crate_path) == list(crate.references)
|
||||
|
||||
|
||||
def test_parse_crate_ignores_record_without_stop_marker(tmp_path):
|
||||
crate_path = Path(tmp_path) / "Incomplete.crate"
|
||||
crate_path.write_bytes(
|
||||
"Users/djsplice/OneDrive/Jukebox/House/Incomplete.mp3".encode("utf-16-le")
|
||||
)
|
||||
|
||||
assert parse_crate(crate_path) == []
|
||||
@@ -0,0 +1,24 @@
|
||||
from pathlib import Path
|
||||
|
||||
from serato_doctor.models.library import Library
|
||||
from serato_doctor.models.reference import TrackReference
|
||||
from serato_doctor.models.track import DiskTrack
|
||||
|
||||
|
||||
def test_library_reconciles_references_by_filename():
|
||||
crate = Path("House.crate")
|
||||
references = [
|
||||
TrackReference(crate, Path("/old/Found.mp3"), "Found.mp3"),
|
||||
TrackReference(crate, Path("/old/Missing.mp3"), "Missing.mp3"),
|
||||
]
|
||||
tracks = [DiskTrack(Path("/new/Found.mp3"), "Found.mp3", 10, ".mp3")]
|
||||
|
||||
results = Library.build(references, tracks).reconcile_by_filename()
|
||||
|
||||
assert [result.exists_by_filename for result in results] == [True, False]
|
||||
assert results[1].as_row() == {
|
||||
"crate": "House.crate",
|
||||
"serato_path": "/old/Missing.mp3",
|
||||
"filename": "Missing.mp3",
|
||||
"exists_by_filename": False,
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
from serato_doctor.scanner import scan_audio
|
||||
|
||||
|
||||
def test_scan_audio_finds_supported_files(tmp_path):
|
||||
music = tmp_path / "music"
|
||||
nested = music / "House"
|
||||
nested.mkdir(parents=True)
|
||||
(nested / "First.MP3").write_bytes(b"synthetic audio")
|
||||
(nested / "Second.flac").write_bytes(b"fixture")
|
||||
(nested / "notes.txt").write_text("not audio", encoding="utf-8")
|
||||
|
||||
tracks = scan_audio(music)
|
||||
|
||||
assert {track.filename for track in tracks} == {"First.MP3", "Second.flac"}
|
||||
first = next(track for track in tracks if track.filename == "First.MP3")
|
||||
assert first.suffix == ".mp3"
|
||||
assert first.size == len(b"synthetic audio")
|
||||
Reference in New Issue
Block a user