Update app.py

app.py

@@ -1,124 +1,117 @@
 import os
+import json
 import tempfile
 import subprocess
-from fastapi import FastAPI
+from fastapi import FastAPI, Query
+import py7zr
 
-app = FastAPI(title="Hitek Archive Inspector", developer="Gopal Parmar")
+app = FastAPI(title="Hitek Archive Extractor", developer="Gopal Parmar")
 
 MOUNT_PATH = "/data/"
 TEST_FILE = "Hitek01.7z"
 
+def extract_with_7z(filepath):
+    """Try extracting with system 7z"""
+    try:
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            result = subprocess.run(
+                ["7z", "x", filepath, f"-o{tmp_dir}", "-y"],
+                capture_output=True,
+                timeout=120
+            )
+            if result.returncode == 0:
+                for root, dirs, files in os.walk(tmp_dir):
+                    for file in files:
+                        file_path = os.path.join(root, file)
+                        with open(file_path, 'r', encoding='utf-8', errors='ignore') as f:
+                            return file, f.read()
+            return None, None
+    except:
+        return None, None
+
+def extract_with_py7zr(filepath):
+    """Try extracting with py7zr"""
+    try:
+        with py7zr.SevenZipFile(filepath, mode='r') as archive:
+            with tempfile.TemporaryDirectory() as tmp_dir:
+                archive.extract(path=tmp_dir)
+                for root, dirs, files in os.walk(tmp_dir):
+                    for file in files:
+                        file_path = os.path.join(root, file)
+                        with open(file_path, 'r', encoding='utf-8', errors='ignore') as f:
+                            return file, f.read()
+    except:
+        pass
+    return None, None
+
 @app.get("/")
 async def root():
     return {
-        "message": "🔍 Hitek Archive Inspector",
+        "message": "🔍 Hitek Archive Extractor",
         "developer": "Gopal Parmar",
         "endpoints": {
-            "/type": "Detect file type",
-            "/list": "List files inside archive",
-            "/preview": "Preview first file contents"
+            "/extract": "Extract and show content",
+            "/search?q=9999999998": "Search in extracted JSON"
         }
     }
 
-@app.get("/type")
-async def file_type():
+@app.get("/extract")
+async def extract():
     filepath = os.path.join(MOUNT_PATH, TEST_FILE)
     if not os.path.exists(filepath):
         return {"error": f"File {TEST_FILE} not found"}
     
-    with open(filepath, 'rb') as f:
-        header = f.read(50)
+    # Try 7z first
+    filename, content = extract_with_7z(filepath)
+    if filename:
+        return {
+            "developer": "Gopal Parmar",
+            "method": "7z",
+            "file_name": filename,
+            "content_preview": content[:500],
+            "content_length": len(content)
+        }
     
-    # Magic bytes
-    if header.startswith(b'PK'):
-        file_type = "ZIP"
-    elif header.startswith(b'Rar!'):
-        file_type = "RAR"
-    elif header.startswith(b'7z'):
-        file_type = "7ZIP"
-    else:
-        file_type = "UNKNOWN"
+    # Try py7zr
+    filename, content = extract_with_py7zr(filepath)
+    if filename:
+        return {
+            "developer": "Gopal Parmar",
+            "method": "py7zr",
+            "file_name": filename,
+            "content_preview": content[:500],
+            "content_length": len(content)
+        }
     
-    return {
-        "developer": "Gopal Parmar",
-        "file": TEST_FILE,
-        "detected_type": file_type,
-        "magic_bytes_hex": header.hex(),
-        "file_size_mb": round(os.path.getsize(filepath) / (1024**2), 2)
-    }
+    return {"error": "Extraction failed with both methods"}
 
-@app.get("/list")
-async def list_files():
+@app.get("/search")
+async def search(q: str = Query(..., min_length=4), limit: int = 10):
     filepath = os.path.join(MOUNT_PATH, TEST_FILE)
     if not os.path.exists(filepath):
         return {"error": f"File {TEST_FILE} not found"}
     
-    try:
-        with tempfile.TemporaryDirectory() as tmp_dir:
-            result = subprocess.run(
-                ["7z", "x", filepath, f"-o{tmp_dir}", "-y"],
-                capture_output=True,
-                timeout=120
-            )
-            
-            if result.returncode != 0:
-                return {
-                    "developer": "Gopal Parmar",
-                    "error": "7z extraction failed",
-                    "stderr": result.stderr.decode()[:500],
-                    "stdout": result.stdout.decode()[:500]
-                }
-            
-            files_found = []
-            for root, dirs, files in os.walk(tmp_dir):
-                for file in files:
-                    file_path = os.path.join(root, file)
-                    size = os.path.getsize(file_path)
-                    files_found.append({
-                        "name": file,
-                        "size_mb": round(size / (1024**2), 2)
-                    })
-            
-            return {
-                "developer": "Gopal Parmar",
-                "extracted_files": files_found,
-                "total_files": len(files_found)
-            }
-    except Exception as e:
-        return {"error": str(e)}
-
-@app.get("/preview")
-async def preview():
-    filepath = os.path.join(MOUNT_PATH, TEST_FILE)
-    if not os.path.exists(filepath):
-        return {"error": f"File {TEST_FILE} not found"}
+    # Try extract and search
+    filename, content = extract_with_7z(filepath)
+    if not filename:
+        filename, content = extract_with_py7zr(filepath)
     
-    try:
-        with tempfile.TemporaryDirectory() as tmp_dir:
-            result = subprocess.run(
-                ["7z", "x", filepath, f"-o{tmp_dir}", "-y"],
-                capture_output=True,
-                timeout=120
-            )
-            
-            if result.returncode != 0:
-                return {
-                    "developer": "Gopal Parmar",
-                    "error": "Extraction failed",
-                    "stderr": result.stderr.decode()[:500]
-                }
-            
-            for root, dirs, files in os.walk(tmp_dir):
-                for file in files:
-                    file_path = os.path.join(root, file)
-                    with open(file_path, 'r', encoding='utf-8', errors='ignore') as f:
-                        lines = [f.readline().strip() for _ in range(15)]
-                    return {
-                        "developer": "Gopal Parmar",
-                        "file_name": file,
-                        "first_15_lines": lines
-                    }
-            
-            return {"error": "No files extracted"}
-    except Exception as e:
-        return {"error": str(e)}
+    if not filename:
+        return {"error": "Extraction failed"}
+    
+    results = []
+    for line in content.split('\n'):
+        if q in line:
+            try:
+                results.append(json.loads(line))
+            except:
+                results.append({"raw": line.strip()})
+            if len(results) >= limit:
+                break
+    
+    return {
+        "developer": "Gopal Parmar",
+        "query": q,
+        "count": len(results),
+        "results": results
+    }