Merge branch 'bug/unzip-logic' into 'dev'

Remove useless block in unzip method

See merge request crafty-controller/crafty-4!522

CHANGELOG.md

@@ -15,6 +15,7 @@ TBD
 - Fix Forge import stalling on 1.17 Forge servers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/515))
 - Fix issue with server config for SU Accounts ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/516))
 - Fix Nested reaction tasks ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/521))
+- Remove legacy unzip code causing issues with single file zip files ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/522))
 ### Tweaks
 - Make server directories non-configurable ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/511))
 - Add popover to server port to detail it's purpose ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/514))

app/classes/shared/file_helpers.py

@@ -298,14 +298,7 @@ class FileHelpers:
             try:
                 with zipfile.ZipFile(zip_path, "r") as zip_ref:
                     zip_ref.extractall(temp_dir)
-                for i in enumerate(zip_ref.filelist):
-                    if len(zip_ref.filelist) > 1 or not zip_ref.filelist[
-                        i
-                    ].filename.endswith("/"):
-                        break
-
-                full_root_path = 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:

app/classes/shared/main_controller.py

@@ -815,6 +815,7 @@ class Controller:
             user_id,
             server_type="minecraft-bedrock",
         )
+        ServersController.set_import(new_id)
         self.import_helper.import_bedrock_zip_server(
             temp_dir, new_server_dir, full_jar_path, port, new_id
         )