fix back java compiler

Author: polo-diemunsch

src/auto_compiler/auto_compiler.py

@@ -12,8 +12,8 @@ class AutoCompiler:
     def __init__(
         self,
         source_folder: Path,
-        compile_folder: Path = Path('out'),
-        result_folder: Path = Path('ais')
+        compile_folder: Path = Path("out"),
+        result_folder: Path = Path("ais")
     ) -> None:
 
         self.source_folder = source_folder
@@ -43,10 +43,9 @@ async def compile_file(self, name: Path) -> Path:
         symlink = self.result_folder.joinpath(executable.name)
         self.result_folder.mkdir(parents=True, exist_ok=True)
 
-        try:
-            symlink.symlink_to(Path.cwd().joinpath(executable))
-        except FileExistsError:
-            pass
+        if symlink.exists():
+            symlink.unlink()
+        symlink.symlink_to(Path.cwd().joinpath(executable))
 
         return symlink
 

src/auto_compiler/compilers/JavaCompiler.py

@@ -16,23 +16,26 @@ def __init__(self) -> None:
         ...
 
     async def build_file(self, file: Path, compile_dir: Path) -> Path:
-        compile_ai_dir = compile_dir / file.stem
-        if compile_ai_dir.exists():
-            for old_file in compile_ai_dir.glob("*.class"):
-                old_file.unlink()
-        else:
-            compile_ai_dir.mkdir(parents=True)
+        self.modify_class_name(file)
+        executable = compile_dir.joinpath(Path(f"{file.stem}.class"))
         process = await create_subprocess_exec(
-            "javac", "-d", str(compile_ai_dir), str(file), stdout=PIPE, stderr=PIPE
+            "javac", "-d", str(compile_dir), str(file), stdout=PIPE, stderr=PIPE
         )
         stdout, stderr = await process.communicate()
         print(stdout.decode("utf-8"))
         if not process.returncode:
-            class_files = list(compile_ai_dir.glob("*.class"))
-            if len(class_files) > 0:
-                executable = class_files[0]
-                return executable.rename(compile_ai_dir / f"{file.stem}.class")
+            if executable.exists():
+                return executable
             else:
                 raise CompilerException("File wasn't created")
         else:
             raise CompilerException(stderr.decode("utf-8"))
+
+    @staticmethod
+    def modify_class_name(file):
+        # Should probably use something more robust than regex
+        with open(file, "r") as f:
+            filedata = f.read()
+        filedata = re.sub(r"(public\s+)?class\s.*\n?{", f"class {file.stem} {"{"}\n", filedata)
+        with open(file, "w") as f:
+            f.write(filedata)