mirror of
https://gitlab.com/crafty-controller/crafty-4.git
synced 2024-08-30 18:23:09 +00:00
Working zip imports
This commit is contained in:
parent
b5420c083e
commit
504ffd57f6
app/classes/shared
@ -31,9 +31,11 @@ class FileHelpers:
|
|||||||
sub.unlink()
|
sub.unlink()
|
||||||
except:
|
except:
|
||||||
logger.error(f"Unable to delete file {sub}")
|
logger.error(f"Unable to delete file {sub}")
|
||||||
|
try:
|
||||||
# This removes the top-level folder:
|
# This removes the top-level folder:
|
||||||
path.rmdir()
|
path.rmdir()
|
||||||
|
except:
|
||||||
|
logger.error("Unable to remove top level")
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
@ -106,5 +106,6 @@ class ImportHelpers:
|
|||||||
file.close()
|
file.close()
|
||||||
|
|
||||||
server_users = PermissionsServers.get_server_user_list(new_id)
|
server_users = PermissionsServers.get_server_user_list(new_id)
|
||||||
|
ServersController.finish_import(new_id)
|
||||||
for user in server_users:
|
for user in server_users:
|
||||||
self.helper.websocket_helper.broadcast_user(user, "send_start_reload", {})
|
self.helper.websocket_helper.broadcast_user(user, "send_start_reload", {})
|
||||||
|
@ -627,6 +627,7 @@ class Controller:
|
|||||||
port,
|
port,
|
||||||
server_type="minecraft-java",
|
server_type="minecraft-java",
|
||||||
)
|
)
|
||||||
|
ServersController.set_import(new_id)
|
||||||
self.import_helper.import_java_zip_server(
|
self.import_helper.import_java_zip_server(
|
||||||
temp_dir, new_server_dir, port, new_id
|
temp_dir, new_server_dir, port, new_id
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user