diff options
Diffstat (limited to 'ar/.local/bin')
| -rwxr-xr-x | ar/.local/bin/qndl-artist | 42 | ||||
| -rw-r--r-- | ar/.local/bin/tests/test-qndl-artist.sh | 19 |
2 files changed, 52 insertions, 9 deletions
diff --git a/ar/.local/bin/qndl-artist b/ar/.local/bin/qndl-artist index 3ef8bbb..56dff45 100755 --- a/ar/.local/bin/qndl-artist +++ b/ar/.local/bin/qndl-artist @@ -6,12 +6,22 @@ MUSIC="${XDG_MUSIC_DIR:-$HOME/Music}" ALIASES="${QNDL_ALIASES:-${XDG_DOTFILES_DIR:-$HOME/.dotfiles}/global/Music/artist-aliases.tsv}" PLAYLIST="${QNDL_MPD_PLAYLIST:-$HOME/.config/mpd/playlists/entire.m3u}" -# 이름 → 표준명. 맵 정확일치 → 기존 폴더 대소문자무시 매칭 → 원본. +# 이름 → 표준명. 맵 정확일치(연쇄 추적) → 기존 폴더 대소문자무시 매칭 → 원본. cmd_normalize() { _name="$1" if [ -f "$ALIASES" ]; then - _c="$(awk -F'\t' -v n="$_name" '/^#/ || NF < 2 { next } $1 == n { print $2; exit }' "$ALIASES")" - [ -n "$_c" ] && { printf '%s\n' "$_c"; return 0; } + _cur="$_name"; _hops=0 + while [ "$_hops" -lt 20 ]; do + _next="$(awk -F'\t' -v n="$_cur" '/^#/ || NF < 2 { next } $1 == n { print $2; exit }' "$ALIASES")" + [ -z "$_next" ] && break + [ "$_next" = "$_cur" ] && break + _cur="$_next" + _hops=$((_hops + 1)) + done + if [ "$_cur" != "$_name" ]; then + printf '%s\n' "$_cur" + return 0 + fi fi if [ -d "$MUSIC" ]; then _m="$(find "$MUSIC" -mindepth 1 -maxdepth 1 -type d -printf '%f\n' 2>/dev/null | @@ -42,6 +52,10 @@ cmd_apply() { "$MUSIC"/*) : ;; *) printf 'apply: not under %s: %s\n' "$MUSIC" "$_fp" >&2; return 1 ;; esac + case "$_fp" in + *.mp3) : ;; + *) return 0 ;; # mp3 아니면 무시 + esac _rel="${_fp#"$MUSIC"/}" _artist_seg="${_rel%%/*}" _subpath="${_rel#*/}" # album/.../title.mp3 @@ -59,14 +73,16 @@ cmd_apply() { rmdir "$MUSIC/$_artist_seg" 2>/dev/null || true _fp="$_dest" fi + # 태깅은 best-effort: 실패해도 이미 이동은 성공했으므로 전체 실패로 취급하지 않음. _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" || { rm -f "$_tmp"; return 1; } + if ffmpeg -v error -y -i "$_fp" -map 0 -c copy -metadata album_artist="$_canon" "$_tmp" 2>/dev/null && + mv "$_tmp" "$_fp"; then + : else rm -f "$_tmp" - printf 'apply: tag failed: %s\n' "$_fp" >&2 - return 1 + printf 'apply: tag failed (file kept): %s\n' "$_fp" >&2 fi + return 0 } # MUSIC의 모든 아티스트 폴더를 <name>\t<mp3수>로 출력. @@ -163,6 +179,18 @@ cmd_merge_apply() { find "$MUSIC/$_mem" -type f -name '*.mp3' 2>/dev/null | while IFS= read -r _f; do cmd_apply "$_f" "$_canon" || printf 'x\n' >> "$_failtmp" done + # mp3 외 잔여 파일(cover.jpg 등)도 정경 폴더로 이동해 variant 폴더가 완전히 비워지게 함. + # (cmd_apply를 거치지 않는 단순 mv: 재태깅 대상이 아님) + find "$MUSIC/$_mem" -type f ! -name '*.mp3' 2>/dev/null | while IFS= read -r _f; do + _relsub="${_f#"$MUSIC/$_mem"/}" + _destf="$MUSIC/$_canon/$_relsub" + if [ -e "$_destf" ]; then + printf 'merge: skip residue (exists): %s\n' "$_destf" >&2 + continue + fi + mkdir -p "$(dirname "$_destf")" + mv "$_f" "$_destf" 2>/dev/null || true + done find "$MUSIC/$_mem" -type d -empty -delete 2>/dev/null || true _map_add "$_mem" "$_canon" IFS="$(printf '\t')" diff --git a/ar/.local/bin/tests/test-qndl-artist.sh b/ar/.local/bin/tests/test-qndl-artist.sh index e842907..870d08b 100644 --- a/ar/.local/bin/tests/test-qndl-artist.sh +++ b/ar/.local/bin/tests/test-qndl-artist.sh @@ -33,6 +33,12 @@ 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')" +# --- normalize: 연쇄(transitive) 해석 (Fix 2) --- +printf 'A\tB\nB\tC\n' >> "$QNDL_ALIASES" +eq "normalize: transitive chain" "C" "$("$BIN" normalize 'A')" +printf 'X\tX\n' >> "$QNDL_ALIASES" +eq "normalize: self-loop safe" "X" "$("$BIN" normalize 'X')" + # --- apply --- mkmp3 "$XDG_MUSIC_DIR/4MEN/Album1/song.mp3" "$BIN" apply "$XDG_MUSIC_DIR/4MEN/Album1/song.mp3" "4Men" @@ -47,7 +53,7 @@ mkmp3 "$XDG_MUSIC_DIR/Dupe/Al/x.mp3" eq "apply: conflict keeps source" "yes" "$([ -f "$XDG_MUSIC_DIR/DUPE/Al/x.mp3" ] && echo yes || echo no)" # regression: 프루닝이 MUSIC 루트를 삭제하지 않음 -SOLO="$(mktemp -d)/Music"; mkdir -p "$SOLO" +SOLO="$TMP/solo/Music"; mkdir -p "$SOLO" ( export XDG_MUSIC_DIR="$SOLO"; mkmp3 "$SOLO/Solo/Al/s.mp3"; "$BIN" apply "$SOLO/Solo/Al/s.mp3" "SoloCanon" ) eq "apply: prune keeps MUSIC root" "yes" "$([ -d "$SOLO" ] && echo yes || echo no)" @@ -59,7 +65,7 @@ eq "apply-download: unified via map" "yes" "$([ -f "$XDG_MUSIC_DIR/4Men/Later/y. eq "apply-download: album_artist" "4Men" "$(tag_of "$XDG_MUSIC_DIR/4Men/Later/y.mp3" album_artist)" # --- merge dry-run --- -MTMP="$(mktemp -d)"; export XDG_MUSIC_DIR="$MTMP/Music"; export QNDL_ALIASES="$MTMP/aliases.tsv" +MTMP="$TMP/mtmp"; mkdir -p "$MTMP"; export XDG_MUSIC_DIR="$MTMP/Music"; export QNDL_ALIASES="$MTMP/aliases.tsv" : > "$QNDL_ALIASES" # 대소문자 그룹 (4Men 이 파일 더 많음 → 표준) mkmp3 "$XDG_MUSIC_DIR/4MEN/A/a.mp3" @@ -88,4 +94,13 @@ eq "apply: 맵 기록" "yes" "$(awk -F'\t' '$1=="4MEN" && $2=="4Men"{p eq "apply: idempotent 재실행" "No case/paren duplicate groups found." "$("$BIN" merge)" eq "apply: mpd 재인덱스는 격리된 플레이리스트로" "yes" "$([ -s "$QNDL_MPD_PLAYLIST" ] && echo yes || echo no)" +# --- merge --apply: mp3 외 잔여 파일(cover.jpg 등)까지 이동해 variant 폴더가 완전히 사라짐 (Fix 3) --- +mkmp3 "$XDG_MUSIC_DIR/ZEDDY/A/song.mp3" +mkmp3 "$XDG_MUSIC_DIR/Zeddy/A/a.mp3"; mkmp3 "$XDG_MUSIC_DIR/Zeddy/A/b.mp3" +printf x > "$XDG_MUSIC_DIR/ZEDDY/A/cover.jpg" +"$BIN" merge --apply >/dev/null 2>&1 +eq "merge --apply: variant 폴더 완전히 사라짐" "no" "$([ -d "$XDG_MUSIC_DIR/ZEDDY" ] && echo yes || echo no)" +eq "merge --apply: cover.jpg가 표준 폴더로 이동" "yes" "$([ -f "$XDG_MUSIC_DIR/Zeddy/A/cover.jpg" ] && echo yes || echo no)" +eq "merge --apply: 잔여 이동 후 idempotent" "No case/paren duplicate groups found." "$("$BIN" merge)" + exit $FAIL |