mirror of
https://github.com/KrumpetPirate/AAXtoMP3.git
synced 2024-11-18 03:08:57 +01:00
Merge branch 'posix-filenames' of github.com:fabh2o/AAXtoMP3 into all-in-one
This commit is contained in:
commit
ab5d7c7f7c
6
AAXtoMP3
6
AAXtoMP3
@ -519,6 +519,7 @@ do
|
|||||||
# Make sure everything is a variable. Simplifying Command interpretation
|
# Make sure everything is a variable. Simplifying Command interpretation
|
||||||
save_metadata "${aax_file}"
|
save_metadata "${aax_file}"
|
||||||
genre=$(get_metadata_value genre)
|
genre=$(get_metadata_value genre)
|
||||||
|
<<<<<<< HEAD
|
||||||
if [ "x${authorOverride}" != "x" ]; then
|
if [ "x${authorOverride}" != "x" ]; then
|
||||||
#Manual Override
|
#Manual Override
|
||||||
artist="${authorOverride}"
|
artist="${authorOverride}"
|
||||||
@ -537,6 +538,11 @@ do
|
|||||||
fi
|
fi
|
||||||
title=$(get_metadata_value title | $SED 's/'\:'/'-'/g' | $SED 's/- /-/g' | xargs -0)
|
title=$(get_metadata_value title | $SED 's/'\:'/'-'/g' | $SED 's/- /-/g' | xargs -0)
|
||||||
title=${title:0:100}
|
title=${title:0:100}
|
||||||
|
=======
|
||||||
|
artist=$(get_metadata_value artist)
|
||||||
|
title=$(get_metadata_value title)
|
||||||
|
title=${title:0:128}
|
||||||
|
>>>>>>> afb852fdf165c2aeb6f08d7583225e77adb940ab
|
||||||
if [ "x${targetdir}" != "x" ] ; then
|
if [ "x${targetdir}" != "x" ] ; then
|
||||||
output_directory="${targetdir}/${genre}/${artist}/${title}"
|
output_directory="${targetdir}/${genre}/${artist}/${title}"
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user