Small update

upcean/encode/binary.py

@@ -230,5 +230,5 @@ def create_binary_barcode(upc, outfile="./binary.png", resize=1, barheight=(48,
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, upc['type']+"; "+upc['upc'])
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, upc['type']+"; "+upc['upc'])
     return True

upcean/encode/codabar.py

@@ -362,5 +362,5 @@ def create_codabar_barcode(upc, outfile="./codabar.png", resize=1, barheight=(48
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "codabar; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "codabar; "+upc, imageoutlib)
     return True

upcean/encode/code11.py

@@ -338,5 +338,5 @@ def create_code11_barcode(upc, outfile="./code11.png", resize=1, barheight=(48,
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code11; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code11; "+upc, imageoutlib)
     return True

upcean/encode/code128.py

@@ -675,7 +675,7 @@ def create_code128_barcode(upc, outfile="./code128.png", resize=1, barheight=(48
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code128; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code128; "+upc, imageoutlib)
     return True
 
 
@@ -1219,5 +1219,5 @@ def create_code128old_barcode(upc, outfile="./code128.png", resize=1, barheight=
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code128; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code128; "+upc, imageoutlib)
     return True

upcean/encode/code32.py

@@ -364,5 +364,5 @@ def create_code32_barcode(upc, outfile="./code32.png", resize=1, barheight=(48,
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code32; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code32; "+upc, imageoutlib)
     return True

upcean/encode/code39.py

@@ -397,7 +397,7 @@ def create_code39_barcode(upc, outfile="./code39.png", resize=1, barheight=(48,
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code39; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code39; "+upc, imageoutlib)
     return True
 
 def get_code39extended_barcode_size(upc, resize=1, shiftxy=(0, 0), barheight=(48, 54), barwidth=(1, 1)):
@@ -759,5 +759,5 @@ def create_code39extended_barcode(upc, outfile="./code39.png", resize=1, barheig
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code39; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code39; "+upc, imageoutlib)
     return True

upcean/encode/code93.py

@@ -395,7 +395,7 @@ def create_code93_barcode(upc, outfile="./code93.png", resize=1, barheight=(48,
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code93; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code93; "+upc, imageoutlib)
     return True
 
 
@@ -754,5 +754,5 @@ def create_code93extended_barcode(upc, outfile="./code93.png", resize=1, barheig
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code39; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "code39; "+upc, imageoutlib)
     return True

upcean/encode/ean13.py

@@ -548,5 +548,5 @@ def create_ean13_barcode(upc, outfile="./ean13.png", resize=1, barheight=(48, 54
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "ean13; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "ean13; "+upc, imageoutlib)
     return True

upcean/encode/ean2.py

@@ -341,7 +341,7 @@ def create_ean2sup_barcode(upc, outfile="./ean2.png", resize=1, barheight=(48, 5
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "ean2; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "ean2; "+upc, imageoutlib)
     return True
 
 def draw_upc2sup_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw):
@@ -413,7 +413,7 @@ def create_ean2_barcode(upc, outfile="./ean2.png", resize=1, barheight=(48, 54),
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "ean2; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "ean2; "+upc, imageoutlib)
     return True
 
 def encode_upc2_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False)):

upcean/encode/ean5.py

@@ -429,7 +429,7 @@ def create_ean5sup_barcode(upc, outfile="./ean5.png", resize=1, barheight=(48, 5
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "ean5; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "ean5; "+upc, imageoutlib)
     return True
 
 def draw_upc5sup_barcode(upc, resize=1, barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False), imageoutlib=defaultdraw):
@@ -501,7 +501,7 @@ def create_ean5_barcode(upc, outfile="./ean5.png", resize=1, barheight=(48, 54),
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "ean5; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "ean5; "+upc, imageoutlib)
     return True
 
 def encode_upc5_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False)):

upcean/encode/ean8.py

@@ -555,5 +555,5 @@ def create_ean8_barcode(upc, outfile="./ean8.png", resize=1, barheight=(48, 54),
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "ean8; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "ean8; "+upc, imageoutlib)
     return True

upcean/encode/itf.py

@@ -407,5 +407,5 @@ def create_itf_barcode(upc, outfile="./itf.png", resize=1, barheight=(48, 54), b
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "itf; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "itf; "+upc, imageoutlib)
     return True

upcean/encode/itf14.py

@@ -415,7 +415,7 @@ def create_itf14_barcode(upc, outfile="./itf14.png", resize=1, barheight=(48, 54
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "itf14; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "itf14; "+upc, imageoutlib)
     return True
 
 def encode_itf6_barcode(inimage, upc, resize=1, shiftxy=(0, 0), barheight=(48, 54), barwidth=(1, 1), barcolor=((0, 0, 0), (0, 0, 0), (255, 255, 255)), hideinfo=(False, False, False)):

upcean/encode/msi.py

@@ -301,5 +301,5 @@ def create_msi_barcode(upc, outfile="./msi.png", resize=1, barheight=(48, 54), b
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "msi; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "msi; "+upc, imageoutlib)
     return True

upcean/encode/plessey.py

@@ -330,5 +330,5 @@ def create_plessey_barcode(upc, outfile="./plessey.png", resize=1, barheight=(48
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "plessey; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "plessey; "+upc, imageoutlib)
     return True

upcean/encode/stf.py

@@ -346,6 +346,6 @@ def create_stf_barcode(upc, outfile="./stf.png", resize=1, barheight=(48, 54), b
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "stf; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "stf; "+upc, imageoutlib)
     return True
 

upcean/encode/upca.py

@@ -485,7 +485,7 @@ def create_upca_barcode(upc, outfile="./upca.png", resize=1, barheight=(48, 54),
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "upca; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "upca; "+upc, imageoutlib)
     return True
 
 def get_upcaean_barcode_size(upc, resize=1, shiftxy=(0, 0), barheight=(48, 54), barwidth=(1, 1)):
@@ -910,5 +910,5 @@ def create_upcaean_barcode(upc, outfile="./upca.png", resize=1, barheight=(48, 5
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "upca; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "upca; "+upc, imageoutlib)
     return True

upcean/encode/upcavar.py

@@ -493,7 +493,7 @@ def create_upcavar_barcode(upc, outfile="./upca.png", resize=1, barheight=(48, 5
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "upcavar; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "upcavar; "+upc, imageoutlib)
     return True
 
 def get_upcaeanvar_barcode_size(upc, resize=1, shiftxy=(0, 0), barheight=(48, 54), barwidth=(1, 1)):
@@ -925,5 +925,5 @@ def create_upcaeanvar_barcode(upc, outfile="./upca.png", resize=1, barheight=(48
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "upcavar; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "upcavar; "+upc, imageoutlib)
     return True

upcean/encode/upce.py

@@ -571,5 +571,5 @@ def create_upce_barcode(upc, outfile="./upce.png", resize=1, barheight=(48, 54),
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, imageoutlib]
     else:
-        upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "upce; "+upc, imageoutlib)
+        return upcean.predraw.save_to_file([upc_img, upc_preimg], outfile, outfileext, "upce; "+upc, imageoutlib)
     return True

upcean/predraw/__init__.py

@@ -438,7 +438,7 @@ def save_to_filename(imgout, outfile, imgcomment="barcode"):
         imageoutlib = None
     elif(imgout == "none" or imgout is None):
         return False
-    elif(not pilsupport and not cairosupport and not svgwritesupport):
+    elif(not pilsupport and not cairosupport and not qahirahsupport and not svgwritesupport):
         return False
     else:
         return False
@@ -463,6 +463,5 @@ def save_to_filename(imgout, outfile, imgcomment="barcode"):
             if(cairosupport and imageoutlib == "cairosvg" and outfileext != "SVG"):
                 imageoutlib = "cairo"
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
-        return [upc_img, upc_preimg, imageoutlib]
-    save_to_file(imgout, outfile, outfileext, imgcomment, imageoutlib)
-    return True
+        return [upc_img, upc_preimg, imageoutlib] 
+    return save_to_file(imgout, outfile, outfileext, imgcomment, imageoutlib)

upcean/predraw/precairo.py

@@ -255,7 +255,7 @@ def get_save_filename(outfile):
         return outfile
 
     # Handle file objects directly
-    if isinstance(outfile, file):
+    if isinstance(outfile, file) or outfile=="-":
         return (outfile, "PNG")
 
     # Handle string types
@@ -336,9 +336,13 @@ def save_to_file(inimage, outfile, outfileext, imgcomment="barcode"):
     upc_preimg = inimage[1]
     x, y, width, height = upc_preimg.ink_extents()
     uploadfile = None
+    outfiletovar = False
     if(re.findall("^(ftp|ftps|sftp):\\/\\/", str(outfile))):
         uploadfile = outfile
         outfile = BytesIO()
+    elif(outfile=="-"):
+        outfiletovar = True
+        outfile = BytesIO()
     if(outfileext == "SVG"):
         # Create an ImageSurface with the exact dimensions of the recorded content
         image_surface = cairo.SVGSurface(outfile, int(width), int(height))
@@ -394,6 +398,11 @@ def save_to_file(inimage, outfile, outfileext, imgcomment="barcode"):
         outfile.seek(0, 0)
         upload_file_to_internet_file(outfile, uploadfile)
         outfile.close()
+    elif(outfiletovar):
+        outfile.seek(0, 0)
+        outbyte = outfile.read()
+        outfile.close()
+        return outbyte
     return True
 
 def save_to_filename(imgout, outfile, imgcomment="barcode"):
@@ -412,6 +421,5 @@ def save_to_filename(imgout, outfile, imgcomment="barcode"):
             outfileext = oldoutfile[1]
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, "cairo"]
-    save_to_file(imgout, outfile, outfileext, imgcomment)
-    return True
+    return save_to_file(imgout, outfile, outfileext, imgcomment)
 

upcean/predraw/premagick.py

@@ -87,41 +87,33 @@ def get_save_filename(outfile):
     Returns:
         tuple: (filename, EXTENSION) or False if invalid.
     """
-    if outfile is None or isinstance(outfile, bool):
+    if outfile is None or isinstance(outfile, bool) or outfile=="-":
         return outfile
-
     if isinstance(outfile, str):
         outfile = outfile.strip()
         if outfile in ["-", ""]:
             return (outfile, None)
-
         base, ext = os.path.splitext(outfile)
         ext = ext[1:].upper() if ext else None
-
         if ext and ext in PYTHONMAGICK_SUPPORTED_EXTENSIONS:
             return (outfile, PYTHONMAGICK_SUPPORTED_EXTENSIONS[ext])
         elif ext:
             return (outfile, "PNG")
         return (outfile, "PNG")
-
     if isinstance(outfile, (tuple, list)):
         if len(outfile) != 2:
             return False
-
         filename, ext = outfile
         if isinstance(filename, str):
             filename = filename.strip()
         else:
             return False
-
         ext = ext.strip().upper()
         if ext in PYTHONMAGICK_SUPPORTED_EXTENSIONS:
             ext = PYTHONMAGICK_SUPPORTED_EXTENSIONS[ext]
         else:
             ext = "PNG"
-
         return (filename, ext)
-
     return False
 
 def get_save_file(outfile):
@@ -147,5 +139,4 @@ def save_to_filename(imgout, outfile, imgcomment="barcode"):
             outfileext = oldoutfile[1]
     if oldoutfile is None or isinstance(oldoutfile, bool):
         return [imgout, "pythonmagick"]
-    save_to_file(imgout, outfile, outfileext, imgcomment)
-    return True
+    return save_to_file(imgout, outfile, outfileext, imgcomment)

upcean/predraw/prepil.py

@@ -140,7 +140,7 @@ def get_save_filename(outfile):
         return outfile
 
     # Handle file objects directly (using the cross-version file compatibility you've defined)
-    if isinstance(outfile, file):
+    if isinstance(outfile, file) or outfile=="-":
         return (outfile, "PNG")
 
     # Handle string types
@@ -244,9 +244,13 @@ def save_to_file(inimage, outfile, outfileext, imgcomment="barcode"):
     else:
         exargdict = {'comment': imgcomment}
     uploadfile = None
+    outfiletovar = False
     if(re.findall("^(ftp|ftps|sftp):\\/\\/", str(outfile))):
         uploadfile = outfile
         outfile = BytesIO()
+    elif(outfile=="-"):
+        outfiletovar = True
+        outfile = BytesIO()
     if outfileext == "XPM":
         # XPM supports only palette-based images ("P" mode)
         upc_preimg.convert(mode="P").save(outfile, outfileext, **exargdict)
@@ -279,6 +283,11 @@ def save_to_file(inimage, outfile, outfileext, imgcomment="barcode"):
         outfile.seek(0, 0)
         upload_file_to_internet_file(outfile, uploadfile)
         outfile.close()
+    elif(outfiletovar):
+        outfile.seek(0, 0)
+        outbyte = outfile.read()
+        outfile.close()
+        return outbyte
     return True
 
 def save_to_filename(imgout, outfile, imgcomment="barcode"):
@@ -297,5 +306,4 @@ def save_to_filename(imgout, outfile, imgcomment="barcode"):
             outfileext = oldoutfile[1]
     if(oldoutfile is None or isinstance(oldoutfile, bool)):
         return [upc_img, upc_preimg, "pillow"]
-    save_to_file(imgout, outfile, outfileext, imgcomment)
-    return True
+    return save_to_file(imgout, outfile, outfileext, imgcomment)