From 6a7e42afd1e2f7d107ce1782745bc1a34891b030 Mon Sep 17 00:00:00 2001
From: xpamych <xpamych@yandex.ru>
Date: Sun, 14 May 2023 20:45:43 +0300
Subject: [PATCH] 1

---
 hlna.py | 61 +++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 21 deletions(-)

diff --git a/hlna.py b/hlna.py
index 748aa5c..78869db 100755
--- a/hlna.py
+++ b/hlna.py
@@ -491,30 +491,48 @@ def modextract(id_mod, id_game_workshop):
         print_line(id_mod)
         os.remove(f"{dir_ark_mods}.mod")
 
-    modfile_bytes = b''
-    with open(os.path.join(dir_ark_mods, 'mod.info'), 'rb') as f:
-        data = f.read()
-        mapnamelen = struct.unpack_from('<L', data, offset=0)
-        mapnamelen = mapnamelen[0]
-        mapname = str(data[4:mapnamelen + 3], 'utf-8')
-        nummaps = struct.unpack_from('<L', data, offset=mapnamelen + 4)
-        nummaps = nummaps[0]
+    with open(f"{dir_extract}/mod.info", "rb") as modinfo:
+        data = modinfo.read()
+        mapnamelen = struct.unpack_from("<L", data, 0)[0]
+        mapname = data[4:mapnamelen+3]
+        nummaps = struct.unpack_from("<L", data, mapnamelen+4)[0]
         pos = mapnamelen + 8
-        modname = (modname + mapname + "\x00").encode('utf-8')
+        modname = (modname or mapname)
         modnamelen = len(modname)
-        modpath = ("../../../" + "ShooterGame" + "/Content/Mods/" + id_mod + "\x00").encode('utf-8')
+        modpath = f"../../../" + {dir_shooter} + "/Content/Mods/" + id_mod
         modpathlen = len(modpath)
-        modfile_bytes += struct.pack('<LLL{}sL{}sL'.format(modnamelen, modpathlen),
-                                     int(id_mod), 0, modnamelen,
-                                     modname, modpathlen, modpath, nummaps)
-        for _ in range(nummaps):
-            mapfilelen = struct.unpack_from('<L', data, offset=pos)
-            mapfilelen = mapfilelen[0]
-            mapfile = data[mapnamelen + 12:mapnamelen + 12 + mapfilelen]
-            modfile_bytes += struct.pack('<L{}s'.format(mapfilelen), mapfilelen, mapfile)
-            pos = pos + 4 + mapfilelen
-        modfile_bytes += b'\x33\xFF\x22\xFF\x02\x00\x00\x00\x01'
-        # os.system(modfile_bytes.decode().replace("$arkserverdir", arkserverdir).replace("$modid", modid).replace("$modname", modname).replace("$modextractdir", modextractdir))
+        with open(f"{dir_ark_mods}.mod", "wb") as mod:
+            mod.write(struct.pack('<LLL{}sL{}sL'.format(modnamelen, modpathlen), int(id_mod), 0, modnamelen, modname, modpathlen, modpath, nummaps))
+            for mapnum in range(nummaps):
+                mapfilelen = struct.unpack_from("<L", data, pos)[0]
+                mapfile = data[mapnamelen+12:mapnamelen+12+mapfilelen]
+                mod.write(struct.pack("<L%ds" % mapfilelen, mapfilelen, mapfile))
+                pos = pos + 4 + mapfilelen
+            mod.write(b"\x33\xFF\x22\xFF\x02\x00\x00\x00\x01")
+
+    # modfile_bytes = b''
+    # with open(os.path.join(dir_ark_mods, 'mod.info'), 'rb') as f:
+    #     data = f.read()
+    #     mapnamelen = struct.unpack_from('<L', data, offset=0)
+    #     mapnamelen = mapnamelen[0]
+    #     mapname = str(data[4:mapnamelen + 3], 'utf-8')
+    #     nummaps = struct.unpack_from('<L', data, offset=mapnamelen + 4)
+    #     nummaps = nummaps[0]
+    #     pos = mapnamelen + 8
+    #     modname = (modname + mapname + "\x00").encode('utf-8')
+    #     modnamelen = len(modname)
+    #     modpath = ("../../../" + "ShooterGame" + "/Content/Mods/" + id_mod + "\x00").encode('utf-8')
+    #     modpathlen = len(modpath)
+    #     modfile_bytes += struct.pack('<LLL{}sL{}sL'.format(modnamelen, modpathlen),
+    #                                  int(id_mod), 0, modnamelen,
+    #                                  modname, modpathlen, modpath, nummaps)
+    #     for _ in range(nummaps):
+    #         mapfilelen = struct.unpack_from('<L', data, offset=pos)
+    #         mapfilelen = mapfilelen[0]
+    #         mapfile = data[mapnamelen + 12:mapnamelen + 12 + mapfilelen]
+    #         modfile_bytes += struct.pack('<L{}s'.format(mapfilelen), mapfilelen, mapfile)
+    #         pos = pos + 4 + mapfilelen
+    #     modfile_bytes += b'\x33\xFF\x22\xFF\x02\x00\x00\x00\x01'
 
     if os.path.isfile(os.path.join(dir_extract, "modmeta.info")):
         with open(os.path.join(dir_extract, "modmeta.info"), "rb") as f:
@@ -774,6 +792,7 @@ dir_logs = f"{dir_config}logs/"
 dir_server_ark = f"{dir_server}ARK/"
 dir_server_exec = f"{dir_server_ark}ShooterGame/Binaries/Linux/"
 dir_workshop_ark = f"{home_dir}/.local/share/Steam/steamapps/workshop"
+dir_shooter = "ShooterGame"
 dir_mods_ark = f"{dir_server_ark}ShooterGame/Content/Mods"
 
 dir_server_7days = f"{dir_server}/7Days/"