From b61dddcd6754d92b264c062a22fe6e071089a3cb Mon Sep 17 00:00:00 2001 From: ScriptFanix Date: Tue, 29 Apr 2025 23:54:59 +0200 Subject: [PATCH 1/5] Edit README.md --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 07f8304..d6e5a43 100644 --- a/README.md +++ b/README.md @@ -20,13 +20,13 @@ in the same format, it will want a constant sample-rate and bitrate. You can have AtOM do that! Here's what I have for my tests: -| Directory | Format | Frequency | Bitrate | Channels | FAT32 compat. | ASCII | Size | -| --------- | ------ | --------- | ------- | -------- | ------------- | ----- | ---- | -| 0-Full | Mixed | Mixed | Mixed | Mixed | No | No | 508G | -| 1-High | Opus | Same | 128 | Same | Yes | No | 101G | -| 2-Medium | Opus | Same | 64 | Same | Yes | No | 59G | -| 3-Small | Opus | Same | 32 | Same | Yes | No | 30G | -| 4-MP3 | MP3 | 44100 | 128 | 2 | Yes | Yes | 114G | +| Directory | Format | Sample rate | Bitrate | Channels | FAT32 compat. | ASCII | Size | +| --------- | ------ | ----------- | ------- | -------- | ------------- | ----- | ---- | +| 0-Full | Mixed | Mixed | Mixed | Mixed | No | No | 508G | +| 1-High | Opus | Same | 128 | Same | Yes | No | 101G | +| 2-Medium | Opus | Same | 64 | Same | Yes | No | 59G | +| 3-Small | Opus | Same | 32 | Same | Yes | No | 30G | +| 4-MP3 | MP3 | 44100 | 128 | 2 | Yes | Yes | 114G | From 0ea0dbe09d59703a2b468a9c96185a148eebc1aa Mon Sep 17 00:00:00 2001 From: Vincent Riquer Date: Wed, 30 Apr 2025 02:41:29 +0200 Subject: [PATCH 2/5] getInfos::guess skeleton --- lib/tags/getInfos::guess | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 lib/tags/getInfos::guess diff --git a/lib/tags/getInfos::guess b/lib/tags/getInfos::guess new file mode 100644 index 0000000..45a0499 --- /dev/null +++ b/lib/tags/getInfos::guess @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +getInfosGuess_version='guess-1' +tagreaders+=( "$getInfosGuess_version" ) +getInfos::Guess() { + tagreader="$getInfosGuess_version" + local \ + infos \ + + : #FIXME +} From 1df976bcaeb0e1b3b77603e09445d72ab70a4f86 Mon Sep 17 00:00:00 2001 From: ScriptFanix Date: Wed, 30 Apr 2025 02:45:37 +0200 Subject: [PATCH 3/5] Revert "getInfos::guess skeleton" This reverts commit 0ea0dbe09d59703a2b468a9c96185a148eebc1aa --- lib/tags/getInfos::guess | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 lib/tags/getInfos::guess diff --git a/lib/tags/getInfos::guess b/lib/tags/getInfos::guess deleted file mode 100644 index 45a0499..0000000 --- a/lib/tags/getInfos::guess +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -getInfosGuess_version='guess-1' -tagreaders+=( "$getInfosGuess_version" ) -getInfos::Guess() { - tagreader="$getInfosGuess_version" - local \ - infos \ - - : #FIXME -} From 1d7a09fcff46ce09195b6223b00f14c2767b13fd Mon Sep 17 00:00:00 2001 From: Vincent Riquer Date: Thu, 7 Aug 2025 15:11:17 +0200 Subject: [PATCH 4/5] quickfix: replace calls to `date` with builtin `printf` or $EPOCHSECONDS --- atom | 8 ++++---- lib/files/getFiles | 2 +- toys/createindex | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/atom b/atom index c9d32e9..445277b 100755 --- a/atom +++ b/atom @@ -555,16 +555,16 @@ echo "Created ${count:-0} tasks for $filecount files ${togo:+($togo left) }(${co concurrency=$(( maxload / 2 )) (( concurrency )) || concurrency=1 active=0 -concurrencychange=$(date +%s) +concurrencychange=$EPOCHSECONDS starttime=$concurrencychange taskcount=$count remaining=$taskcount failed=0 echo 'BEGIN TRANSACTION;' >&3 -committime=$(date +%s) +committime=$EPOCHSECONDS while (( (remaining || ${#workers[@]}) && ! quit )) do - timestamp=$(date +%s) + timestamp=$EPOCHSECONDS if (( $timestamp - committime >= 60 )) then echo $'COMMIT;\nBEGIN TRANSACTION;' >&3 @@ -673,7 +673,7 @@ done echo 'COMMIT;' >&3 unset count -endtime=$(date +%s) +endtime=$EPOCHSECONDS (( elapsedseconds = endtime - starttime - pausedtime )) (( days = diff --git a/lib/files/getFiles b/lib/files/getFiles index 8e9daf5..f6c28db 100644 --- a/lib/files/getFiles +++ b/lib/files/getFiles @@ -1,6 +1,6 @@ #!/bin/bash getFiles() { - scantime=$(date +%s) + scantime=$EPOCHSECONDS for prune_expression in "${skippeddirectories[@]}" do prunes+=( -path "$sourcepath$prune_expression" -prune -o ) diff --git a/toys/createindex b/toys/createindex index 3959755..33413dd 100755 --- a/toys/createindex +++ b/toys/createindex @@ -287,12 +287,12 @@ cat <<-EOBrag # # $0 $args # - # Last database update: $(date -d @$lastupdate +'%x %X') + # Last database update: $(printf "%(%x %X)T" "$lastupdate") EOBrag printDate() { - date -d"@$1" +"${timeformat:-%x %X}" + printf "%("${timeformat:-%x %X}")T "$1" } for index in ${!show[@]} From a0756b170c124a9191787138433fc507a6a18968 Mon Sep 17 00:00:00 2001 From: ScriptFanix Date: Sat, 11 Oct 2025 22:23:16 +0200 Subject: [PATCH 5/5] Resolve "ffmpeg tags are always NULL" --- lib/tags/getInfos::ffmpeg | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/tags/getInfos::ffmpeg b/lib/tags/getInfos::ffmpeg index ce7a301..f98709d 100644 --- a/lib/tags/getInfos::ffmpeg +++ b/lib/tags/getInfos::ffmpeg @@ -1,5 +1,5 @@ #!/usr/bin/env bash -getInfosffmpeg_version='ffmpeg-8' +getInfosffmpeg_version='ffmpeg-9' tagreaders+=( "$getInfosffmpeg_version" ) getInfos::ffmpeg() { tagreader="$getInfosffmpeg_version" @@ -27,27 +27,27 @@ getInfos::ffmpeg() { :stream= \ bit_rate, \ channels, \ - sample_fmt \ sample_rate, \ " \ -of default=noprint_wrappers=1 \ - -i "$sourcepath/$filename" + -i "$sourcepath/$filename" \ + | egrep -v '=N/A$' ) - albumartist=$(gettag album_artist) - album=$(gettag album) - artist=$(gettag artist) - composer=$(gettag composer) - disc=$(gettag disc) - genre=$(gettag genre) - performer=$(gettag TOPE) - releasecountry=$(gettag releasecountry) + albumartist=$(gettag TAG:album_artist) + album=$(gettag TAG:album) + artist=$(gettag TAG:artist) + composer=$(gettag TAG:composer) + disc=$(gettag TAG:disc) + genre=$(gettag TAG:genre) + performer=$(gettag TAG:TOPE) + releasecountry=$(gettag TAG:releasecountry) [[ -z "$releasecountry" ]] \ - && releasecountry=$(gettag "MusicBrainz Album Release Country") - replaygain_alb=$(gettag replaygain_album_gain) - replaygain_trk=$(gettag replaygain_track_gain) - title=$(gettag title) - tracknum=$(gettag track) - year=$(gettag date) + && releasecountry=$(gettag "TAG:MusicBrainz Album Release Country") + replaygain_alb=$(gettag TAG:replaygain_album_gain) + replaygain_trk=$(gettag TAG:replaygain_track_gain) + title=$(gettag TAG:title) + tracknum=$(gettag TAG:track) + year=$(gettag TAG:date) expr='^[0-9]*$' if [ -n "$genre" ] && [[ $genre =~ $expr ]] then