ByoungSooPark/git-diff-image
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't perform the first call to compare if we've seen a difference

Browse Source 
in the EXIF info.

This means that we won't run the (potentially expensive) first compare if we
have seen a metadata change, in particular a file size change.  We already
know that there's a difference.
This commit is contained in:
Ewan Mellor
2019-04-10 18:21:00 -07:00
parent fbd9755105
commit b7cce75c3f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
diff-image
View File

@ -132,11 +132,16 @@ diff_clean_names()
} }
exifdiff=
if which exiftool > /dev/null if which exiftool > /dev/null
then then
d1="$(exif "$f1")" d1="$(exif "$f1")"
d2="$(exif "$f2")" d2="$(exif "$f2")"
diff_clean_names "$d1" "$d2" diff_clean_names "$d1" "$d2"
set +e
diff -q "$d1" "$d2" >/dev/null
exifdiff=$?
set -e
else else
diff_clean_names "$f1" "$f2" diff_clean_names "$f1" "$f2"
fi fi
@ -154,7 +159,7 @@ then
exit 1 exit 1
fi fi
if compare "$f1" "$f2" /dev/null if [[ $exifdiff = 0 ]] && compare "$f1" "$f2" /dev/null
then then
exit 0 exit 0
fi fi