music-sync.sh

@@ -146,6 +146,7 @@ GetOptions() {
 	while true; do
 		case "$1" in
 			-v|--verbose)
+				verbose=2
 				if [[ $2 != "" ]]; then
 					verbose=${2}
 				fi
@@ -176,6 +177,7 @@ GetOptions() {
 			-c|--convert)
 				VerboseOutput 0 "--convert given"
 				convert=true
+				bitrate=192
 				if [[ $2 != "" ]]; then
 					bitrate=${2}
 				fi
@@ -185,6 +187,7 @@ GetOptions() {
 			-a|--resize-art)
 				VerboseOutput 0 "--resize-art given"
 				convertart=true
+				coverartsize=200
 				if [[ $2 != "" ]]; then
 					coverartsize=${2}
 				fi
@@ -194,6 +197,7 @@ GetOptions() {
 			-j|--jobs)
 				VerboseOutput 0 "--jobs given"
 				multithread=true
+				jobcount=$(expr $(nproc) - 2)
 				if [[ $2 != "" ]]; then
 					jobcount=${2}
 				fi
@@ -467,18 +471,9 @@ if [[ ! -f /tmp/music-sync-filelist ]]; then
 	CleanUp
 	exit 0
 fi
-
-if [[ $convert == true ]]; then
-	temp=${temp}/bitrate-${bitrate}
-	if [[ $convertart == true ]]; then
-		temp="${temp}/coverart-${coverartsize}"
-	else
-		temp="${temp}/coverart-original"
-	fi
-	VerboseOutput 2 "Conversion enabled. Using $temp as temp-folder"
-else
+if [[ $convert == false ]]; then
 	if [[ $temp != "/tmp/converted" ]]; then
-		VerboseOutput 2 "Conversion not enabled. Ignoring temp folder"
+		VerboseOutput 2 "Conversion not enabled. Ignoring cache folder"
 	fi
 	temp=$source
 fi