From 0aef3aaeb1dc03132258868543731d645a1900c4 Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Sun, 6 Feb 2022 22:59:21 +0300 Subject: [PATCH] replace --- SprintLib/testers/BaseTester.py | 4 ++-- SprintLib/utils.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SprintLib/testers/BaseTester.py b/SprintLib/testers/BaseTester.py index 57519e4..cd4768d 100644 --- a/SprintLib/testers/BaseTester.py +++ b/SprintLib/testers/BaseTester.py @@ -84,7 +84,7 @@ class BaseTester: with open( join(self.path, file.path), "wb" ) as fs: - fs.write(get_bytes(file.fs_id)) + fs.write(get_bytes(file.fs_id).replace(b"\r\n", b"\n")) self.solution.result = CONSTS["testing_status"] self.solution.save() docker_command = f"docker run --name solution_{self.solution.id} --volume=/sprint-data/solutions/{self.solution.id}:/{self.working_directory} -t -d {self.solution.language.image}" @@ -95,7 +95,7 @@ class BaseTester: with open( join(self.path, file.filename), "wb" ) as fs: - fs.write(get_bytes(file.fs_id)) + fs.write(get_bytes(file.fs_id).replace(b"\r\n", b"\n")) print("Files copied") for file in listdir(self.path): chmod(join(self.path, file), 0o777) diff --git a/SprintLib/utils.py b/SprintLib/utils.py index f9e1b17..738bc7b 100644 --- a/SprintLib/utils.py +++ b/SprintLib/utils.py @@ -3,19 +3,19 @@ from requests import get, post from Sprint import settings -def write_bytes(data): +def write_bytes(data: bytes): url = settings.FS_HOST + ":" + str(settings.FS_PORT) + "/upload_file" print(url) return post(url, data=data).json()["id"] -def get_bytes(num): +def get_bytes(num: int) -> bytes: url = settings.FS_HOST + ":" + str(settings.FS_PORT) + "/get_file?id=" + str(num) print(url) return get(url).content -def delete_file(num): +def delete_file(num: int): url = settings.FS_HOST + ":" + str(settings.FS_PORT) + "/delete_file?id=" + str(num) print(url) post(url)