Update vision_analyzer.py

vision_analyzer.py

@@ -170,39 +170,39 @@ def log_message(message: str):
     if len(processing_status["logs"]) > 100:
         processing_status["logs"] = processing_status["logs"][-100:]
 
-import libarchive.public
+
+import patoolib
+from patoolib.util import PatoolError
 
 def extract_with_retry(rar_path: str, output_dir: str, max_retries: int = 2) -> bool:
-    """Extract RAR file using libarchive with retry logic"""
+    """Extract RAR or ZIP file using patoolib with retry logic"""
     filename = os.path.basename(rar_path)
 
-    # Handle multipart RAR detection but don't remap paths (libarchive usually handles it if complete)
+    # Handle multi-part RARs (skip them if patoolib can't handle)
     if is_multipart_rar(filename):
         base_name = get_rar_part_base(filename)
         first_part = f"{base_name}.part01.rar"
         first_part_path = os.path.join(os.path.dirname(rar_path), first_part)
+
         if not os.path.exists(first_part_path):
             log_message(f"⚠️ Multi-part RAR detected but first part not found: {first_part}")
             return False
+
         rar_path = first_part_path
         log_message(f"📦 Processing multi-part RAR starting with: {first_part}")
 
     for attempt in range(max_retries):
         try:
-            with libarchive.public.file_reader(rar_path) as archive:
-                for entry in archive:
-                    out_path = os.path.join(output_dir, entry.pathname)
-                    os.makedirs(os.path.dirname(out_path), exist_ok=True)
-                    with open(out_path, "wb") as f:
-                        for block in entry.get_blocks():
-                            f.write(block)
-            log_message(f"✅ Successfully extracted: {os.path.basename(rar_path)}")
+            os.makedirs(output_dir, exist_ok=True)
+            patoolib.extract_archive(rar_path, outdir=output_dir, verbosity=-1)
+            log_message(f"✅ Successfully extracted: {filename} using patoolib")
             return True
+        except PatoolError as e:
+            log_message(f"⚠️ patoolib extraction attempt {attempt + 1} failed: {str(e)}")
+            time.sleep(1)
         except Exception as e:
-            log_message(f"⚠️ libarchive extraction attempt {attempt + 1} failed: {str(e)}")
+            log_message(f"❌ patoolib exception: {str(e)}")
             time.sleep(1)
-
-    log_message(f"❌ Failed to extract: {os.path.basename(rar_path)}")
     return False