From 3d8f7c619c493ba2ae1872191b92e926ab39705e Mon Sep 17 00:00:00 2001
From: fnuesse <felix.nuesse@t-online.de>
Date: Thu, 14 Jun 2018 19:59:32 +0200
Subject: [PATCH] Fixed empty parameter bug

---
 AAXtoMP3       |  22 +++----
 AAXtoMP3Worker | 152 +++++++++++++++++++++++++++----------------------
 printparams    |  21 +++++++
 3 files changed, 114 insertions(+), 81 deletions(-)
 create mode 100644 printparams

diff --git a/AAXtoMP3 b/AAXtoMP3
index 61afd45..82816cb 100644
--- a/AAXtoMP3
+++ b/AAXtoMP3
@@ -72,32 +72,33 @@ do
     
 	if [[ "$var" = '--flac' ]]
 	then
-		flac='--flac'
+		flac='--flac '
 		shift
 	fi
 
 	if [[ "$var" == '--aac' ]]
 	then
 		aac='--aac'
-		single='--single'
+		single='--single '
 		shift
 	fi
 
 	if [[ "$var" = '--opus' ]]
 	then
-		opus='--opus'
+		opus='--opus '
 		shift
 	fi
 	
 	if [[ "$var" == '--single' ]]
 	then
-		single='--single'
+		single='--single '
 		shift
 	fi
 	
 	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;
diff --git a/AAXtoMP3Worker b/AAXtoMP3Worker
index 4c74f6c..8a7e7b2 100644
--- a/AAXtoMP3Worker
+++ b/AAXtoMP3Worker
@@ -58,10 +58,22 @@ 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' ]]
 	then
 		codec=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,64 +160,71 @@ normalize_whitespace() {
     echo $*
 }
 
-create_path(){
-    debug "Decoding $1 with auth code $2..."
-
-    save_metadata "$1"
-    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}"
-    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}"
-
-    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}"
-
-    if [ "${mode}" == "chaptered" ]; then
-        chaptercount=$($GREP -Pc "Chapter.*start.*end" $metadata_file)
-        debug "Extracting ${chaptercount} chapter files from ${full_file_path}..."
-
-        chapternum=1
-        while read -r -u9 first _ _ start _ end
-        do
-            if [[ "${first}" = "Chapter" ]]
-            then
-                read -r -u9 _
-                read -r -u9 _ _ chapter
-                chapter_title="${title} - $(printf %0${#chaptercount}d $chapternum) ${chapter}"
-                chapter_file="${output_directory}/${chapter_title}.${extension}"
-
-                # the ID3 tags must only be specified for *.mp3 files,
-                # the other container formats come with their own
-                # tagging mechanisms.
-                id3_version_param=""
-                if test "${extension}" = "mp3"; then
-                   id3_version_param="-id3v2_version 3"
-                fi
-
-                </dev/null ffmpeg -loglevel error -stats -i "${full_file_path}" -i "${cover_path}" -ss "${start%?}" -to "${end}" -map 0:0 -map 1:0 -acodec copy ${id3_version_param} \
-                    -metadata:s:v title="Album cover" -metadata:s:v comment="Cover (Front)" -metadata track="${chapternum}" -metadata title="${chapter_title}" \
-                    "${chapter_file}"
-                chapternum=$((chapternum + 1 ))
-            fi
-        done 9< "$metadata_file"
-        rm "${full_file_path}"
-        debug "Done creating chapters. Chaptered files contained in ${output_directory}."
-    fi
-
-    debug "Done."
-    rm "${metadata_file}"
-}
-
-
-for path
+alreadys_skipped_to_auth=0
+for path in "${ParamArray[@]}"
 do
-	create_path "${path}" "${auth_code}"
-done
-exit 0;
\ No newline at end of file
+	if (( $alreadys_skipped_to_auth == 0 ))
+	then
+		case "$path" in -a=*|--auth=*)
+			alreadys_skipped_to_auth=1;
+			continue ;
+		esac
+		continue ;
+	fi
+
+	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 "${path}")/${genre}/${artist}/${title}"
+		mkdir -p "${output_directory}"
+		full_file_path="${output_directory}/${title}.${extension}"
+	
+		</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 "${auth_code}" -i "${path}" -an -codec:v copy "${cover_path}"
+	
+		if [ "${mode}" == "chaptered" ]; then
+			chaptercount=$($GREP -Pc "Chapter.*start.*end" $metadata_file)
+			debug "Extracting ${chaptercount} chapter files from ${full_file_path}..."
+	
+			chapternum=1
+			while read -r -u9 first _ _ start _ end
+			do
+				if [[ "${first}" = "Chapter" ]]
+				then
+					read -r -u9 _
+					read -r -u9 _ _ chapter
+					chapter_title="${title} - $(printf %0${#chaptercount}d $chapternum) ${chapter}"
+					chapter_file="${output_directory}/${chapter_title}.${extension}"
+	
+					# the ID3 tags must only be specified for *.mp3 files,
+					# the other container formats come with their own
+					# tagging mechanisms.
+					id3_version_param=""
+					if test "${extension}" = "mp3"; then
+					id3_version_param="-id3v2_version 3"
+					fi
+	
+					</dev/null ffmpeg -loglevel error -stats -i "${full_file_path}" -i "${cover_path}" -ss "${start%?}" -to "${end}" -map 0:0 -map 1:0 -acodec copy ${id3_version_param} \
+						-metadata:s:v title="Album cover" -metadata:s:v comment="Cover (Front)" -metadata track="${chapternum}" -metadata title="${chapter_title}" \
+						"${chapter_file}"
+					chapternum=$((chapternum + 1 ))
+				fi
+			done 9< "$metadata_file"
+			rm "${full_file_path}"
+			debug "Done creating chapters. Chaptered files contained in ${output_directory}."
+		fi
+	
+		debug "Done."
+		rm "${metadata_file}"
+	fi
+done
\ No newline at end of file
diff --git a/printparams b/printparams
new file mode 100644
index 0000000..bcb4d75
--- /dev/null
+++ b/printparams
@@ -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
+