Change file creating and writing methods (#115)

Author: pythoninja

sshgen/generators/sshconfig.py

@@ -75,15 +75,13 @@ def _save_config(self, templates: list[str]) -> None:
             condition=len(templates) > 0, message="No templates found to generate. Exiting...", exit_code=0
         )
 
-        self._create_output_file()
-        self.output_file.write_text("\n".join(templates))
+        FileUtils.create_file(self.output_file)
+        FileUtils.write_text(file_path=self.output_file, data="\n".join(templates))
+
         log.info("Generated SSH config file was saved to %s", self.output_file)
         log.debug("Skipped hosts list: %s", self._parse_skipped())
         log.info("Total processed hosts: %d, total skipped hosts: %d", len(templates), len(self._skipped))
 
-    def _create_output_file(self) -> None:
-        self.output_file.touch(exist_ok=True)
-
     def _parse_skipped(self) -> str:
         if len(self._skipped) > 0:
             return ", ".join([model.ansible_host for model in self._skipped])

sshgen/utils/file.py

@@ -28,13 +28,7 @@ def get_hosts_path(file_path: str) -> Path:
 
     @staticmethod
     def get_output_path(file_path: str) -> Path:
-        resolved_path = FileUtils.resolve_path(file_path)
-
-        if not resolved_path.exists():
-            log.debug("Path %s is not exists, creating required directories", resolved_path)
-            FileUtils.create_file(resolved_path)
-
-        return resolved_path
+        return FileUtils.resolve_path(file_path)
 
     @staticmethod
     def as_package_file(file_path: str) -> Path:
@@ -58,10 +52,20 @@ def is_empty(file_path: Path) -> bool:
 
     @staticmethod
     def create_file(file_path: Path) -> None:
-        if not file_path.is_file():
-            try:
-                file_path.parent.mkdir(parents=True, exist_ok=True)
-                file_path.touch(exist_ok=True)
-            except OSError as e:
-                log.exception("Failed to create file or directory: %s, reason: %s", file_path, e.strerror)
-                sys.exit(1)
+        if not file_path.exists():
+            log.debug("Path %s is not exists, trying to create required folders and file", file_path)
+
+        try:
+            file_path.parent.mkdir(parents=True, exist_ok=True)
+            file_path.touch(exist_ok=True)
+        except OSError as e:
+            log.exception("Failed to create file or directory: %s, reason: %s", file_path, e.strerror)
+            sys.exit(1)
+
+    @staticmethod
+    def write_text(file_path: Path, data: str) -> None:
+        try:
+            file_path.write_text(data)
+        except OSError as e:
+            log.exception("Failed to create file or directory: %s, reason: %s", file_path, e.strerror)
+            sys.exit(1)