Added check for server.properties to avoid white throwback if server.properties doesn't exist on a zip import.

This commit is contained in:
Andrew 2021-08-05 17:17:36 -04:00
parent e15de6c461
commit 6aa910c8de
2 changed files with 10 additions and 1 deletions

View File

@ -287,14 +287,22 @@ class Controller:
if len(path_list) > 1: if len(path_list) > 1:
for i in range(len(path_list)-2): for i in range(len(path_list)-2):
root_path = os.path.join(root_path, path_list[i+1]) root_path = os.path.join(root_path, path_list[i+1])
print(root_path)
full_root_path = os.path.join(tempDir, root_path) full_root_path = os.path.join(tempDir, root_path)
has_properties = False
for item in os.listdir(full_root_path): for item in os.listdir(full_root_path):
if str(item) == 'server.properties':
has_properties = True
try: try:
shutil.move(os.path.join(full_root_path, item), os.path.join(new_server_dir, item)) shutil.move(os.path.join(full_root_path, item), os.path.join(new_server_dir, item))
except Exception as ex: except Exception as ex:
logger.error('ERROR IN ZIP IMPORT: {}'.format(ex)) logger.error('ERROR IN ZIP IMPORT: {}'.format(ex))
if not has_properties:
logger.info("No server.properties found on zip file import. Creating one with port selection of {}".format(str(port)))
with open(os.path.join(new_server_dir, "server.properties"), "w") as f:
f.write("server-port={}".format(port))
f.close()
zip_ref.close() zip_ref.close()
else: else:
return "false" return "false"

1
exit.txt Normal file
View File

@ -0,0 +1 @@
exit