Fix deep-dir archives

Packing and unpacking of the archives with more rooted directories.
TesterTesterov · Mar 8, 2023 · d890f41 · d890f41
1 parent 5d0a88a
commit d890f41
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/ai6win_arc.py b/ai6win_arc.py
@@ -71,8 +71,9 @@ def _pack_names_and_files(self) -> tuple:
 
                 rel_name = os.path.normpath(os.path.join(root, filename))
                 end_name = rel_name
-                if rel_name.startswith(root + os.sep):
-                    end_name = rel_name[len(root + os.sep):]
+                if rel_name.startswith(self._dir_name + os.sep):
+                    end_name = rel_name[len(self._dir_name + os.sep):]
+                    end_name = end_name.replace(os.sep, '/')
                 encrypted_name = self.encrypt_name(end_name)
 
                 with open(rel_name, 'rb') as this_file:

diff --git a/main.py b/main.py
@@ -7,10 +7,10 @@ def test(mode: str):
     from ai6win_arc import AI6WINArc
     """modes: unpack, pack,"""
     if mode == "unpack":
-        test_arc = AI6WINArc("Data.arc", "Data", integrity_check=True)
+        test_arc = AI6WINArc("mes.arc", "mes", integrity_check=True)
         test_arc.unpack()
     elif mode == "pack":
-        test_arc = AI6WINArc("Data.arc", "Data", integrity_check=True)
+        test_arc = AI6WINArc("mes.arc", "mes", integrity_check=True)
         test_arc.pack()
 
 

diff --git a/setup.py b/setup.py
@@ -8,14 +8,14 @@
 
 
 executables = [cx_Freeze.Executable("main.py",
-                                    shortcut_name="SilkyArcTool",
-                                    shortcut_dir="SilkyArcTool",
-                                    #base="Win32GUI")
-                                    ]
+                                    shortcut_name="AI6WINArcTool",
+                                    shortcut_dir="AI6WINArcTool",
+                                    #base="Win32GUI"
+                                    )]
 
 cx_Freeze.setup(
-        name="SilkyArcTool",
-        version="1.0",
+        name="AI6WINArcTool",
+        version="1.1",
         description="Dual languaged (rus+eng) tool for packing and unpacking archives of Silky Engine.\n"
                     "Двуязычное средство (рус+англ) для распаковки и запаковки архивов Silky Engine.",
         options={"build_exe": {"packages": []}},

diff --git a/silky_arc.py b/silky_arc.py
@@ -123,6 +123,7 @@ def _unpack_files(self) -> None:
                     except AssertionError:
                         print("!!! File {0} true size is incorrect!/Истинный размер файла {0} некорректен!".
                               format(i[1]))
+            os.makedirs(os.path.dirname(this_file_name), exist_ok=True)
             with open(this_file_name, 'wb') as this_file:
                 this_file.write(new_file_bytes)
             if self._verbose: