ScriptFanix/AtOM
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fat32compat: no . at beginning or end of dirname

Browse Source
This commit is contained in:
Vincent Riquer 2013-04-23 13:34:27 +02:00
parent b7ae6bb5ad
commit 9ab92b60a2
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/files/getDestDir
View File

@ -3,28 +3,29 @@ getDestDir() {
destdir="${destinationpath[$destination]}/" destdir="${destinationpath[$destination]}/"
if [ -n "${destinationrenamepath[$destination]}" ] if [ -n "${destinationrenamepath[$destination]}" ]
then then
destdir+="${destinationrenamepath[$destination]//%\{album\}/$album}" replace=$(sanitizeFile "$album" dir)
replace=$(sanitizeFile "$albumartist") destdir+="${destinationrenamepath[$destination]//%\{album\}/$replace}"
replace=$(sanitizeFile "$albumartist" dir)
destdir="${destdir//%\{albumartist\}/$replace}" destdir="${destdir//%\{albumartist\}/$replace}"
replace=$(sanitizeFile "$artist") replace=$(sanitizeFile "$artist" dir)
destdir="${destdir//%\{artist\}/$replace}" destdir="${destdir//%\{artist\}/$replace}"
replace=$(sanitizeFile "$genre") replace=$(sanitizeFile "$genre" dir)
destdir="${destdir//%\{genre\}/$replace}" destdir="${destdir//%\{genre\}/$replace}"
replace=$(sanitizeFile "$title") replace=$(sanitizeFile "$title" dir)
destdir="${destdir//%\{title\}/$replace}" destdir="${destdir//%\{title\}/$replace}"
tracknumber="${track%/*}" tracknumber="${track%/*}"
replace=$(sanitizeFile "$tracknumber") replace=$(sanitizeFile "$tracknumber" dir)
destdir="${destdir//%\{track\}/$replace}" destdir="${destdir//%\{track\}/$replace}"
replace=$(sanitizeFile "$year") replace=$(sanitizeFile "$year" dir)
destdir="${destdir//%\{year\}/$replace}" destdir="${destdir//%\{year\}/$replace}"
replace=$(sanitizeFile "$disc") replace=$(sanitizeFile "$disc" dir)
destdir="${destdir//%\{disc\}/$replace}" destdir="${destdir//%\{disc\}/$replace}"
else else
destdir+=$(sanitizeFile "${filename%%/*}") destdir+=$(sanitizeFile "${filename%%/*}" dir)
part=${filename#*/} part=${filename#*/}
while [[ $part =~ / ]] while [[ $part =~ / ]]
do do
destdir+="/$(sanitizeFile "${part%%/*}")" destdir+="/$(sanitizeFile "${part%%/*}" dir)"
part=${part#*/} part=${part#*/}
done done
fi fi

7
lib/files/sanitizeFile
View File

@ -19,6 +19,13 @@ sanitizeFile() {
# Filenames can't begin or end with ' ' # Filenames can't begin or end with ' '
string=${string/#+( )/} string=${string/#+( )/}
string=${string/%+( )/} string=${string/%+( )/}
# Directory names can't begin or end with '.'
if [[ $2 == dir ]]
then
string=${string/#+(.)/}
string=${string/%+(.)/}
fi
fi fi
echo "$string" echo "$string"
} }