replace all check_call with subprocess.run

ssl_encrypt.py

@@ -1,12 +1,11 @@
 #!/usr/bin/python3
 """ This Script encrypt Wireguardfiles for Wirepy users for more Security """
 
-import os
 from pathlib import Path
 import shutil
-from subprocess import check_call
+import subprocess
+from subprocess import CompletedProcess
 from wp_app_config import AppConfig
-from common_tools import LxTools
 
 log_name = AppConfig.USER_FILE.read_text()
 
@@ -14,7 +13,7 @@ keyfile: Path = Path(f"/home/{log_name}/.config/wire_py/pbwgk.pem")
 
 if not keyfile.is_file():
 
-    check_call(
+    process: CompletedProcess[str] = subprocess.run(
         [
             "openssl",
             "rsa",
@@ -25,56 +24,59 @@ if not keyfile.is_file():
             "-outform",
             "PEM",
             "-pubout",
-        ]
+        ],
+        capture_output=True,
+        text=True,
+        check=False,
     )
+
+    if process.stdout:
+        print(process.stdout)
+
+    # Output from Openssl Error
+    if process.stderr:
+        print("(Error):", process.stderr)
+
+    if process.returncode == 0:
+        print("Public key generated successfully.")
+    else:
+        print(f"Error generate Publickey: Code: {process.returncode}")
+
     shutil.chown(keyfile, 1000, 1000)
 
-    if AppConfig.TEMP_DIR.exists():
-        tl = LxTools.get_file_name(AppConfig.TEMP_DIR)
-        CPTH: str = f"{keyfile}"
-        CRYPTFILES: str = CPTH[:-9]
+    if AppConfig.TEMP_DIR.exists() and not any(AppConfig.TEMP_DIR.iterdir()):
+        clear_files = [str(file) for file in path_of_crypted_tunnel.glob()]
 
-        if keyfile.exists() and len(tl) != 0:
-            for tunnels in tl:
-                sourcetl: str = f"{AppConfig.TEMP_DIR}/{tunnels}"
-                tlname: str = f"{CRYPTFILES}{tunnels[:-5]}.dat"
-                check_call(
-                    [
-                        "openssl",
-                        "pkeyutl",
-                        "-encrypt",
-                        "-inkey",
-                        keyfile,
-                        "-pubin",
-                        "-in",
-                        sourcetl,
-                        "-out",
-                        tlname,
-                    ]
-                )
+        for config_file in clear_files:
+            base_name = Path(config_file).stem
+            process: CompletedProcess[str] = subprocess.run(
+                [
+                    "openssl",
+                    "pkeyutl",
+                    "-encrypt",
+                    "-inkey",
+                    keyfile,
+                    "-pubin",
+                    "-in",
+                    config_file,
+                    "-out",
+                    f"{AppConfig.CONFIG_DIR}/{base_name}.dat",
+                ],
+                capture_output=True,
+                text=True,
+                check=False,
+            )
 
-else:
+            print(f"Processing of the file: {config_file}")
 
-    if AppConfig.TEMP_DIR.exists():
-        tl: list[str] = os.listdir(f"{AppConfig.TEMP_DIR}")
-        CPTH: str = f"{keyfile}"
-        CRYPTFILES: str = CPTH[:-9]
+            if process.stdout:
+                print(process.stdout)
 
-        if keyfile.exists() and len(tl) != 0:
-            for tunnels in tl:
-                sourcetl: str = f"{AppConfig.TEMP_DIR}/{tunnels}"
-                tlname: str = f"{CRYPTFILES}{tunnels[:-5]}.dat"
-                check_call(
-                    [
-                        "openssl",
-                        "pkeyutl",
-                        "-encrypt",
-                        "-inkey",
-                        keyfile,
-                        "-pubin",
-                        "-in",
-                        sourcetl,
-                        "-out",
-                        tlname,
-                    ]
-                )
+            # Output from Openssl Error
+            if process.stderr:
+                print("(Error):", process.stderr)
+
+            if process.returncode == 0:
+                print(f"File {base_name}.dat successfully encrypted.")
+            else:
+                print(f"Error by {config_file}: Code: {process.returncode}")