From 17aadcf0d412bff43f70b7a181ecce0a23748ff5 Mon Sep 17 00:00:00 2001 From: TheSiahxyz <164138827+TheSiahxyz@users.noreply.github.com> Date: Wed, 1 Jul 2026 15:52:27 +0900 Subject: feat(qndl-artist): add apply subcommand (relocate + album_artist tag) --- ar/.local/bin/qndl-artist | 35 +++++++++++++++++++++++++++++++++ ar/.local/bin/tests/test-qndl-artist.sh | 17 ++++++++++++++++ 2 files changed, 52 insertions(+) (limited to 'ar/.local') diff --git a/ar/.local/bin/qndl-artist b/ar/.local/bin/qndl-artist index d442c56..c79a966 100755 --- a/ar/.local/bin/qndl-artist +++ b/ar/.local/bin/qndl-artist @@ -20,9 +20,44 @@ cmd_normalize() { printf '%s\n' "$_name" } +# mp3 1개를 표준 폴더로 이동(필요시) + album_artist 설정. +cmd_apply() { + _fp="$1"; _canon="$2" + [ -f "$_fp" ] || { printf 'apply: no such file: %s\n' "$_fp" >&2; return 1; } + case "$_fp" in + "$MUSIC"/*) : ;; + *) printf 'apply: not under %s: %s\n' "$MUSIC" "$_fp" >&2; return 1 ;; + esac + _rel="${_fp#"$MUSIC"/}" + _artist_seg="${_rel%%/*}" + _subpath="${_rel#*/}" # album/.../title.mp3 + if [ "$_artist_seg" != "$_canon" ]; then + _destdir="$MUSIC/$_canon/$(dirname "$_subpath")" + _dest="$_destdir/$(basename "$_fp")" + if [ -e "$_dest" ]; then + printf 'apply: skip (exists): %s\n' "$_dest" >&2 + return 0 + fi + mkdir -p "$_destdir" + mv "$_fp" "$_dest" || return 1 + # 빈 원본 앨범/아티스트 폴더 정리 + rmdir -p "$MUSIC/$_artist_seg/$(dirname "$_subpath")" 2>/dev/null || true + _fp="$_dest" + fi + _tmp="$(dirname "$_fp")/.qndl-tag-$$.mp3" + if ffmpeg -v error -y -i "$_fp" -map 0 -c copy -metadata album_artist="$_canon" "$_tmp" 2>/dev/null; then + mv "$_tmp" "$_fp" + else + rm -f "$_tmp" + printf 'apply: tag failed: %s\n' "$_fp" >&2 + return 1 + fi +} + _sub="${1:-}" [ $# -gt 0 ] && shift case "$_sub" in normalize) cmd_normalize "$@" ;; +apply) cmd_apply "$@" ;; *) printf 'usage: qndl-artist {normalize|apply|apply-download|merge} ...\n' >&2; exit 2 ;; esac diff --git a/ar/.local/bin/tests/test-qndl-artist.sh b/ar/.local/bin/tests/test-qndl-artist.sh index ea5a03a..cd83568 100644 --- a/ar/.local/bin/tests/test-qndl-artist.sh +++ b/ar/.local/bin/tests/test-qndl-artist.sh @@ -7,6 +7,10 @@ pass() { printf 'ok - %s\n' "$1"; } fail() { printf 'FAIL - %s\n expected: [%s]\n actual: [%s]\n' "$1" "$2" "$3"; FAIL=1; } eq() { if [ "$2" = "$3" ]; then pass "$1"; else fail "$1" "$2" "$3"; fi } +# 1초 무음 mp3 생성 (실제 파일이어야 ffmpeg 재태그 가능) +mkmp3() { mkdir -p "$(dirname "$1")"; ffmpeg -v error -y -f lavfi -i anullsrc=r=44100:cl=mono -t 1 -q:a 9 "$1"; } +tag_of() { ffprobe -v error -show_entries format_tags="$2" -of default=noprint_wrappers=1:nokey=1 "$1"; } + # --- fixtures --- TMP="$(mktemp -d)" trap 'rm -rf "$TMP"' EXIT @@ -22,4 +26,17 @@ eq "normalize: case fallback" "Epik High" "$("$BIN" normalize 'EPIK HIGH')" eq "normalize: unknown as-is" "NewArtist" "$("$BIN" normalize 'NewArtist')" eq "normalize: map beats folder" "Bar" "$("$BIN" normalize 'Foo')" +# --- apply --- +mkmp3 "$XDG_MUSIC_DIR/4MEN/Album1/song.mp3" +"$BIN" apply "$XDG_MUSIC_DIR/4MEN/Album1/song.mp3" "4Men" +eq "apply: moved to canonical dir" "yes" "$([ -f "$XDG_MUSIC_DIR/4Men/Album1/song.mp3" ] && echo yes || echo no)" +eq "apply: source pruned" "no" "$([ -d "$XDG_MUSIC_DIR/4MEN" ] && echo yes || echo no)" +eq "apply: album_artist set" "4Men" "$(tag_of "$XDG_MUSIC_DIR/4Men/Album1/song.mp3" album_artist)" + +# 대상에 동일 파일명 존재 → 이동 건너뜀 +mkmp3 "$XDG_MUSIC_DIR/DUPE/Al/x.mp3" +mkmp3 "$XDG_MUSIC_DIR/Dupe/Al/x.mp3" +"$BIN" apply "$XDG_MUSIC_DIR/DUPE/Al/x.mp3" "Dupe" 2>/dev/null +eq "apply: conflict keeps source" "yes" "$([ -f "$XDG_MUSIC_DIR/DUPE/Al/x.mp3" ] && echo yes || echo no)" + exit $FAIL -- cgit v1.2.3