Compare commits
No commits in common. "61677a6c6f7cefeb59c91063d3f8369438381d9d" and "e664de89b487c89e54cc43e6590f9c2c849f797f" have entirely different histories.
61677a6c6f
...
e664de89b4
|
@ -146,6 +146,7 @@ GetOptions() {
|
||||||
while true; do
|
while true; do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
-v|--verbose)
|
-v|--verbose)
|
||||||
|
verbose=2
|
||||||
if [[ $2 != "" ]]; then
|
if [[ $2 != "" ]]; then
|
||||||
verbose=${2}
|
verbose=${2}
|
||||||
fi
|
fi
|
||||||
|
@ -176,6 +177,7 @@ GetOptions() {
|
||||||
-c|--convert)
|
-c|--convert)
|
||||||
VerboseOutput 0 "--convert given"
|
VerboseOutput 0 "--convert given"
|
||||||
convert=true
|
convert=true
|
||||||
|
bitrate=192
|
||||||
if [[ $2 != "" ]]; then
|
if [[ $2 != "" ]]; then
|
||||||
bitrate=${2}
|
bitrate=${2}
|
||||||
fi
|
fi
|
||||||
|
@ -185,6 +187,7 @@ GetOptions() {
|
||||||
-a|--resize-art)
|
-a|--resize-art)
|
||||||
VerboseOutput 0 "--resize-art given"
|
VerboseOutput 0 "--resize-art given"
|
||||||
convertart=true
|
convertart=true
|
||||||
|
coverartsize=200
|
||||||
if [[ $2 != "" ]]; then
|
if [[ $2 != "" ]]; then
|
||||||
coverartsize=${2}
|
coverartsize=${2}
|
||||||
fi
|
fi
|
||||||
|
@ -194,6 +197,7 @@ GetOptions() {
|
||||||
-j|--jobs)
|
-j|--jobs)
|
||||||
VerboseOutput 0 "--jobs given"
|
VerboseOutput 0 "--jobs given"
|
||||||
multithread=true
|
multithread=true
|
||||||
|
jobcount=$(expr $(nproc) - 2)
|
||||||
if [[ $2 != "" ]]; then
|
if [[ $2 != "" ]]; then
|
||||||
jobcount=${2}
|
jobcount=${2}
|
||||||
fi
|
fi
|
||||||
|
@ -467,18 +471,9 @@ if [[ ! -f /tmp/music-sync-filelist ]]; then
|
||||||
CleanUp
|
CleanUp
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
if [[ $convert == false ]]; then
|
||||||
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 [[ $temp != "/tmp/converted" ]]; then
|
if [[ $temp != "/tmp/converted" ]]; then
|
||||||
VerboseOutput 2 "Conversion not enabled. Ignoring temp folder"
|
VerboseOutput 2 "Conversion not enabled. Ignoring cache folder"
|
||||||
fi
|
fi
|
||||||
temp=$source
|
temp=$source
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue
Block a user