Update vision_analyzer.py

vision_analyzer.py

@@ -46,6 +46,9 @@ from transformers import AutoProcessor, AutoModelForCausalLM
 
 # setup_unrar()
 
+rarfile.UNRAR_TOOL = None  # Forces use of internal Python extractor
+rarfile.PATH_SEP = '/'     # Safe default
+
 def log_message(message: str):
     """Log messages with timestamp"""
     timestamp = time.strftime("%Y-%m-%d %H:%M:%S")
@@ -59,33 +62,7 @@ def log_message(message: str):
 
 
 
-# Initialize rarfile with correct paths
-import os
-import shutil
-import rarfile
-
-# Try to detect unrar
-unrar_path = shutil.which("unrar")
-
-# Fallback to common paths
-if not unrar_path:
-    possible_unrar_paths = [
-        "/usr/bin/unrar",
-        "/usr/local/bin/unrar",
-        "/bin/unrar",
-        "/app/bin/unrar"
-    ]
-    for path in possible_unrar_paths:
-        if os.path.isfile(path) and os.access(path, os.X_OK):
-            unrar_path = path
-            break
 
-# Assign to rarfile
-if unrar_path:
-    rarfile.UNRAR_TOOL = unrar_path
-else:
-    rarfile.UNRAR_TOOL = None  # Use built-in (limited) parser
-    print("⚠️ 'unrar' is not installed. Some RAR files may not extract properly.")
 
 
 # Attempt to install flash-attn
@@ -194,44 +171,25 @@ def log_message(message: str):
         processing_status["logs"] = processing_status["logs"][-100:]
 
 def extract_with_retry(rar_path: str, output_dir: str, max_retries: int = 2) -> bool:
-    """Extract RAR with retry and recovery, handling multi-part archives"""
-    filename = os.path.basename(rar_path)
-    
+    """Extract RAR file using rarfile module with retry logic"""
+    from rarfile import RarFile, BadRarFile
+
     for attempt in range(max_retries):
         try:
-            # Try with rarfile first
-            with rarfile.RarFile(rar_path) as rf:
-                rf.extractall(output_dir)
+            with RarFile(rar_path) as rf:
+                rf.extractall(path=output_dir)
+            log_message(f"✅ Successfully extracted: {os.path.basename(rar_path)}")
             return True
-            
-        except rarfile.NeedFirstVolume:
-            # Handle multi-part RARs
-            base_name = filename.split(".part")[0] if ".part" in filename else filename.replace(".rar", "")
-            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
-                
-            with rarfile.RarFile(first_part_path) as rf:
-                rf.extractall(output_dir)
-            return True
-            
+        except BadRarFile as brf:
+            log_message(f"❌ Bad RAR file: {brf}")
+            return False
         except Exception as e:
-            if attempt == max_retries - 1:
-                # Final fallback to patool
-                try:
-                    import patoolib
-                    patoolib.extract_archive(rar_path, outdir=output_dir)
-                    return True
-                except Exception as patool_error:
-                    log_message(f"❌ All extraction methods failed: {str(patool_error)}")
-                    return False
+            log_message(f"⚠️ Extraction attempt {attempt + 1} failed: {str(e)}")
             time.sleep(1)
     
     return False
 
+
 def log_failed_file(filename: str, error: str):
     """Log failed files to persistent file"""
     with open(FAILED_FILES_LOG, "a") as f: