From b766ae10e9713d8e978f19b05c3190e632412d3a Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 25 Feb 2023 15:40:38 -0500
Subject: [PATCH] Only copy bedrock_server executable on update

---
 app/classes/shared/file_helpers.py | 71 ++++++++++++++++++------------
 app/classes/shared/server.py       |  5 ++-
 2 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/app/classes/shared/file_helpers.py b/app/classes/shared/file_helpers.py
index e26220bb..f7052943 100644
--- a/app/classes/shared/file_helpers.py
+++ b/app/classes/shared/file_helpers.py
@@ -283,39 +283,56 @@ class FileHelpers:
         return True
 
     @staticmethod
-    def unzip_file(zip_path):
-        new_dir_list = zip_path.split("/")
-        new_dir = ""
-        for i in range(len(new_dir_list) - 1):
-            if i == 0:
-                new_dir += new_dir_list[i]
-            else:
-                new_dir += "/" + new_dir_list[i]
-
+    def unzip_file(zip_path, single_item=False):
+        # Get directory without zipfile name
+        new_dir = pathlib.Path(zip_path).parents[0]
+        # make sure we're able to access the zip file
         if Helpers.check_file_perms(zip_path) and os.path.isfile(zip_path):
+            # make sure the directory we're unzipping this to exists
             Helpers.ensure_dir_exists(new_dir)
+            # we'll make a temporary directory to unzip this to.
             temp_dir = tempfile.mkdtemp()
             try:
                 with zipfile.ZipFile(zip_path, "r") as zip_ref:
+                    # we'll extract this to the temp dir using zipfile module
                     zip_ref.extractall(temp_dir)
-                    full_root_path = temp_dir
-                for item in os.listdir(full_root_path):
-                    if os.path.isdir(os.path.join(full_root_path, item)):
-                        try:
-                            FileHelpers.move_dir_exist(
-                                os.path.join(full_root_path, item),
-                                os.path.join(new_dir, item),
-                            )
-                        except Exception as ex:
-                            logger.error(f"ERROR IN ZIP IMPORT: {ex}")
-                    else:
-                        try:
-                            FileHelpers.move_file(
-                                os.path.join(full_root_path, item),
-                                os.path.join(new_dir, item),
-                            )
-                        except Exception as ex:
-                            logger.error(f"ERROR IN ZIP IMPORT: {ex}")
+
+                # we'll check if the single item parameter was passed
+                # if it was the developer only wants one file back
+                # probably for a server executable update.
+                if not single_item:
+                    # we'll iterate through the top level directory moving everything
+                    # out of the temp directory and into it's final home.
+                    for item in os.listdir(temp_dir):
+                        # we handle files and dirs differently or we'll crash out.
+                        if os.path.isdir(os.path.join(temp_dir, item)):
+                            try:
+                                FileHelpers.move_dir_exist(
+                                    os.path.join(temp_dir, item),
+                                    os.path.join(new_dir, item),
+                                )
+                            except Exception as ex:
+                                logger.error(f"ERROR IN ZIP IMPORT: {ex}")
+                        else:
+                            try:
+                                FileHelpers.move_file(
+                                    os.path.join(temp_dir, item),
+                                    os.path.join(new_dir, item),
+                                )
+                            except Exception as ex:
+                                logger.error(f"ERROR IN ZIP IMPORT: {ex}")
+                else:
+                    # if there is a single item the correct file name should be passed
+                    # we'll just try to move that one file based on the name provided
+                    # then we'll move along.
+                    try:
+                        FileHelpers.move_file(
+                            os.path.join(temp_dir, single_item),
+                            os.path.join(new_dir, single_item),
+                        )
+                    except FileNotFoundError:
+                        logger.error("Could not unpack single file in bedrock update.")
+                        return "false"
             except Exception as ex:
                 Console.error(ex)
         else:
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 713d31bc..7b1958da 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -1320,7 +1320,10 @@ class ServerInstance:
                 unzip_path = os.path.join(self.settings["path"], "bedrock_server.zip")
                 unzip_path = self.helper.wtol_path(unzip_path)
                 # unzips archive that was downloaded.
-                FileHelpers.unzip_file(unzip_path)
+                if self.helper.is_os_windows():
+                    FileHelpers.unzip_file(unzip_path, "bedrock_server.exe")
+                else:
+                    FileHelpers.unzip_file(unzip_path, "bedrock_server")
                 # adjusts permissions for execution if os is not windows
                 if not self.helper.is_os_windows():
                     os.chmod(