error codes updated in scripts.

main
Robert 8 months ago
parent cd6d495443
commit 3f6e6e4e0c
  1. 2
      .gitignore
  2. 2
      dedup.py
  3. 10
      get_dups.bat
  4. 13
      get_dups.sh

2
.gitignore vendored

@ -1,2 +1,4 @@
myenv
dups.txt
alike.txt
invalid.txt

@ -430,7 +430,7 @@ def quick_file_hash(file_path):
if __name__ == "__main__":
if len(sys.argv) < 3:
print("Usage: python3 dedup.py file1.jpg file2.jpg")
sys.exit(1)
sys.exit(3)
file1 = sys.argv[1]
file2 = sys.argv[2]

@ -36,10 +36,18 @@ for /l %%i in (1,1,%count%) do (
echo.
python dedup.py "%~1\!outer_image!" "%~1\!inner_image!"
set exit_code=!errorlevel!
if !exit_code! gtr 0 if !exit_code! leq 2 (
if !errorlevel! equ 1 (
echo %~1\!outer_image!>> dups.txt
goto :break_inner
)
if !errorlevel! equ 2 (
echo %~1\!outer_image!>> alike.txt
goto :break_inner
)
if !errorlevel! equ 8 (
echo %~1\!outer_image!>> invalid.txt
goto :break_inner
)
)
:break_inner
)

@ -31,9 +31,18 @@ for ((i = 0; i < ${#images[@]}; i++)); do
echo -e "Compairing files: $outer_image TO $inner_image \n"
python3 dedup.py "$1/$outer_image" "$1/$inner_image"
exit_code=$?
if [ $exit_code -gt 0 ] && [ "$exit_code" -le 2 ]; then
echo "$1/$outer_image" >> dups.txt
if [ $exit_code -eq 1 ]; then
echo "$1/$outer_image # $inner_image" >> dups.txt
break # No need to check more once found duplicate
fi
if [ $exit_code -eq 2 ]; then
echo "$1/$outer_image # $inner_image" >> alike.txt
break # No need to check more once found close match to duplicate
fi
if [ $exit_code -eq 8 ]; then
echo "$1/$outer_image # $inner_image" >> invalid.txt
break # No need to check more once found bad image
fi
done
done

Loading…
Cancel
Save