Fixed empty parameter bug

This commit is contained in:
fnuesse 2018-06-14 19:59:32 +02:00
parent ab9e044ad7
commit 3d8f7c619c
3 changed files with 114 additions and 81 deletions

View File

@ -97,7 +97,8 @@ do
case "$var" in
-a=*|--auth=*)
auth="${var#*=}";
auth=$(echo $var | cut -d '=' -f 2)
shift
esac
done
@ -112,13 +113,6 @@ for dir in $authcodeDirs; do
fi;
done;
if [ ! -f "$codeFile" ]; then
auth_code=$1
shift
else
auth_code=`head -1 "$codeFile"`
fi
if [ -z "$auth_code" ]; then
auth_code="$auth";
fi;
@ -142,7 +136,9 @@ metadata_file="${working_directory}/metadata.txt"
#if [ -z "$multi_thread" ]; then
for path
do
bash AAXtoMP3Worker "${flac}" "${aac}" "${opus}" "${single}" "${path}" "--auth=${auth_code}"
echo bash AAXtoMP3Worker "${flac}""${aac}""${opus}""${single}""--auth=${auth_code}" "${path}"
bash AAXtoMP3Worker "${flac}" "${aac}" "${opus}" "${single}" "--auth=${auth_code}" "${path}"
echo "running away..."
done
exit 0;
#fi;

View File

@ -58,8 +58,20 @@ if [[ "$1" = '--help' ]]; then
fi
#Iterate over the parameter to find all entered ones
ParamArray=()
#the multithreadcontroller adds whitespaces to the params, they are removed here.
for var in "$@"
do
if ! [[ "$var" = '' ]]
then
ParamArray+=("$var")
fi
done
#Iterate over the parameter to find all entered ones
for var in "${ParamArray[@]}"
do
if [[ "$var" = '--flac' ]]
@ -92,11 +104,11 @@ do
case "$var" in
-a=*|--auth=*)
auth="${var#*=}";
auth=$(echo $var | cut -d '=' -f 2)
shift
esac
done
auth_code="";
for dir in $authcodeDirs; do
codeFile="${dir}$authcode";
@ -107,10 +119,7 @@ for dir in $authcodeDirs; do
fi;
done;
if [ ! -f "$codeFile" ]; then
auth_code=$1
shift
else
if [ -f "$codeFile" ]; then
auth_code=`head -1 "$codeFile"`
fi
@ -151,24 +160,37 @@ normalize_whitespace() {
echo $*
}
create_path(){
debug "Decoding $1 with auth code $2..."
alreadys_skipped_to_auth=0
for path in "${ParamArray[@]}"
do
if (( $alreadys_skipped_to_auth == 0 ))
then
case "$path" in -a=*|--auth=*)
alreadys_skipped_to_auth=1;
continue ;
esac
continue ;
fi
save_metadata "$1"
if (( $alreadys_skipped_to_auth == 1 ))
then
debug "Decoding ${path} with auth code ${auth_code}..."
save_metadata "${path}"
genre=$(get_metadata_value genre)
artist=$(get_metadata_value artist)
title=$(get_metadata_value title | sed 's/'\:'/'\ -'/g' | xargs -0)
output_directory="$(dirname "$1")/${genre}/${artist}/${title}"
output_directory="$(dirname "${path}")/${genre}/${artist}/${title}"
mkdir -p "${output_directory}"
full_file_path="${output_directory}/${title}.${extension}"
</dev/null ffmpeg -loglevel error -stats -activation_bytes "$2" -i "$1" -vn -codec:a "${codec}" -ab "$(get_bitrate)k" -map_metadata -1 -metadata title="${title}" -metadata artist="${artist}" -metadata album_artist="$(get_metadata_value album_artist)" -metadata album="$(get_metadata_value album)" -metadata date="$(get_metadata_value date)" -metadata track="1/1" -metadata genre="${genre}" -metadata copyright="$(get_metadata_value copyright)" "${full_file_path}"
</dev/null ffmpeg -loglevel error -stats -activation_bytes "${auth_code}" -i "${path}" -vn -codec:a "${codec}" -ab "$(get_bitrate)k" -map_metadata -1 -metadata title="${title}" -metadata artist="${artist}" -metadata album_artist="$(get_metadata_value album_artist)" -metadata album="$(get_metadata_value album)" -metadata date="$(get_metadata_value date)" -metadata track="1/1" -metadata genre="${genre}" -metadata copyright="$(get_metadata_value copyright)" "${full_file_path}"
debug "Created ${full_file_path}."
cover_path="${output_directory}/cover.jpg"
debug "Extracting cover into ${cover_path}..."
</dev/null ffmpeg -loglevel error -activation_bytes "$2" -i "$1" -an -codec:v copy "${cover_path}"
</dev/null ffmpeg -loglevel error -activation_bytes "${auth_code}" -i "${path}" -an -codec:v copy "${cover_path}"
if [ "${mode}" == "chaptered" ]; then
chaptercount=$($GREP -Pc "Chapter.*start.*end" $metadata_file)
@ -204,11 +226,5 @@ create_path(){
debug "Done."
rm "${metadata_file}"
}
for path
do
create_path "${path}" "${auth_code}"
fi
done
exit 0;

21
printparams Normal file
View File

@ -0,0 +1,21 @@
#!/usr/bin/env bash
#Iterate over the parameter to find all entered ones
for var in "$@"
do
if [[ "$var" = '' ]]
then
shift
fi
done
i=0;
for var in "$@"
do
echo "$i. $var"
i=$((i+1))
done