Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use with-blocks when opening files

Browse Source
This commit is contained in:
luukas
2022-06-18 01:27:55 +03:00
parent 8a44e8eac2
commit 5bfd564ef4
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/classes/shared/helpers.py
View File

@ -89,7 +89,8 @@ class Helpers:
@staticmethod @staticmethod
def check_file_perms(path): def check_file_perms(path):
try: try:
open(path, "r", encoding="utf-8").close() with open(path, "r", encoding="utf-8"):
pass
logger.info(f"{path} is readable") logger.info(f"{path} is readable")
return True return True
except PermissionError: except PermissionError:
@ -425,7 +426,8 @@ class Helpers:
def check_writeable(path: str): def check_writeable(path: str):
filename = os.path.join(path, "tempfile.txt") filename = os.path.join(path, "tempfile.txt")
try: try:
open(filename, "w", encoding="utf-8").close() with open(filename, "w", encoding="utf-8"):
pass
os.remove(filename) os.remove(filename)
logger.info(f"{filename} is writable") logger.info(f"{filename} is writable")
@ -510,7 +512,8 @@ class Helpers:
# ensure the log file is there # ensure the log file is there
try: try:
open(log_file, "a", encoding="utf-8").close() with open(log_file, "a", encoding="utf-8"):
pass
except Exception as e: except Exception as e:
Console.critical(f"Unable to open log file! {e}") Console.critical(f"Unable to open log file! {e}")
sys.exit(1) sys.exit(1)
@ -774,13 +777,15 @@ class Helpers:
cert.set_version(2) cert.set_version(2)
cert.sign(k, "sha256") cert.sign(k, "sha256")
f = open(cert_file, "w", encoding="utf-8") with open(cert_file, "w", encoding="utf-8") as cert_file_handle:
f.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert).decode()) cert_file_handle.write(
f.close() crypto.dump_certificate(crypto.FILETYPE_PEM, cert).decode()
)
f = open(key_file, "w", encoding="utf-8") with open(key_file, "w", encoding="utf-8") as key_file_handle:
f.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, k).decode()) key_file_handle.write(
f.close() crypto.dump_privatekey(crypto.FILETYPE_PEM, k).decode()
)
@staticmethod @staticmethod
def random_string_generator(size=6, chars=string.ascii_uppercase + string.digits): def random_string_generator(size=6, chars=string.ascii_uppercase + string.digits):
@ -1006,7 +1011,8 @@ class Helpers:
return False return False
try: try:
open(jar_path, "wb").write(response.content) with open(jar_path, "wb") as jar_file:
jar_file.write(response.content)
except Exception as e: except Exception as e:
logger.error("Unable to finish executable download. Error: %s", e) logger.error("Unable to finish executable download. Error: %s", e)
return False return False

7
app/classes/shared/server.py
View File

@ -795,10 +795,9 @@ class ServerInstance:
self.server_scheduler.remove_job("c_" + str(self.server_id)) self.server_scheduler.remove_job("c_" + str(self.server_id))
def agree_eula(self, user_id): def agree_eula(self, user_id):
file = os.path.join(self.server_path, "eula.txt") eula_file = os.path.join(self.server_path, "eula.txt")
f = open(file, "w", encoding="utf-8") with open(eula_file, "w", encoding="utf-8") as f:
f.write("eula=true") f.write("eula=true")
f.close()
self.run_threaded_server(user_id) self.run_threaded_server(user_id)
def backup_server(self): def backup_server(self):