JeroenED/bash-music-sync
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: JeroenED:e664de89b487c89e54cc43e6590f9c2c849f797f
Branches Tags
JeroenED:main
JeroenED:develop
..
compare: JeroenED:962748da1e37a8a0ad79e1cfb2b009517a902eb9
Branches Tags
JeroenED:main
JeroenED:develop

No commits in common. "e664de89b487c89e54cc43e6590f9c2c849f797f" and "962748da1e37a8a0ad79e1cfb2b009517a902eb9" have entirely different histories.
e664de89b4 ... 962748da1e

2 changed files with 170 additions and 287 deletions
Show Stats Expand all files Collapse all files

56
README.MD
View File

@ -1,47 +1,45 @@
# Bash Music sync # Bash Music sync
(c) 2018-2020 Jeroen De Meerleer <me@jeroened.be> (c) 2018-2019 Jeroen De Meerleer <me@jeroened.be>
Script to sync music from one folder to another Script to sync music from one folder to another
## Usage: ## Usage:
``` ```
Syncronises music from one folder to another. music-sync <options> -s|--source <source> -d|--dest <destination>
music-sync <options> <source> <destination>
Usage: Syncronises music from one folder to another.
music-sync <options> -s|--source <source> -d|--dest <destination>
music-sync <options> <source> <destination>
Options: Options:
-s, --source <source> The source folder of the music -s, --source <source> The source folder of the music
-d, --dest <destination> The destination folder of the music -d, --dest <destination> The destination folder of the music
-t, --temp <folder> The temporary cache for converted files (default: /tmp/converted) -t, --temp <folder> The temporary cache for converted files (default: /tmp/converted)
-c, --convert <bitrate> Convert files to a given bitrate in kbps before syncing (default: 192) -c, --convert <bitrate> Convert files to a given bitrate in kbps before syncing (default: 192)
-a, --resize-art <width> Resize album-art before syncing (default width: 200) -a, --resize-art <width> Resize album-art before syncing (default width: 200)
-j, --jobs <nproc> Number of processes to use in multi-threading (default: nproc - 2) -v, --verbose <0-6> Set log level (default: 2)
-v, --verbose <0-6> Set log level (default: 2) -h, --help Display this help text
-h, --help Display this help text
Log levels: Log levels:
0 | Verbose 0 | Verbose
1 | Debug 1 | Debug
2 | Info 2 | Info
3 | Warning 3 | Warning
4 | Error 4 | Error
5 | Fatal 5 | Fatal
6 | Silence 6 | Silence
Exit Codes: Exit Codes:
1 Dependencies not met 1 Dependencies not met
2 Invalid Argument 2 Invalid Argument
3 Source Unreachable 3 Source Unreachable
4 Destination Unreachable 4 Destination Unreachable
5 Command failed 5 Command failed
``` ```
## Licence ## Licence
Copyright 2018-2020 Jeroen De Meerleer <me@jeroened.be> Copyright 2018-2019 Jeroen De Meerleer <me@jeroened.be>
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

401
music-sync.sh
View File

@ -1,38 +1,4 @@
#!/bin/bash #!/bin/bash
#
#/
#/ Usage:
#/ music-sync <options> -s|--source <source> -d|--dest <destination>
#/ music-sync <options> <source> <destination>
#/
#/ Syncronises music from one folder to another.
#/
#/ Options:
#/ -s, --source <source> The source folder of the music
#/ -d, --dest <destination> The destination folder of the music
#/ -t, --temp <folder> The temporary cache for converted files (default: /tmp/converted)
#/ -c, --convert <bitrate> Convert files to a given bitrate in kbps before syncing (default: 192)
#/ -a, --resize-art <width> Resize album-art before syncing (default width: 200)
#/ -j, --jobs <nproc> Number of processes to use in multi-threading (default: nproc - 2)
#/ -v, --verbose <0-6> Set log level (default: 2)
#/ -h, --help Display this help text
#/
#/ Log levels:
#/ 0 | Verbose
#/ 1 | Debug
#/ 2 | Info
#/ 3 | Warning
#/ 4 | Error
#/ 5 | Fatal
#/ 6 | Silence
#/
#/ Exit Codes:
#/ 1 Dependencies not met
#/ 2 Invalid Argument
#/ 3 Source Unreachable
#/ 4 Destination Unreachable
#/ 5 Command failed
#/
begin=$(date +"%s") begin=$(date +"%s")
# saner programming env: these switches turn some bugs into errors # saner programming env: these switches turn some bugs into errors
@ -46,13 +12,9 @@ help=false
temp="/tmp/converted" temp="/tmp/converted"
convertart=false convertart=false
coverartsize=200 coverartsize=200
jobcount=$(expr $(nproc) - 2)
multithread=false
script_name=$(basename "${0}")
script_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
CheckDeps() { CheckDeps() {
if [[ $1 == 2 ]]; then if [[ $1 == 0 ]]; then
# Check getopt # Check getopt
! getopt --test > /dev/null ! getopt --test > /dev/null
if [[ ${PIPESTATUS[0]} -ne 4 ]]; then if [[ ${PIPESTATUS[0]} -ne 4 ]]; then
@ -62,70 +24,44 @@ CheckDeps() {
ExecTime ExecTime
exit 1 exit 1
fi fi
VerboseOutput 0 "\`getopt --test\` succeeded"
fi fi
if [[ $1 == 1 ]]; then if [[ $1 == 1 ]]; then
# Check ffmpeg # Check lame
if [[ $convert == true ]]; then if [[ $convert == true && ! $(lame --version 2>/dev/null) ]]; then
if [[ ! $(ffmpeg -h 2>/dev/null) ]]; then VerboseOutput 5 "\`lame --version\` failed"
VerboseOutput 5 "\`ffmpeg -h\` failed" VerboseOutput 5 "Sorry, It seems that lame is not installed on your system"
VerboseOutput 5 "Sorry, It seems that ffmpeg is not installed on your system" VerboseOutput 5 "Please install lame from your repositories and make sure it is available in your \$PATH"
VerboseOutput 5 "Please install ffmpeg from your repositories and make sure it is available in your \$PATH" VerboseOutput 5 "Otherwise disable conversion"
VerboseOutput 5 "Otherwise disable conversion" ExecTime
ExecTime exit 1
exit 1
fi
VerboseOutput 0 "\`ffmpeg -h\` succeeded"
fi fi
# Check EyeD3 # Check EyeD3
if [[ $convertart == true ]]; then if [[ $convertart == true && ! $(eyeD3 --version 2>/dev/null) ]]; then
if [[ ! $(eyeD3 --version 2>/dev/null) ]]; then VerboseOutput 5 "\`eyeD3 --version\` failed"
VerboseOutput 5 "\`eyeD3 --version\` failed" VerboseOutput 5 "Sorry, It seems that eyeD3 is not installed on your system"
VerboseOutput 5 "Sorry, It seems that eyeD3 is not installed on your system" VerboseOutput 5 "Please install eyeD3 from your repositories and make sure it is available in your \$PATH"
VerboseOutput 5 "Please install eyeD3 from your repositories and make sure it is available in your \$PATH" VerboseOutput 5 "Otherwise disable albumart conversion"
VerboseOutput 5 "Otherwise disable albumart conversion" ExecTime
ExecTime exit 1
exit 1
fi
VerboseOutput 0 "\`eyeD3 --version\` succeeded"
fi fi
# Check ImageMagick # Check ImageMagick
if [[ $convertart == true ]]; then if [[ $convertart == true && ! $(convert --version 2>/dev/null) ]]; then
if [[ ! $(convert --version 2>/dev/null) ]]; then VerboseOutput 5 "\`convert --version\` failed"
VerboseOutput 5 "\`convert --version\` failed" VerboseOutput 5 "Sorry, It seems that ImageMagick is not installed on your system"
VerboseOutput 5 "Sorry, It seems that ImageMagick is not installed on your system" VerboseOutput 5 "Please install ImageMagick from your repositories and make sure it is available in your \$PATH"
VerboseOutput 5 "Please install ImageMagick from your repositories and make sure it is available in your \$PATH" VerboseOutput 5 "Otherwise disable albumart conversion"
VerboseOutput 5 "Otherwise disable albumart conversion" ExecTime
ExecTime exit 1
exit 1
fi
VerboseOutput 0 "\`convert --version\` succeeded"
fi
# Check Gnu parallel
if [[ $multithread == true ]]; then
if [[ ! $(parallel -h 2>/dev/null) ]]; then
VerboseOutput 5 "\`parallel -h\` failed"
VerboseOutput 5 "Sorry, It seems that parallel is not installed on your system"
VerboseOutput 5 "Please install gnu-parallel and env_parallel from your repositories and make sure it is available in your \$PATH"
VerboseOutput 5 "Otherwise disable multithreading"
ExecTime
exit 1
fi
VerboseOutput 0 "\`parallel -h \` succeeded"
fi fi
fi fi
VerboseOutput 1 "Dependency test OK"
} }
GetOptions() { GetOptions() {
# https://stackoverflow.com/a/29754866 # https://stackoverflow.com/a/29754866
OPTIONS=s:d:t:c::a::v::hj:: OPTIONS=s:d:t:c::a::v::h
LONGOPTS=source:,dest:,temp:,convert::,resize-art::,verbose::,help,jobs:: LONGOPTS=source:,dest:,temp:,convert::,resize-art::,verbose::,help
# -use ! and PIPESTATUS to get exit code with errexit set # -use ! and PIPESTATUS to get exit code with errexit set
# -temporarily store output to be able to check for errors # -temporarily store output to be able to check for errors
@ -149,60 +85,43 @@ GetOptions() {
verbose=2 verbose=2
if [[ $2 != "" ]]; then if [[ $2 != "" ]]; then
verbose=${2} verbose=${2}
shift
fi fi
shift 2 shift
;; ;;
-h|--help) -h|--help)
help=true help=true
shift shift
;; ;;
-s|--source) -s|--source)
VerboseOutput 0 "--source given."
VerboseOutput 1 "Source is ${2}"
source="$2" source="$2"
shift 2 shift 2
;; ;;
-d|--dest) -d|--dest)
VerboseOutput 0 "--dest given."
VerboseOutput 1 "Destination is ${2}"
dest="$2" dest="$2"
shift 2 shift 2
;; ;;
-t|--temp) -t|--temp)
VerboseOutput 0 "--temp given"
VerboseOutput 1 "Tempfolder is ${2}"
temp="$2" temp="$2"
shift 2 shift 2
;; ;;
-c|--convert) -c|--convert)
VerboseOutput 0 "--convert given"
convert=true convert=true
bitrate=192 bitrate=192
if [[ $2 != "" ]]; then if [[ $2 != "" ]]; then
bitrate=${2} bitrate=${2}
shift
fi fi
VerboseOutput 1 "Converted bitrate is ${bitrate}" shift
shift 2
;; ;;
-a|--resize-art) -a|--resize-art)
VerboseOutput 0 "--resize-art given"
convertart=true convertart=true
coverartsize=200 coverartsize=200
if [[ $2 != "" ]]; then if [[ $2 != "" ]]; then
coverartsize=${2} coverartsize=${2}
shift
fi fi
shift 2 shift
VerboseOutput 1 "Album art will ${coverartsize}px wide"
;;
-j|--jobs)
VerboseOutput 0 "--jobs given"
multithread=true
jobcount=$(expr $(nproc) - 2)
if [[ $2 != "" ]]; then
jobcount=${2}
fi
shift 2
VerboseOutput 1 "Multithreading will use ${jobcount} threads"
;; ;;
--) --)
shift shift
@ -216,29 +135,51 @@ GetOptions() {
done done
if [[ ! -z "${1+x}" ]]; then if [[ ! -z "${1+x}" ]]; then
if [[ ${source} != "-" ]]; then
VerboseOutput 4 "Source provided twice. Continueing with ${1}"
fi
source="$1" source="$1"
VerboseOutput 1 "Source is ${1}"
fi fi
if [[ ! -z "${2+x}" ]]; then if [[ ! -z "${2+x}" ]]; then
if [[ ${dest} != "-" ]]; then
VerboseOutput 4 "Destination provided twice. Continueing with ${2}"
fi
dest="$2" dest="$2"
VerboseOutput 1 "Destination is ${2}"
fi fi
if [[ $dest == "-" ]] || [[ $source == "-" ]]; then if [[ $dest == "-" ]] || [[ $source == "-" ]]; then
help=true help=true
fi fi
VerboseOutput 1 "Checks OK. Going on"
} }
Usage() { Usage() {
grep '^#/' "${script_dir}/${script_name}" | sed 's/^#\/\w*//' echo ""
echo "Usage:"
echo "music-sync <options> -s|--source <source> -d|--dest <destination>"
echo "music-sync <options> <source> <destination>"
echo ""
echo "Syncronises music from one folder to another."
echo ""
echo "Options:"
echo " -s, --source <source> The source folder of the music"
echo " -d, --dest <destination> The destination folder of the music"
echo " -t, --temp <folder> The temporary cache for converted files (default: /tmp/converted)"
echo " -c, --convert <bitrate> Convert files to a given bitrate in kbps before syncing (default: 192)"
echo " -a, --resize-art <width> Resize album-art before syncing (default width: 200)"
echo " -v, --verbose <0-6> Set log level (default: 2)"
echo " -h, --help Display this help text"
echo ""
echo "Log levels:"
echo " 0 | Verbose"
echo " 1 | Debug"
echo " 2 | Info"
echo " 3 | Warning"
echo " 4 | Error"
echo " 5 | Fatal"
echo " 6 | Silence"
echo ""
echo "Exit Codes:"
echo " 1 Dependencies not met"
echo " 2 Invalid Argument"
echo " 3 Source Unreachable"
echo " 4 Destination Unreachable"
echo " 5 Command failed"
echo ""
} }
VerboseOutput() { VerboseOutput() {
@ -278,156 +219,99 @@ CreateFileList() {
sourcepath="${sourcepath/\]/\\\]}" sourcepath="${sourcepath/\]/\\\]}"
for file in $sourcepath; do for file in $sourcepath; do
origfile="${file#"$1/"}" origfile="${file#"$1/"}"
relfile=$(echo ${origfile} | sed -e 's/\(\.\)*$//g' | tr -s ' ') relfile=$(echo ${origfile} | sed -e 's/\(\.\)*$//g')
mp3file=$(echo "${relfile}" | sed -e 's/.flac/.mp3/')
VerboseOutput 0 "Checking ${origfile}"
if [[ -d "${1}/$origfile" ]]; then if [[ -d "${1}/$origfile" ]]; then
VerboseOutput 0 "${origfile} is folder" newdir="${3}/$relfile"
newdir="${3}/$origfile"
newdir=${newdir#"/"} newdir=${newdir#"/"}
VerboseOutput 1 "Entering $newdir" VerboseOutput 1 "Entering $newdir"
CreateFileList "${1}/$origfile" "${2}/$relfile" "$newdir" CreateFileList "${1}/$origfile" "${2}/$relfile" "$newdir"
elif [[ "${1}/$origfile" != *".m3u" ]] && [[ "${1}/$origfile" -nt "${2}/$mp3file" ]]; then elif [[ "${1}/$origfile" != *".m3u" ]] && [[ ! -f "${2}/$relfile" || "${1}/$origfile" -nt "${2}/$relfile" ]]; then
echo ${3}/$origfile >> /tmp/music-sync-filelist echo ${3}/$relfile >> /tmp/music-sync-filelist
VerboseOutput 0 "${origfile} is newer in source" VerboseOutput 2 "Added: ${3}/${relfile}"
VerboseOutput 2 "Added: ${3}/${origfile}"
fi fi
if [[ "${1}/$origfile" == *".m3u" ]]; then
VerboseOutput 0 "${origfile} is playlist"
fi
done done
} }
Execute() { ConvertFiles() {
curline=0 curline=0
percentage=0 percentage=0
IFS=" while read -r line
"; do
if [[ $multithread == true ]]; then
VerboseOutput 3 "Running in parallel. Mind your load"
export -f ProcessFile
export -f ConvertFile
export -f CopyFile
export -f VerboseOutput
export -f ExecTime
export dest
export source
export bitrate
export convert
export temp
export verbose
export coverartsize
export begin
parallel --jobs ${jobcount} --will-cite --line-buffer --arg-file "/tmp/music-sync-filelist" ProcessFile
else
for line in $(cat "/tmp/music-sync-filelist")
do
curline=$(expr ${curline} + 1)
total=$(cat /tmp/music-sync-filelist | wc -l)
percentage=$(echo "scale=4;${curline}/${total}" | bc)
percentage=$(echo "scale=2;${percentage}*100" | bc)
VerboseOutput 2 "Current file: $line"
VerboseOutput 2 "Progress: $curline / $total (${percentage%00}%)"
ProcessFile $line
done
fi
VerboseOutput 2 "Done!"
}
ProcessFile() {
line=${1}
curline="$(grep -n "$line" /tmp/music-sync-filelist | head -n 1 | cut -d: -f1)"
total=$(cat /tmp/music-sync-filelist | wc -l)
percentage=$(echo "scale=4;${curline}/${total}" | bc)
percentage=$(echo "scale=2;${percentage}*100" | bc)
VerboseOutput 2 "Current File: $line"
VerboseOutput 2 "Progress: $curline / $total (${percentage%00}%)"
if [[ $convert == true ]]; then
ConvertFile "$line"
fi
CopyFile "$line"
}
ConvertFile() { if [[ ! -f "${source}/$line" ]]; then
line=${1} VerboseOutput 5 "Source-file ${source}/$line Unreachable"
if [[ ! -f "${source}/$line" ]]; then ExecTime
VerboseOutput 5 "Source-file ${source}/$line Unreachable" exit 3
ExecTime
exit 3
fi
if [[ "$temp/$line" = */* ]]; then
VerboseOutput 0 "Creating folder $temp/${line%/*}"
mkdir -p "$temp/${line%/*}";
fi;
mp3line=$(echo "$line" | sed -e 's/.flac/.mp3/')
if [[ ! -f "$temp/$mp3line" || "${source}/$mp3line" -nt "$temp/$mp3line" ]]; then
if [[ $line != *".mp3" ]]; then
VerboseOutput 3 "${line} will be converted to mp3-file ${mp3line}"
fi fi
VerboseOutput 0 "Converting MP3-file $line"
ffmpeg -y -i "$source/$line" -acodec libmp3lame -map_metadata 0 -id3v2_version 3 -b:a ${bitrate}k "$temp/${mp3line}" 1>/dev/null 2>/dev/null curline=$(expr ${curline} + 1)
if [[ $convertart == true ]]; then total=$(cat /tmp/music-sync-filelist | wc -l)
VerboseOutput 0 "Creating folder $temp/${mp3line}-images/" percentage=$(echo "scale=4;${curline}/${total}" | bc)
mkdir -p "$temp/${mp3line}-images/" percentage=$(echo "scale=2;${percentage}*100" | bc)
VerboseOutput 0 "Extracted albumart" VerboseOutput 1 "Converting: $line"
eyeD3 --write-images "$temp/${mp3line}-images/" "$temp/${mp3line}" 1>/dev/null 2>/dev/null VerboseOutput 2 "Progress: $curline / $total (${percentage%00}%) Step 1 of 2"
frontcovers=(${temp}/${mp3line}-images/FRONT_COVER.*)
if [ -e "$frontcovers" ]; then if [[ "$temp/$line" = */* ]]; then
VerboseOutput 0 "Converting albumart" mkdir -p "$temp/${line%/*}";
convert "$temp/${mp3line}-images/FRONT_COVER.*" -resize ${coverartsize}x${coverartsize} "$temp/${mp3line}-images/FRONT_COVER.jpg" 1>/dev/null 2>/dev/null fi;
eyeD3 --remove-all-images "$temp/${mp3line}" 1>/dev/null 2>/dev/null if [[ ! -f "$temp/$line" || "${source}/$line" -nt "$temp/$line" ]]; then
VerboseOutput 0 "Embedding albumart" lame -b ${bitrate} $source/$line $temp/$line 1>/dev/null 2>/dev/null
eyeD3 --add-image "$temp/${mp3line}-images/FRONT_COVER.jpg:FRONT_COVER" "$temp/${mp3line}" 1>/dev/null 2>/dev/null VerboseOutput 2 "Converted: $line"
VerboseOutput 1 "Converted cover art: ${mp3line}" if [[ $convertart == true ]]; then
else mkdir -p "$temp/$line-images/"
VerboseOutput 4 "No front cover art found for ${mp3line}" eyeD3 --write-images "$temp/$line-images/" "$temp/$line" 1>/dev/null 2>/dev/null
convert "$temp/$line-images/FRONT_COVER.*" -resize ${coverartsize}x${coverartsize} "$temp/$line-images/FRONT_COVER.jpg" 1>/dev/null 2>/dev/null
eyeD3 --remove-all-images "$temp/$line" 1>/dev/null 2>/dev/null
eyeD3 --add-image "$temp/$line-images/FRONT_COVER.jpg:FRONT_COVER" "$temp/$line" 1>/dev/null 2>/dev/null
VerboseOutput 2 "Converted cover art: $line"
fi fi
else
VerboseOutput 3 "$line already converted"
fi;
done < "/tmp/music-sync-filelist"
}
CopyFiles() {
curline=0
percentage=0
while read -r line
do
if [[ ! -d "$dest" ]]; then
VerboseOutput 5 "Destination unreachable"
ExecTime
exit 4
fi fi
VerboseOutput 1 "Converted: $line"
else if [[ ! -f "${temp}/$line" ]]; then
VerboseOutput 3 "$line already converted" VerboseOutput 5 "Source-file ${temp}/$line Unreachable"
fi; ExecTime
exit 3
fi
curline=$(expr ${curline} + 1)
total=$(cat /tmp/music-sync-filelist | wc -l)
percentage=$(echo "scale=4;${curline}/${total}" | bc)
percentage=$(echo "scale=2;${percentage}*100" | bc)
VerboseOutput 1 "Copying: $line"
VerboseOutput 2 "Progress: $curline / $total (${percentage%00}%) Step 2 of 2"
if [[ "$dest/$line" = */* ]]; then
mkdir -p "$dest/${line%/*}";
fi;
cp -f $temp/$line $dest/$line 1>/dev/null 2>/dev/null
VerboseOutput 2 "Copied: $line"
done < "/tmp/music-sync-filelist"
} }
CopyFile() {
line=${1}
if [[ ! -d "$dest" ]]; then
VerboseOutput 5 "Destination unreachable"
ExecTime
exit 4
fi
if [[ $convert == true ]]; then
mp3line=$(echo "$line" | sed -e 's/.flac/.mp3/')
else
mp3line=$(echo "$line")
fi
if [[ ! -f "${temp}/$mp3line" ]]; then
VerboseOutput 5 "Source-file ${temp}/$mp3line Unreachable"
ExecTime
exit 3
fi
destline=$(echo $mp3line | sed -e 's/\.*\//\//g'| tr -s ' ')
VerboseOutput 1 "Copying: $line"
if [[ "$dest/$line" = */* ]]; then
VerboseOutput 0 "Creating folder $dest/${line%/*}"
mkdir -p "$dest/${destline%/*}";
fi;
cp -fv "$temp/$mp3line" "$dest/${destline}" 1>/dev/null 2>/dev/null
VerboseOutput 1 "Copied: $line"
}
CleanUp() { CleanUp() {
VerboseOutput 1 "Cleaning Up" VerboseOutput 1 "Cleaning Up"
if [[ -f /tmp/music-sync-filelist ]]; then if [[ -f /tmp/music-sync-filelist ]]; then
VerboseOutput 1 "Removing filelist"
rm "/tmp/music-sync-filelist" rm "/tmp/music-sync-filelist"
fi fi
VerboseOutput 1 "Done" VerboseOutput 1 "Done"
@ -454,7 +338,7 @@ ExitHandler() {
trap 'ExitHandler' SIGINT trap 'ExitHandler' SIGINT
trap 'ErrorHandler $BASH_COMMAND' ERR trap 'ErrorHandler $BASH_COMMAND' ERR
CheckDeps 2 CheckDeps 0
GetOptions $@ GetOptions $@
CheckDeps 1 CheckDeps 1
if [[ $help == true ]]; then if [[ $help == true ]]; then
@ -464,19 +348,20 @@ fi
if [[ -f /tmp/music-sync-filelist ]]; then if [[ -f /tmp/music-sync-filelist ]]; then
rm /tmp/music-sync-filelist rm /tmp/music-sync-filelist
fi fi
VerboseOutput 2 "Scanning for new or updated files"
CreateFileList $source $dest "" CreateFileList $source $dest ""
if [[ ! -f /tmp/music-sync-filelist ]]; then if [[ ! -f /tmp/music-sync-filelist ]]; then
VerboseOutput 2 "Nothing to do!" VerboseOutput 2 "Nothing to do!"
CleanUp CleanUp
exit 0 exit 0
fi fi
if [[ $convert == false ]]; then if [[ $convert == true ]]; then
ConvertFiles
else
if [[ $temp != "/tmp/converted" ]]; then if [[ $temp != "/tmp/converted" ]]; then
VerboseOutput 2 "Conversion not enabled. Ignoring cache folder" VerboseOutput 2 "Conversion not enabled. Ignoring cache folder"
fi fi
temp=$source temp=$source
fi fi
Execute CopyFiles
CleanUp CleanUp
ExecTime ExecTime