Fix double hyphen causing Year issue. Ensure space removal is done at the right point. Add a source description of where the year came from.
This commit is contained in:
parent
3ac99d17d3
commit
a513995ad9
@ -173,9 +173,7 @@ function migrate_music {
|
|||||||
year="${year// : /}"
|
year="${year// : /}"
|
||||||
year="${year//[^[:alnum:][:space:].]/}"
|
year="${year//[^[:alnum:][:space:].]/}"
|
||||||
year="`echo $year`"
|
year="`echo $year`"
|
||||||
while [[ "$year" == *" "* ]]; do
|
year_source="Year"
|
||||||
year="${year// / }"
|
|
||||||
done
|
|
||||||
if [[ -z $year ]]; then
|
if [[ -z $year ]]; then
|
||||||
year=""
|
year=""
|
||||||
year="`exiftool -RecordingTime "$file"`"
|
year="`exiftool -RecordingTime "$file"`"
|
||||||
@ -183,16 +181,21 @@ function migrate_music {
|
|||||||
year="${year// : /}"
|
year="${year// : /}"
|
||||||
year="${year//[^[:alnum:][:space:].]/}"
|
year="${year//[^[:alnum:][:space:].]/}"
|
||||||
year="`echo $year`"
|
year="`echo $year`"
|
||||||
|
year_source="RecordingTime"
|
||||||
fi
|
fi
|
||||||
if [[ -z $year ]]; then
|
if [[ -z $year ]]; then
|
||||||
year=""
|
year=""
|
||||||
year="`exiftool --DateTimeOriginal "$file"`"
|
year="`exiftool -DateTimeOriginal "$file"`"
|
||||||
year="${year//Date\/Time Original /}"
|
year="${year//Date\/Time Original /}"
|
||||||
year="${year// : /}"
|
year="${year// : /}"
|
||||||
year="${year//[^[:alnum:][:space:].]/}"
|
year="${year//[^[:alnum:][:space:].]/}"
|
||||||
year="`echo $year`"
|
year="`echo $year`"
|
||||||
|
year_source="DateTimeOriginal"
|
||||||
fi
|
fi
|
||||||
echo "*** Year=$year"
|
while [[ "$year" == *" "* ]]; do
|
||||||
|
year="${year// / }"
|
||||||
|
done
|
||||||
|
echo "*** Year=$year ($year_source)"
|
||||||
|
|
||||||
parent=""
|
parent=""
|
||||||
if [[ -n $year && -n $album ]]; then
|
if [[ -n $year && -n $album ]]; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user