b

app.py

@@ -4,7 +4,7 @@ import threading
 import queue
 import pdf2image
 from brother_ql.conversion import convert
-from brother_ql.backends.helpers import send, status
+from brother_ql.backends.helpers import send
 from brother_ql.raster import BrotherQLRaster
 from PIL import Image
 import mimetypes
@@ -14,34 +14,20 @@ import time
 
 app = Flask(__name__)
 
-printer_busy = False
-
 # Set up logging
 log_file = 'log.txt'
-
-# Create a rotating file handler for logging
 log_handler = RotatingFileHandler(log_file, maxBytes=10*1024*1024, backupCount=5)  # 10MB per log file, keep 5 backups
-log_handler.setLevel(logging.DEBUG)
+log_handler.setLevel(logging.INFO)
 log_formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
 log_handler.setFormatter(log_formatter)
-
-# Add the log handler to the Flask app's logger
 app.logger.addHandler(log_handler)
 
-# Ensure Flask app uses our logger, not its default one
-app.logger.setLevel(logging.DEBUG)
-
 # Create a queue to hold the files for processing
 file_queue = queue.Queue()
-image_queue = queue.Queue()
-
-lock = threading.Lock()
 
 # Directory to save uploaded files (you can modify this path)
 UPLOAD_FOLDER = './uploads'
-IMAGE_FOLDER = './images'
 os.makedirs(UPLOAD_FOLDER, exist_ok=True)
-os.makedirs(IMAGE_FOLDER, exist_ok=True)
 
 # Printer configuration
 printer_model = "QL-1100"
@@ -49,27 +35,26 @@ backend = 'pyusb'
 printer = 'usb://0x04f9:0x20a7'
 
 # Convert PDF to image
-def convert_pdf_to_images(pdf_path):
+def convert_pdf_to_image(pdf_path):
     """Converts a PDF to a PIL Image"""
     try:
+        # Convert PDF to image (get the first page)
         images = pdf2image.convert_from_path(pdf_path)
         if images:
-            return images
+            return images[0]  # We will only print the first page for now
         return None
     except Exception as e:
         app.logger.error(f"Error converting PDF: {str(e)}")
         return None
 
 # Function to print address labels
-def print_address_label(image, pdf_path):
+def print_address_label(pdf_path):
     try:
-        if 'address' in pdf_path.lower():
-            target_width = 1660
-            target_height = 1164
-            image = image.convert("RGB")
-            image = image.resize((target_width, target_height), Image.LANCZOS)
-            image = image.rotate(90, expand=True)
-        else:
+        # Convert PDF to image
+        image = convert_pdf_to_image(pdf_path)
+        if not image:
+            raise Exception("Failed to create label images")
+    
         target_width = 1164
         target_height = 1660
         image = image.convert("RGB")
@@ -81,7 +66,7 @@ def print_address_label(image, pdf_path):
         app.logger.info("Converting image to printer instructions...")
         instructions = convert(
             qlr=qlr,
-            images=[image],
+            images=[image],  # Pass as a list with the single image
             label='102x152',
             threshold=70.0,
             dither=False,
@@ -93,79 +78,34 @@ def print_address_label(image, pdf_path):
         )
 
         app.logger.info("Sending to printer...")
-        status = send(
+        send(
             instructions=instructions, 
             printer_identifier=printer, 
             backend_identifier=backend, 
             blocking=True
         )
-        app.logger.info(f"Printer status: {status}")
         app.logger.info("Print job sent successfully")
         
     except Exception as e:
         app.logger.error(f"Error during printing: {str(e)}")
 
-def save_images(images, pdf_path):
-    uuid = str(int(time.time()))
-    for i, image in enumerate(images):
-        if 'address' in pdf_path.lower():
-            image.save(os.path.join(IMAGE_FOLDER, f"address_label_{uuid}_{i}.png"), "PNG")
-        elif 'packing' in pdf_path.lower():
-            image.save(os.path.join(IMAGE_FOLDER, f"shipping_label_{uuid}_{i}.png"), "PNG")
-        else:
-            image.save(os.path.join(IMAGE_FOLDER, f"unknown_{uuid}_{i}.png"), "PNG")
-        image_queue.put((image, pdf_path))
-
 # Worker thread that processes files from the queue
-def file_worker():
-    global printer_busy
+def process_queue():
     while True:
+        # Wait until a file is available in the queue
         file_path = file_queue.get()
         if file_path is None:  # Shutdown signal
             break
-        while printer_busy:
-            time.sleep(1)
+        # Process the file (convert and print)
         app.logger.info(f"Processing file: {file_path}")
-        images = convert_pdf_to_images(file_path)
-        if images:
-            save_images(images, file_path)
-        else:
-            app.logger.error(f"Failed to convert PDF to images: {file_path}")
+        print_address_label(file_path)
+        time.sleep(10)
+        # Signal that the task is done
         file_queue.task_done()
 
-# Printer worker
-def printer_worker():
-    global printer_busy
-    while True:
-        image, path = image_queue.get()
-        if image is None:
-            if printer_busy:
-                time.sleep(10)
-                printer_busy = False
-            break
-        with lock:
-            printer_busy = True
-            print_address_label(image, path)
-        image_queue.task_done()
-
-# Variable to track the printer worker thread
-printer_worker_thread = None
-
-# Ensure only one printer worker is created
-def start_printer_worker():
-    global printer_worker_thread
-    if printer_worker_thread is None or not printer_worker_thread.is_alive():
-        app.logger.info("Starting printer worker thread.")
-        printer_worker_thread = threading.Thread(target=printer_worker, daemon=True)
-        printer_worker_thread.start()
-    else:
-        app.logger.info("Printer worker thread already running.")
-
-# Start the file worker thread
-threading.Thread(target=file_worker, daemon=True).start()
-
-# Start the printer worker only once
-start_printer_worker()
+# Start the worker thread
+thread = threading.Thread(target=process_queue, daemon=True)
+thread.start()
 
 @app.route('/upload', methods=['POST'])
 def upload_file():