add_wp_app_config.py for central configuration

.idea/workspace.xml

@@ -5,7 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment=" - Update Translate Files">
-      <change beforePath="$PROJECT_DIR$/cls_mth_fc.py" beforeDir="false" afterPath="$PROJECT_DIR$/cls_mth_fc.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/wirepy.py" beforeDir="false" afterPath="$PROJECT_DIR$/wirepy.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -43,28 +43,28 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
-    &quot;Python.INSTALL.executor&quot;: &quot;Run&quot;,
-    &quot;Python.cls_mth_fc.executor&quot;: &quot;Run&quot;,
-    &quot;Python.install.executor&quot;: &quot;Run&quot;,
-    &quot;Python.main.executor&quot;: &quot;Run&quot;,
-    &quot;Python.messagebox.executor&quot;: &quot;Run&quot;,
-    &quot;Python.start_wg.executor&quot;: &quot;Run&quot;,
-    &quot;Python.testtheme.executor&quot;: &quot;Run&quot;,
-    &quot;Python.wg_func.executor&quot;: &quot;Run&quot;,
-    &quot;Python.wg_main.executor&quot;: &quot;Run&quot;,
-    &quot;Python.wirepy.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;Shell Script.install.executor&quot;: &quot;Run&quot;,
-    &quot;Shell Script.run_as.executor&quot;: &quot;Run&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;21-04-2025-new-tooltip&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/home/punix/Pyapps/wire-py&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;ml.llm.LLMConfigurable&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ASKED_ADD_EXTERNAL_FILES": "true",
+    "Python.INSTALL.executor": "Run",
+    "Python.cls_mth_fc.executor": "Run",
+    "Python.install.executor": "Run",
+    "Python.main.executor": "Run",
+    "Python.messagebox.executor": "Run",
+    "Python.start_wg.executor": "Run",
+    "Python.testtheme.executor": "Run",
+    "Python.wg_func.executor": "Run",
+    "Python.wg_main.executor": "Run",
+    "Python.wirepy.executor": "Run",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "Shell Script.install.executor": "Run",
+    "Shell Script.run_as.executor": "Run",
+    "git-widget-placeholder": "28-04-2025-more-methods-and-optimize-methods",
+    "last_opened_file_path": "/home/punix/Pyapps/wire-py",
+    "settings.editor.selected.configurable": "ml.llm.LLMConfigurable"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/lx-icons" />

Changelog

@@ -41,7 +41,7 @@ My standard System: Linux Mint 22 Cinnamon
 
  - Fix ipv6 in Config File on import
  - Wirepy run now as user
- - settings, keys and Config Files now in ~/.config/wire_py
+ - settings, AppConfig.KEYS_FILE and Config Files now in ~/.config/wire_py
  - For new users, the required files are created and autostart service is started. 
  - Tunnels are now read from the directory to view them in the list. 
    To display only own tunnels, and read errors are minimized.

cls_mth_fc.py

@@ -14,14 +14,14 @@ from datetime import datetime
 from pathlib import Path
 from subprocess import check_call, CompletedProcess
 from tkinter import ttk, Toplevel
-
+from wp_app_config import AppConfig
 import requests
 
-APP = "wirepy"
-LOCALE_DIR = "/usr/share/locale/"
-locale.bindtextdomain(APP, LOCALE_DIR)
-gettext.bindtextdomain(APP, LOCALE_DIR)
-gettext.textdomain(APP)
+# Translate
+AppConfig.APP_NAME
+locale.bindtextdomain(AppConfig.APP_NAME, AppConfig.LOCALE_DIR)
+gettext.bindtextdomain(AppConfig.APP_NAME, AppConfig.LOCALE_DIR)
+gettext.textdomain(AppConfig.APP_NAME)
 _ = gettext.gettext
 
 
@@ -41,7 +41,7 @@ class Create:
         pth: Path = Path.home() / ".config/wire_py"
         pth.mkdir(parents=True, exist_ok=True)
         sett: Path = Path.home() / ".config/wire_py/settings"
-        ks: Path = Path.home() / ".config/wire_py/keys"
+        AppConfig.KEYS_FILE
 
         if sett.exists():
             pass
@@ -50,11 +50,11 @@ class Create:
             sett.touch()
             sett.write_text("[UPDATES]\non\n[THEME]\nlight\n[TOOLTIP]\nTrue\n[AUTOSTART ON]\noff\n")
 
-        if ks.exists():
+        if AppConfig.KEYS_FILE.exists():
             pass
 
         else:
-            ks.touch()
+            AppConfig.KEYS_FILE.touch()
 
     @staticmethod
     def files_for_autostart() -> None:
@@ -80,11 +80,11 @@ class Create:
     def make_dir() -> None:
         """Folder Name "tlecdewg" = Tunnel Encrypt Decrypt Wireguard"""
 
-        folder_path: Path = Path("/tmp/tlecdcwg/")
-        if folder_path.exists():
+        AppConfig.TEMP_DIR: Path = Path("/tmp/tlecdcwg/")
+        if AppConfig.TEMP_DIR.exists():
             pass
         else:
-            folder_path.mkdir()
+            AppConfig.TEMP_DIR.mkdir()
 
     @staticmethod
     def decrypt() -> None:
@@ -135,19 +135,18 @@ class LxTools(tk.Tk):
         """
         log_name: str = f"{Path.home()}"[6:]
         file: Path = Path.home() / "/tmp/.log_user"
-        with open(file, "w", encoding="utf-8") as f:
-            f.write(log_name)
+        Path(file).write_text(log_name, encoding="utf-8")
 
     @staticmethod
-    def clean_files(folder_path: Path = None, file: Path = None) -> None:
+    def clean_files(TEMP_DIR: Path = None, file: Path = None) -> None:
         """
         method that can be added after need to delete a folder and a file when quitting.
         Args:
             :param file: default None
-            :param folder_path: default None
+            :param AppConfig.TEMP_DIR: default None
         """
-        if folder_path is not None:
-            shutil.rmtree(folder_path)
+        if AppConfig.TEMP_DIR is not None:
+            shutil.rmtree(AppConfig.TEMP_DIR)
         if file is not None:
             Path.unlink(file)
 
@@ -156,14 +155,22 @@ class LxTools(tk.Tk):
         """
         method that writes in file whether tooltip is displayed or not
         """
-        with open(path, "r", encoding="utf-8") as set_f2:
-            lines2 = set_f2.readlines()
-            if "False\n" in lines2:
-                tip = False
-            else:
-                tip = True
-            return tip
+        lines = Path(path).read_text(encoding="utf-8")
+        if "False\n" in lines:
+            tip = False
+        else:
+            tip = True
+        return tip
 
+
+    def theme_change(self) -> None:
+
+        lines = AppConfig.SETTINGS_FILE.read_text()
+        if "light\n" in lines:
+            self.tk.call("set_theme", "light")
+        else:
+            self.tk.call("set_theme", "dark")
+            
     @staticmethod
     def msg_window(img_w: str, img_i: str, w_title: str, w_txt: str, txt2: Optional[str] = None,
                    com: Optional[str] = None) -> None:
@@ -394,8 +401,8 @@ class Tunnel:
         """
         Returns a list of Wireguard tunnel names
         """
-        folder_path: Path = Path("/tmp/tlecdcwg/")
-        wg_s: List[str] = os.listdir(folder_path)
+        AppConfig.TEMP_DIR: Path = Path("/tmp/tlecdcwg/")
+        wg_s: List[str] = os.listdir(AppConfig.TEMP_DIR)
 
         return wg_s
 

install

@@ -17,7 +17,7 @@ install_file_with(){
       exit 0
   else 
     sudo apt install python3-tk && \
-    sudo cp -fv wirepy.py start_wg.py cls_mth_fc.py ssl_encrypt.py ssl_decrypt.py /usr/local/bin/ && \
+    sudo cp -fv wirepy.py start_wg.py wp_app_config.py cls_mth_fc.py ssl_encrypt.py ssl_decrypt.py /usr/local/bin/ && \
     sudo cp -uR lx-icons /usr/share/icons/ &&  sudo cp -uR TK-Themes /usr/share/ && \
     sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
     sudo cp -fv Wire-Py.desktop /usr/share/applications/ && \
@@ -43,7 +43,7 @@ install_arch_d(){
         exit 0
   else 
     sudo pacman -S --noconfirm tk python3 python-requests && \
-    sudo cp -fv wirepy.py start_wg.py cls_mth_fc.py ssl_encrypt.py ssl_decrypt.py /usr/local/bin/ && \
+    sudo cp -fv wirepy.py start_wg.py wp_app_config.py cls_mth_fc.py ssl_encrypt.py ssl_decrypt.py /usr/local/bin/ && \
     sudo cp -uR lx-icons /usr/share/icons/ &&  sudo cp -uR TK-Themes /usr/share/ && \
     sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
     sudo cp -fv Wire-Py.desktop /usr/share/applications/ && \
@@ -120,7 +120,7 @@ install(){
             exit 0
       else
         sudo dnf install python3-tkinter -y
-        sudo cp -fv wirepy.py start_wg.py cls_mth_fc.py ssl_encrypt.py ssl_decrypt.py /usr/local/bin/ && \
+        sudo cp -fv wirepy.py start_wg.py wp_app_config.py cls_mth_fc.py ssl_encrypt.py ssl_decrypt.py /usr/local/bin/ && \
         sudo cp -uR lx-icons /usr/share/icons/ &&  sudo cp -uR TK-Themes /usr/share/ && \
         sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
         sudo cp -fv Wire-Py.desktop /usr/share/applications/  && \
@@ -145,7 +145,7 @@ install(){
           rm -r ~/.config/wire_py && rm -r ~/.config/systemd
           exit 0
       else 
-        sudo cp -fv wirepy.py start_wg.py cls_mth_fc.py ssl_encrypt.py ssl_decrypt.py /usr/local/bin/ && \
+        sudo cp -fv wirepy.py start_wg.py wp_app_config.py cls_mth_fc.py ssl_encrypt.py ssl_decrypt.py /usr/local/bin/ && \
         sudo cp -uR lx-icons /usr/share/icons/ &&  sudo cp -uR TK-Themes /usr/share/ && \
         sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
         sudo cp -fv Wire-Py.desktop /usr/share/applications/ && \
@@ -181,7 +181,7 @@ install(){
 
 remove(){
     sudo rm -f /usr/local/bin/wirepy /usr/local/bin/wirepy.py /usr/local/bin/start_wg.py \
-    /usr/local/bin/cls_mth_fc.py /usr/local/bin/ssl_encrypt.py /usr/local/bin/ssl_decrypt.py 
+    /usr/local/bin/wp_app_config.py cls_mth_fc.py /usr/local/bin/ssl_encrypt.py /usr/local/bin/ssl_decrypt.py 
     if [ $? -ne 0 ]
       then
         exit 0

ssl_decrypt.py

@@ -5,14 +5,12 @@ import os
 import shutil
 from pathlib import Path
 from subprocess import check_call
+from wp_app_config import AppConfig
 
 uname: Path = Path("/tmp/.log_user")
 
-with open(uname, "r", encoding="utf-8") as f:
-    log_name = f.readline()
+log_name = Path(uname).read_text(encoding="utf-8")
 
-# Folder Name "tlecdewg" = Tunnel Encrypt Decrypt Wireguard
-folder_path: Path = Path("/tmp/tlecdcwg/")
 keyfile: Path = Path(f"/home/{log_name}/.config/wire_py/pbwgk.pem")
 PKEYFILE: Path = "/usr/local/etc/ssl/pwgk.pem"
 
@@ -21,15 +19,16 @@ if not keyfile.is_file():
     check_call(["openssl", "rsa", "-in", PKEYFILE, "-out", keyfile, "-outform", "PEM", "-pubout"])
     shutil.chown(keyfile, 1000, 1000)
 
-folder_path2 = f"/home/{log_name}/.config/wire_py/"
-detl: list[str] = os.listdir(folder_path2)
-os.chdir(folder_path2)
+AppConfig.TEMP_DIR2 = f"/home/{log_name}/.config/wire_py/"
+detl: list[str] = os.listdir(AppConfig.TEMP_DIR2)
+os.chdir(AppConfig.TEMP_DIR2)
 detl.remove("keys")
 detl.remove("settings")
-if os.path.exists(f"{folder_path2}pbwgk.pem"):
+if os.path.exists(f"{AppConfig.TEMP_DIR2}pbwgk.pem"):
     detl.remove("pbwgk.pem")
     for detunnels in detl:
         tlname2 = f"{detunnels[:-4]}.conf"
-        extpath = f"{folder_path}/{tlname2}"
-        check_call(["openssl", "pkeyutl", "-decrypt", "-inkey", PKEYFILE, "-in", detunnels, "-out", extpath])
+        extpath = f"{AppConfig.TEMP_DIR}/{tlname2}"
+        check_call(["openssl", "pkeyutl", "-decrypt", "-inkey", PKEYFILE, "-in", detunnels,
+                    "-out", extpath])
         shutil.chown(extpath, 1000, 1000)

ssl_encrypt.py

@@ -6,13 +6,13 @@ import shutil
 from pathlib import Path
 from subprocess import check_call
 
+from wp_app_config import AppConfig
+
 uname: Path = Path("/tmp/.log_user")
 
-with open(uname, "r", encoding="utf-8") as f:
-    log_name: str = f.readline()
+log_name = Path(uname).read_text(encoding="utf-8")
 
 keyfile: Path = Path(f"/home/{log_name}/.config/wire_py/pbwgk.pem")
-folder_path: Path = Path("/tmp/tlecdcwg/")
 PKEYFILE = "/usr/local/etc/ssl/pwgk.pem"
 
 if not keyfile.is_file():
@@ -20,28 +20,28 @@ if not keyfile.is_file():
     check_call(["openssl", "rsa", "-in", PKEYFILE, "-out", keyfile, "-outform", "PEM", "-pubout"])
     shutil.chown(keyfile, 1000, 1000)
 
-    if folder_path.exists():
-        tl = os.listdir(f"{folder_path}")
+    if AppConfig.TEMP_DIR.exists():
+        tl = os.listdir(f"{AppConfig.TEMP_DIR}")
         CPTH: str = f"{keyfile}"
         CRYPTFILES: str = CPTH[:-9]
 
         if keyfile.exists() and len(tl) != 0:
             for tunnels in tl:
-                sourcetl: str = f"{folder_path}/{tunnels}"
+                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,])
 
 else:
 
-    if folder_path.exists():
-        tl: list[str] = os.listdir(f"{folder_path}")
+    if AppConfig.TEMP_DIR.exists():
+        tl: list[str] = os.listdir(f"{AppConfig.TEMP_DIR}")
         CPTH: str = f"{keyfile}"
         CRYPTFILES: str = CPTH[:-9]
 
         if keyfile.exists() and len(tl) != 0:
             for tunnels in tl:
-                sourcetl: str = f"{folder_path}/{tunnels}"
+                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])

start_wg.py

@@ -7,12 +7,9 @@ from subprocess import check_call
 
 path_to_file = Path(Path.home() / ".config/wire_py/settings")
 
-with open(path_to_file, "r", encoding="utf-8") as a_con:
-
-    # This function is for the independent autostarted of the previously selected tunnel
-    lines = a_con.readlines()
-    a_con = lines[7].strip()
-    if a_con != "off":
-        check_call(["nmcli", "connection", "up", a_con])
-    else:
-        pass
+a_con = Path(path_to_file).read_text(encoding="utf-8").splitlines(keepends=True)
+a_con = a_con[7].strip()
+if a_con != "off":
+    check_call(["nmcli", "connection", "up", a_con])
+else:
+    pass

wp_app_config.py

@@ -0,0 +1,81 @@
+from pathlib import Path
+from typing import Dict, Any
+
+class AppConfig:
+    """Central configuration class for the application"""
+    
+    # Base paths
+    BASE_DIR = Path.home()
+    CONFIG_DIR = BASE_DIR / ".config/wire_py"
+    TEMP_DIR = Path("/tmp/tlecdcwg")
+    USER_FILE = Path("/tmp/.log_user")
+
+    # Configuration files
+    SETTINGS_FILE = CONFIG_DIR / "settings"
+    KEYS_FILE = CONFIG_DIR / "keys"
+    AUTOSTART_SERVICE = Path.home() / ".config/systemd/user/wg_start.service"
+    
+    # Localization
+    APP_NAME = "wirepy"
+    LOCALE_DIR = "/usr/share/locale/"
+    
+    # Default settings
+    DEFAULT_SETTINGS = {
+        "updates": "on",
+        "theme": "light",
+        "tooltip": True,
+        "autostart": "off"
+    }
+    
+    # UI configuration
+    UI_CONFIG = {
+        "window_title": "Wire-Py",
+        "window_size": (600, 383),
+        "font_family": "Ubuntu",
+        "font_size": 11,
+        "resizable_window": (False, False)
+    }
+    
+    # System-dependent paths
+    SYSTEM_PATHS = {
+        "ssl_decrypt": "/usr/local/bin/ssl_decrypt.py",
+        "ssl_encrypt": "/usr/local/bin/ssl_encrypt.py",
+        "tcl_path": "/usr/share/TK-Themes"
+    }
+    
+    @classmethod
+    def ensure_directories(cls) -> None:
+        """Ensures that all required directories exist"""
+        cls.CONFIG_DIR.mkdir(parents=True, exist_ok=True)
+        cls.TEMP_DIR.mkdir(parents=True, exist_ok=True)
+    
+    @classmethod
+    def create_default_settings(cls) -> None:
+        """Creates default settings if they don't exist"""
+        if not cls.SETTINGS_FILE.exists():
+            content = "\n".join(f"[{k.upper()}]\n{v}" for k, v in cls.DEFAULT_SETTINGS.items())
+            cls.SETTINGS_FILE.write_text(content)
+    
+    @classmethod
+    def get_image_paths(cls) -> Dict[str, Path]:
+        """Returns paths to UI images"""
+        return {
+            "main_icon": cls.CONFIG_DIR / "images/main.png",
+            "warning": cls.CONFIG_DIR / "images/warning.png",
+            "success": cls.CONFIG_DIR / "images/success.png",
+            "error": cls.CONFIG_DIR / "images/error.png"
+        }
+    
+    @classmethod
+    def get_autostart_content(cls) -> str:
+        """Returns the content for the autostart service file"""
+        return """[Unit]
+Description=Automatic Tunnel Start
+After=network-online.target
+
+[Service]
+Type=oneshot
+ExecStartPre=/bin/sleep 5
+ExecStart=/usr/local/bin/start_wg.py
+[Install]
+WantedBy=default.target"""