diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..eba74f4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +venv/ \ No newline at end of file diff --git a/paperbackup.py b/paperbackup.py index a99fe38..0d3a425 100755 --- a/paperbackup.py +++ b/paperbackup.py @@ -32,7 +32,7 @@ import sys import hashlib import subprocess -import qrencode +import qrcode from tempfile import mkstemp from datetime import datetime from PIL import Image @@ -57,10 +57,16 @@ def create_barcode(chunkdata): - version, size, im = qrencode.encode(chunkdata, - level=qrencode.QR_ECLEVEL_H, - case_sensitive=True) - return im + qr = qrcode.QRCode( + version=1, + error_correction=qrcode.constants.ERROR_CORRECT_Q, + box_size=10, + border=4, + ) + qr.add_data(chunkdata) + qr.make(fit=True) + img = qr.make_image(fill_color="black", back_color="white") + return img def finish_page(pdf, canv, pageno): diff --git a/paperrestore.sh b/paperrestore.sh index ab0fa1d..a729afd 100755 --- a/paperrestore.sh +++ b/paperrestore.sh @@ -11,13 +11,13 @@ if [ -z "$SCANNEDFILE" ]; then exit 1 fi -if ! [ -f "$SCANNEDFILE" ]; then +if [ ! -f "$SCANNEDFILE" ]; then echo "$SCANNEDFILE is not a file" exit 1 fi -if [ ! -x "/usr/bin/zbarimg" ]; then - echo "/usr/bin/zbarimg missing" +if [ ! -x "$(command -v zbarimg)" ]; then + echo "zbarimg missing" exit 2 fi @@ -27,7 +27,7 @@ fi # so convert that to \0, so sort can sort on that # then remove all \n\0 so we get the originial without newlines added -/usr/bin/zbarimg --raw -Sdisable -Sqrcode.enable "$SCANNEDFILE" \ +zbarimg --raw -Sdisable -Sqrcode.enable "$SCANNEDFILE" \ | sed -e "s/\^/\x0/g" \ | sort -z -n \ | sed ':a;N;$!ba;s/\n\x0[0-9]* //g;s/\x0[0-9]* //g;s/\n\x0//g'