Update app.py

app.py

@@ -28,10 +28,8 @@ async def generate_dll(
     binary_path = os.path.join(temp_dir, binary_file.filename)
     metadata_path = os.path.join(temp_dir, metadata_file.filename)
     
-    with open(binary_path, "wb") as f:
-        f.write(await binary_file.read())
-    with open(metadata_path, "wb") as f:
-        f.write(await metadata_file.read())
+    with open(binary_path, "wb") as f: f.write(await binary_file.read())
+    with open(metadata_path, "wb") as f: f.write(await metadata_file.read())
         
     output_dir = os.path.join(temp_dir, "output")
     os.makedirs(output_dir, exist_ok=True)
@@ -39,35 +37,31 @@ async def generate_dll(
     config_path = "/app/dumper/config.json"
     if os.path.exists(config_path):
         try:
-            with open(config_path, "r") as f:
-                config_data = f.read()
+            with open(config_path, "r") as f: config_data = f.read()
             config_data = config_data.replace('"RequireAnyKey": true', '"RequireAnyKey": false')
-            with open(config_path, "w") as f:
-                f.write(config_data)
-        except Exception:
-            pass
+            with open(config_path, "w") as f: f.write(config_data)
+        except Exception: pass
     
-    # 1. ÖNCE PROGRAMI ÇALIŞTIRIYORUZ
     try:
-        process = subprocess.run([
-            "/app/dumper/Il2CppDumper", 
-            binary_path, 
-            metadata_path, 
-            output_dir
-        ], capture_output=True)
-    except subprocess.CalledProcessError as e:
-        pass # Hata verse bile dosyayı ürettiğini loglardan görmüştük, bu yüzden devam ediyoruz.
+        subprocess.run(["/app/dumper/Il2CppDumper", binary_path, metadata_path, output_dir], capture_output=True)
+    except subprocess.CalledProcessError: pass
         
-    # 2. İŞLEM BİTTİKTEN SONRA DOSYAYI ARIYORUZ (S veya S'siz iki ihtimali de ekledik)
-    dll_path_1 = os.path.join(output_dir, "DummyDll", "Assembly-CSharp.dll")
-    dll_path_2 = os.path.join(output_dir, "DummyDlls", "Assembly-CSharp.dll")
+    # YENİLİK: Artık tek bir DLL yerine tüm DLL klasörünü ZIP olarak yolluyoruz.
+    dummy_dll_dir_1 = os.path.join(output_dir, "DummyDll")
+    dummy_dll_dir_2 = os.path.join(output_dir, "DummyDlls")
+    target_dir = dummy_dll_dir_1 if os.path.exists(dummy_dll_dir_1) else dummy_dll_dir_2
     
-    if os.path.exists(dll_path_1):
-        return FileResponse(dll_path_1, media_type="application/octet-stream", filename="Assembly-CSharp.dll")
-    elif os.path.exists(dll_path_2):
-        return FileResponse(dll_path_2, media_type="application/octet-stream", filename="Assembly-CSharp.dll")
+    if os.path.exists(target_dir):
+        zip_path = os.path.join(temp_dir, "DummyDlls.zip")
+        with zipfile.ZipFile(zip_path, 'w', zipfile.ZIP_DEFLATED) as zipf:
+            for root, _, files in os.walk(target_dir):
+                for file in files:
+                    if file.endswith(".dll"):
+                        file_path = os.path.join(root, file)
+                        zipf.write(file_path, arcname=file)
+        return FileResponse(zip_path, media_type="application/zip", filename="DummyDlls.zip")
     else:
-        return {"error": "İşlem başarısız.", "details": "DLL dosyası klasörde bulunamadı."}
+        return {"error": "İşlem başarısız.", "details": "DLL klasörü bulunamadı."}
 
 @app.post("/extract")
 async def extract_dialogues(
@@ -77,15 +71,25 @@ async def extract_dialogues(
     temp_dir = tempfile.mkdtemp()
     asset_path = os.path.join(temp_dir, file.filename)
     
-    with open(asset_path, "wb") as f:
-        f.write(await file.read())
+    with open(asset_path, "wb") as f: f.write(await file.read())
         
     load_paths = [asset_path]
     if assembly_file:
         assembly_path = os.path.join(temp_dir, assembly_file.filename)
-        with open(assembly_path, "wb") as f:
-            f.write(await assembly_file.read())
-        load_paths.append(assembly_path)
+        with open(assembly_path, "wb") as f: f.write(await assembly_file.read())
+            
+        # YENİLİK: Eğer kullanıcı DummyDlls.zip yüklediyse onu aç ve içindeki TÜM DLL'leri tarat
+        if assembly_file.filename.endswith(".zip"):
+            dummy_dll_dir = os.path.join(temp_dir, "ExtractedDlls")
+            os.makedirs(dummy_dll_dir, exist_ok=True)
+            with zipfile.ZipFile(assembly_path, 'r') as zipf:
+                zipf.extractall(dummy_dll_dir)
+            for root, _, files in os.walk(dummy_dll_dir):
+                for dll_file in files:
+                    if dll_file.endswith(".dll"):
+                        load_paths.append(os.path.join(root, dll_file))
+        else:
+            load_paths.append(assembly_path)
         
     env = UnityPy.load(*load_paths)
     zip_filename = os.path.join(temp_dir, f"{file.filename}_dialogues.zip")
@@ -100,13 +104,11 @@ async def extract_dialogues(
                 try:
                     data = obj.read()
                     file_name = getattr(data, "name", f"{obj.type.name}_{obj.path_id}")
-                    
                     if obj.type.name == "TextAsset":
                         content = data.text.encode('utf-8')
                         zipf.writestr(f"{file_name}.txt", content)
                         extracted_count += 1
                         log_content.append(f"  -> Başarılı: {file_name}.txt oluşturuldu.")
-                        
                     elif obj.type.name == "MonoBehaviour":
                         tree = obj.read_typetree()
                         if tree:
@@ -114,13 +116,11 @@ async def extract_dialogues(
                             extracted_count += 1
                             log_content.append(f"  -> Başarılı: {file_name}.json oluşturuldu.")
                         else:
-                            log_content.append("  -> Atlandı: TypeTree okunamadı. DLL eksik olabilir.")
+                            log_content.append("  -> Atlandı: TypeTree okunamadı.")
                 except Exception as e:
                     log_content.append(f"  -> HATA: {str(e)}")
 
-        if extracted_count == 0:
-            log_content.append("\nSONUÇ: Çıkarılabilir hiçbir metin bulunamadı.")
-            
+        if extracted_count == 0: log_content.append("\nSONUÇ: Çıkarılabilir metin bulunamadı.")
         zipf.writestr("islem_raporu.txt", "\n".join(log_content).encode('utf-8'))
 
     return FileResponse(zip_filename, media_type="application/zip", filename=f"{file.filename}_dialogues.zip")
@@ -142,21 +142,29 @@ async def repack_dialogues(
     if assembly_file:
         assembly_path = os.path.join(temp_dir, assembly_file.filename)
         with open(assembly_path, "wb") as f: f.write(await assembly_file.read())
-        load_paths.append(assembly_path)
+        
+        if assembly_file.filename.endswith(".zip"):
+            dummy_dll_dir = os.path.join(temp_dir, "ExtractedDlls")
+            os.makedirs(dummy_dll_dir, exist_ok=True)
+            with zipfile.ZipFile(assembly_path, 'r') as zipf:
+                zipf.extractall(dummy_dll_dir)
+            for root, _, files in os.walk(dummy_dll_dir):
+                for dll_file in files:
+                    if dll_file.endswith(".dll"):
+                        load_paths.append(os.path.join(root, dll_file))
+        else:
+            load_paths.append(assembly_path)
         
     env = UnityPy.load(*load_paths)
-    
     with zipfile.ZipFile(zip_path, 'r') as zipf:
         for file_info in zipf.infolist():
             filename = file_info.filename
             if filename == "islem_raporu.txt": continue
-                
             content = zipf.read(filename)
             for obj in env.objects:
                 try:
                     data = obj.read()
                     obj_name = getattr(data, "name", f"{obj.type.name}_{obj.path_id}")
-                    
                     if obj.type.name == "TextAsset" and filename == f"{obj_name}.txt":
                         data.text = content.decode('utf-8')
                         data.save()
@@ -165,11 +173,9 @@ async def repack_dialogues(
                         tree = json.loads(content.decode('utf-8'))
                         obj.save_typetree(tree)
                         break
-                except:
-                    pass
+                except: pass
 
     output_path = os.path.join(temp_dir, f"repacked_{asset_file.filename}")
-    with open(output_path, "wb") as f:
-        f.write(env.file.save())
+    with open(output_path, "wb") as f: f.write(env.file.save())
         
     return FileResponse(output_path, media_type="application/octet-stream", filename=asset_file.filename)