Merge branch 'dev' into 'master'
Bugfix release v1.0.4 Closes #26 See merge request atom/AtOM!30
This commit is contained in:
commit
3a6c7bfc9c
@ -20,8 +20,8 @@ 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 |
|
||||
| 1-High | Opus | Same | 128 | Same | Yes | No | 101G |
|
||||
| 2-Medium | Opus | Same | 64 | Same | Yes | No | 59G |
|
||||
|
||||
8
atom
8
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 =
|
||||
|
||||
@ -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 )
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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[@]}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user