From f02c1d7a0946e4d92b6deb83b858ed917cc19951 Mon Sep 17 00:00:00 2001 From: Kazuki Suzuki Przyborowski Date: Tue, 19 Nov 2024 15:32:55 -0600 Subject: [PATCH] Small update --- upcean/encode/binary.py | 4 +++- upcean/encode/codabar.py | 17 ++++------------- upcean/encode/code11.py | 4 +++- upcean/encode/code128.py | 8 ++++++-- upcean/encode/code32.py | 4 +++- upcean/encode/code39.py | 8 ++++++-- upcean/encode/code93.py | 8 ++++++-- upcean/encode/ean13.py | 4 +++- upcean/encode/ean2.py | 4 +++- upcean/encode/ean5.py | 4 +++- upcean/encode/ean8.py | 4 +++- upcean/encode/itf.py | 4 +++- upcean/encode/itf14.py | 4 +++- upcean/encode/msi.py | 4 +++- upcean/encode/plessey.py | 4 +++- upcean/encode/stf.py | 4 +++- upcean/encode/upca.py | 8 ++++++-- upcean/encode/upcavar.py | 8 ++++++-- upcean/encode/upce.py | 4 +++- 19 files changed, 73 insertions(+), 36 deletions(-) diff --git a/upcean/encode/binary.py b/upcean/encode/binary.py index c59aad31..9202b7da 100644 --- a/upcean/encode/binary.py +++ b/upcean/encode/binary.py @@ -97,8 +97,10 @@ def encode_binary_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, else: upc_img = inimage[0] upc_preimg = inimage[1] - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(not re.findall("^([0-9]*[\\.]?[0-9])", str(resize)) or int(resize) < 1): resize = 1 if(pilsupport and imageoutlib == "pillow"): diff --git a/upcean/encode/codabar.py b/upcean/encode/codabar.py index 811155ab..faf88bf6 100644 --- a/upcean/encode/codabar.py +++ b/upcean/encode/codabar.py @@ -109,19 +109,10 @@ def encode_codabar_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48 else: upc_img = inimage[0] upc_preimg = inimage[1] - imageoutlib = "pillow" - if pilsupport and isinstance(upc_img, ImageDraw.ImageDraw) and isinstance(upc_preimg, Image.Image): - imageoutlib = "pillow" - elif cairosupport and isinstance(upc_img, cairo.Context) and isinstance(upc_preimg, cairo.Surface): - imageoutlib = "cairo" - elif svgwritesupport and isinstance(upc_img, svgwrite.Drawing): - imageoutlib = "svgwrite" - elif(imageoutlib != "pillow" and imageoutlib != "cairo" and imageoutlib != "qahirah" and imageoutlib != "cairosvg" and imageoutlib != "svgwrite"): - imageoutlib = "pillow" - elif(not pilsupport and not cairosupport and not svgwritesupport): - return False - else: - return False + if(imageoutlib not in imagelibsupport and imageoutlib is not None): + imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(len(upc) < 1): return False if(barwidth[0] < 1): diff --git a/upcean/encode/code11.py b/upcean/encode/code11.py index b7eb4cc4..7b7193f2 100644 --- a/upcean/encode/code11.py +++ b/upcean/encode/code11.py @@ -107,8 +107,10 @@ def encode_code11_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, else: upc_img = inimage[0] upc_preimg = inimage[1] - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(len(upc) < 1): return False if(not re.findall("([0-9\\-]+)", upc)): diff --git a/upcean/encode/code128.py b/upcean/encode/code128.py index 2050bc0d..fedfd7e0 100644 --- a/upcean/encode/code128.py +++ b/upcean/encode/code128.py @@ -102,8 +102,10 @@ def encode_code128_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48 else: upc_img = inimage[0] upc_preimg = inimage[1] - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(len(upc) % 2): return False if(len(upc) < 8): @@ -703,8 +705,10 @@ def encode_code128old_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight= else: upc_img = inimage[0] upc_preimg = inimage[1] - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(len(upc) % 2): return False if(len(upc) < 8): diff --git a/upcean/encode/code32.py b/upcean/encode/code32.py index dab87a02..8969bc15 100644 --- a/upcean/encode/code32.py +++ b/upcean/encode/code32.py @@ -104,8 +104,10 @@ def encode_code32_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, else: upc_img = inimage[0] upc_preimg = inimage[1] - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(len(upc) < 1): return False if(not re.findall("([0-9a-zB-DF-HJ-NP-Z\\-\\.\\$\\/\\+% ]+)", upc)): diff --git a/upcean/encode/code39.py b/upcean/encode/code39.py index 4b726d63..c5a2e61c 100644 --- a/upcean/encode/code39.py +++ b/upcean/encode/code39.py @@ -104,8 +104,10 @@ def encode_code39_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, else: upc_img = inimage[0] upc_preimg = inimage[1] - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(len(upc) < 1): return False if(not re.findall("([0-9a-zA-Z\\-\\.\\$\\/\\+% ]+)", upc)): @@ -426,8 +428,10 @@ def encode_code39extended_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barhei else: upc_img = inimage[0] upc_preimg = inimage[1] - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(len(upc) < 1): return False if(not re.findall("([0-9a-zA-Z\\-\\.\\$\\/\\+% ]+)", upc)): diff --git a/upcean/encode/code93.py b/upcean/encode/code93.py index 7bc66331..c87dad1b 100644 --- a/upcean/encode/code93.py +++ b/upcean/encode/code93.py @@ -103,8 +103,10 @@ def encode_code93_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, else: upc_img = inimage[0] upc_preimg = inimage[1] - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(len(upc) < 1): return False if(not re.findall("([0-9a-zA-Z\\-\\.\\$\\/\\+% ]+)", upc)): @@ -424,8 +426,10 @@ def encode_code93extended_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barhei else: upc_img = inimage[0] upc_preimg = inimage[1] - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(len(upc) < 1): return False if(not re.findall("([0-9a-zA-Z\\-\\.\\$\\/\\+% ]+)", upc)): diff --git a/upcean/encode/ean13.py b/upcean/encode/ean13.py index 4cc21a6a..c2dd6413 100644 --- a/upcean/encode/ean13.py +++ b/upcean/encode/ean13.py @@ -115,8 +115,10 @@ def encode_ean13_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, upc_preimg = inimage[1] upc_pieces = None supplement = None - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)): upc_pieces = re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc) upc_pieces = upc_pieces[0] diff --git a/upcean/encode/ean2.py b/upcean/encode/ean2.py index c6dcfd23..7d238585 100644 --- a/upcean/encode/ean2.py +++ b/upcean/encode/ean2.py @@ -99,8 +99,10 @@ def encode_ean2_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 5 else: upc_img = inimage[0] upc_preimg = inimage[1] - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(len(upc) > 2 or len(upc) < 2): return False upc_matches = re.findall("(\\d{2})", upc) diff --git a/upcean/encode/ean5.py b/upcean/encode/ean5.py index 1eef4692..9be98815 100644 --- a/upcean/encode/ean5.py +++ b/upcean/encode/ean5.py @@ -100,8 +100,10 @@ def encode_ean5_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 5 else: upc_img = inimage[0] upc_preimg = inimage[1] - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(len(upc) > 5 or len(upc) < 5): return False upc_matches = re.findall("(\\d{5})", upc) diff --git a/upcean/encode/ean8.py b/upcean/encode/ean8.py index 79d8b7f8..fa09939e 100644 --- a/upcean/encode/ean8.py +++ b/upcean/encode/ean8.py @@ -115,8 +115,10 @@ def encode_ean8_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 5 upc_preimg = inimage[1] upc_pieces = None supplement = None - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)): upc_pieces = re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc) upc_pieces = upc_pieces[0] diff --git a/upcean/encode/itf.py b/upcean/encode/itf.py index c537cef4..c3680de0 100644 --- a/upcean/encode/itf.py +++ b/upcean/encode/itf.py @@ -107,8 +107,10 @@ def encode_itf_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 54 else: upc_img = inimage[0] upc_preimg = inimage[1] - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(len(upc) % 2): return False if(len(upc) < 6): diff --git a/upcean/encode/itf14.py b/upcean/encode/itf14.py index 78e80be5..646b4cb9 100644 --- a/upcean/encode/itf14.py +++ b/upcean/encode/itf14.py @@ -107,8 +107,10 @@ def encode_itf14_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, else: upc_img = inimage[0] upc_preimg = inimage[1] - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(len(upc) % 2): return False if(len(upc) < 6): diff --git a/upcean/encode/msi.py b/upcean/encode/msi.py index 0555d87c..94042885 100644 --- a/upcean/encode/msi.py +++ b/upcean/encode/msi.py @@ -101,8 +101,10 @@ def encode_msi_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 54 else: upc_img = inimage[0] upc_preimg = inimage[1] - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(len(upc) < 1): return False if(not re.findall("([0-9]+)", upc)): diff --git a/upcean/encode/plessey.py b/upcean/encode/plessey.py index 959347d9..0a15ca3e 100644 --- a/upcean/encode/plessey.py +++ b/upcean/encode/plessey.py @@ -104,8 +104,10 @@ def encode_plessey_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48 else: upc_img = inimage[0] upc_preimg = inimage[1] - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(len(upc) < 1): return False if(not re.findall("([0-9a-fA-F]+)", upc)): diff --git a/upcean/encode/stf.py b/upcean/encode/stf.py index 417952f1..1490d085 100644 --- a/upcean/encode/stf.py +++ b/upcean/encode/stf.py @@ -107,8 +107,10 @@ def encode_stf_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 54 else: upc_img = inimage[0] upc_preimg = inimage[1] - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(len(upc) % 2): return False if(len(upc) < 6): diff --git a/upcean/encode/upca.py b/upcean/encode/upca.py index d5217f39..09c44bb1 100644 --- a/upcean/encode/upca.py +++ b/upcean/encode/upca.py @@ -113,8 +113,10 @@ def encode_upca_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 5 upc_preimg = inimage[1] upc_pieces = None supplement = None - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)): upc_pieces = re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc) upc_pieces = upc_pieces[0] @@ -510,8 +512,10 @@ def encode_upcaean_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48 upc_preimg = inimage[1] upc_pieces = None supplement = None - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)): upc_pieces = re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc) upc_pieces = upc_pieces[0] diff --git a/upcean/encode/upcavar.py b/upcean/encode/upcavar.py index 5735460a..e3ada4fa 100644 --- a/upcean/encode/upcavar.py +++ b/upcean/encode/upcavar.py @@ -117,8 +117,10 @@ def encode_upcavar_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48 upc_preimg = inimage[1] upc_pieces = None supplement = None - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)): upc_pieces = re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc) upc_pieces = upc_pieces[0] @@ -521,8 +523,10 @@ def encode_upcaeanvar_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight= upc_preimg = inimage[1] upc_pieces = None supplement = None - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)): upc_pieces = re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc) upc_pieces = upc_pieces[0] diff --git a/upcean/encode/upce.py b/upcean/encode/upce.py index b659ee51..06fa3d7f 100644 --- a/upcean/encode/upce.py +++ b/upcean/encode/upce.py @@ -117,8 +117,10 @@ def encode_upce_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 5 upc_preimg = inimage[1] upc_pieces = None supplement = None - if(imageoutlib not in imagelibsupport): + if(imageoutlib not in imagelibsupport and imageoutlib is not None): imageoutlib = defaultdraw + if(imageoutlib is not None): + inimage = None if(re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc)): upc_pieces = re.findall("([0-9]+)([ |\\|]{1})([0-9]{2})$", upc) upc_pieces = upc_pieces[0]