Merge branch 'dev' into 'master'

v1.0.4 last minute fixes

See merge request atom/AtOM!32

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 |
+| Directory | Format | Sample rate | Bitrate | Channels | FAT32 compat. | ASCII | Size |
-| --------- | ------ | --------- | ------- | -------- | ------------- | ----- | ---- |
+| --------- | ------ | ----------- | ------- | -------- | ------------- | ----- | ---- |
-| 0-Full    | Mixed  | Mixed     | Mixed   | Mixed    | No            | No    | 508G |
+| 0-Full    | Mixed  | Mixed       | Mixed   | Mixed    | No            | No    | 508G |
-| 1-High    | Opus   | Same      | 128     | Same     | Yes           | No    | 101G |
+| 1-High    | Opus   | Same        | 128     | Same     | Yes           | No    | 101G |
-| 2-Medium  | Opus   | Same      | 64      | Same     | Yes           | No    | 59G  |
+| 2-Medium  | Opus   | Same        | 64      | Same     | Yes           | No    | 59G  |
-| 3-Small   | Opus   | Same      | 32      | Same     | Yes           | No    | 30G  |
+| 3-Small   | Opus   | Same        | 32      | Same     | Yes           | No    | 30G  |
-| 4-MP3     | MP3    | 44100     | 128     | 2        | Yes           | Yes   | 114G |
+| 4-MP3     | MP3    | 44100       | 128     | 2        | Yes           | Yes   | 114G |
 
 
 

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 =

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 )

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)
+	albumartist=$(gettag TAG:album_artist)
-	album=$(gettag album)
+	album=$(gettag TAG:album)
-	artist=$(gettag artist)
+	artist=$(gettag TAG:artist)
-	composer=$(gettag composer)
+	composer=$(gettag TAG:composer)
-	disc=$(gettag disc)
+	disc=$(gettag TAG:disc)
-	genre=$(gettag genre)
+	genre=$(gettag TAG:genre)
-	performer=$(gettag TOPE)
+	performer=$(gettag TAG:TOPE)
-	releasecountry=$(gettag releasecountry)
+	releasecountry=$(gettag TAG:releasecountry)
 	[[ -z "$releasecountry" ]]					\
-	&& releasecountry=$(gettag "MusicBrainz Album Release Country")
+	&& releasecountry=$(gettag "TAG:MusicBrainz Album Release Country")
-	replaygain_alb=$(gettag replaygain_album_gain)
+	replaygain_alb=$(gettag TAG:replaygain_album_gain)
-	replaygain_trk=$(gettag replaygain_track_gain)
+	replaygain_trk=$(gettag TAG:replaygain_track_gain)
-	title=$(gettag title)
+	title=$(gettag TAG:title)
-	tracknum=$(gettag track)
+	tracknum=$(gettag TAG:track)
-	year=$(gettag date)
+	year=$(gettag TAG:date)
 	expr='^[0-9]*$'
 	if [ -n "$genre" ] && [[ $genre =~ $expr ]]
 	then

lib/tags/update

@@ -105,7 +105,7 @@ echo '
 		oldbitrate=${rest%%::AtOM:SQL:Sep::*}
 		((++count))
 		(( cron )) || echo -en "\rTags: $((count*100/filecount))%"
-		if (( count % 1000 == 0 ))
+		if (( count % 100 == 0 ))
 		then
 			echo 'COMMIT;BEGIN TRANSACTION;' >&3
 			(( debug ))					\

toys/createindex

@@ -38,7 +38,7 @@ LC_ALL=C
 
 shopt -s extglob
 
-source ./share/id3genres
+source "$SHAREDIR"/id3genres
 
 for function in "$LIBDIR"/*/*
 do
@@ -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[@]}