fabian/AAXtoMP3
1
0
Fork 0
mirror of https://github.com/KrumpetPirate/AAXtoMP3.git synced 2025-11-03 20:40:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set cover art not to be added if chaptered.

Browse Source 
Fixed an issue encountered if ffprobe returned 2 items.
Improved cleanup if audiblecli in use.
This commit is contained in:
Quietus
2022-03-23 22:11:38 +00:00
parent f65fddebc2
commit 1a45f94f3c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
AAXtoMP3
View File

@@ -288,7 +288,7 @@ fi
# ----- # -----
# Detect if we need mp4art for cover additions to m4a & m4b files. # Detect if we need mp4art for cover additions to m4a & m4b files.
if [[ "x${container}" == "xmp4" && "x$(type -P mp4art)" == "x" ]]; then if [[ "x${container}" == "xmp4" && "x$(type -P mp4art)" == "x" && ! "$mode" == "chaptered" ]]; then
echo "WARN mp4art was not found on your env PATH variable" echo "WARN mp4art was not found on your env PATH variable"
echo "Without it, this script will not be able to add cover art to" echo "Without it, this script will not be able to add cover art to"
echo "m4b files. Note if there are no other errors the AAXtoMP3 will" echo "m4b files. Note if there are no other errors the AAXtoMP3 will"
@@ -807,8 +807,8 @@ do
fi fi
extra_crop_cover='' extra_crop_cover=''
cover_width=$(ffprobe -i "${cover_file}" 2>&1 | $GREP -Po "[0-9]+(?=x[0-9]+)") cover_width=$(ffprobe -i "${cover_file}" 2>&1 | $GREP -Po "[0-9]+(?=x[0-9]+)" | tail -n 1)
if (( ${cover_width} % 2 == 1 )); then if [[ $(($cover_width % 2)) -eq 1 ]]; then
if [ "$((${loglevel} > 1))" == "1" ]; then if [ "$((${loglevel} > 1))" == "1" ]; then
log "Cover ${cover_file} has odd width ${cover_width}, setting extra_crop_cover to make even." log "Cover ${cover_file} has odd width ${cover_width}, setting extra_crop_cover to make even."
fi fi
@@ -967,7 +967,7 @@ do
fi fi
fi fi
if [ -f "${cover_file}" ]; then if [[ -f "${cover_file}" && ! "$mode" == "chaptered" ]]; then
log "Adding cover art" log "Adding cover art"
# FFMGEP does not support MPEG-4 containers fully # # FFMGEP does not support MPEG-4 containers fully #
if [ "${container}" == "mp4" ] ; then if [ "${container}" == "mp4" ] ; then
@@ -1009,6 +1009,14 @@ do
log "Moving Transcoded ${aax_file} to ${completedir}" log "Moving Transcoded ${aax_file} to ${completedir}"
fi fi
mv "${aax_file}" "${completedir}" mv "${aax_file}" "${completedir}"
if [[ ${audibleCli} -eq 1 ]]; then
if [ "$((${loglevel} > 0))" == "1" ]; then
log "Moving remaining audible files to ${completedir}"
fi
[[ -f "${aax_file%%-AAX_??_??.aaxc}_\((*)\).jpg" ]] && mv -v "${aax_file%%-AAX_??_??.aaxc}_\((*)\).jpg" "${completedir}"
[[ -f "${aax_file%%.aaxc}.voucher" ]] && mv -v "${aax_file%%.aaxc}.voucher" "${completedir}"
[[ -f "${aax_file%%-AAX_??_??.aaxc}-chapters.json" ]] && mv -v "${aax_file%%-AAX_??_??.aaxc}-chapters.json" "${completedir}"
fi
fi fi
done done