From 1beb7dac5a29160e2c068fb1efb28e25d31a64cf Mon Sep 17 00:00:00 2001 From: iron Date: Wed, 10 Oct 2018 20:57:31 +0100 Subject: [PATCH] added md5compare --- rename.sh | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/rename.sh b/rename.sh index 9dc617d..e91dbf4 100644 --- a/rename.sh +++ b/rename.sh @@ -3,6 +3,18 @@ NOEXIF='no_exif' MD5MATCH='md5_collision' DUPLICATE='duplicate' +md5compare() { + file1md5=$(md5sum "$1" | awk '{print $1}') + echo $2 + file2md5=$(md5sum "$2" | awk '{print $1}') + if [ "$file1md5" == "$file2md5" ]; then + echo "md5 clash" + mv $2 $MD5MATCH/$2 + else + return 1 + fi +} + if [ ! -d $MD5MATCH ] then mkdir $MD5MATCH @@ -28,7 +40,6 @@ do #if ext = jpeg JPG jpg name = jpg folder="$(exiftool -d "%Y-%m" -CreateDate "$f" | awk '{print $4}')" filename="$(exiftool -d "%Y%-m-%d_%H-%M-%S" -CreateDate "$f" | awk '{print $4".jpg"}')" - #mv -n "$f" "$(exiftool -d "%Y%m%d_%H%M%S" -CreateDate "$f" | awk '{print $4".jpg"}')" echo $f if [[ -n $folder ]] @@ -43,12 +54,10 @@ do echo $folder/$filename mv "$f" "$folder/$filename" else - if [[ ! -d $DUPLICATE/$folder ]] - then - mkdir $DUPLICATE/$folder + if ! md5compare "$folder/$filename" "$f"; then + echo $DUPLICATE/$folder/$filename + mv "$f" "$DUPLICATE/$f" fi - echo $DUPLICATE/$folder/$filename - mv "$f" "$DUPLICATE/$f" fi else echo "move to noexif"