Merge pull request 'wire-py-reformat-14-09-2024' (#14) from wire-py-reformat-14-09-2024 into main

Reviewed-on: https://git.ilunix.de/punix/Wire-Py/pulls/14

.idea/workspace.xml

@@ -4,11 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="little fixes">
-      <change afterPath="$PROJECT_DIR$/home/punix/.config/wire_py/wg_py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/install.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/punix/.config/wire_py/wg_py" afterDir="false" />
+    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="little fixes a labels when stop and start, installer first functions works">
+      <change afterPath="$PROJECT_DIR$/message.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/test.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/test2.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/install.py" beforeDir="false" afterPath="$PROJECT_DIR$/install.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/start_wg.py" beforeDir="false" afterPath="$PROJECT_DIR$/start_wg.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/wg_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_func.py" afterDir="false" />
@@ -49,8 +50,10 @@
   <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.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.wg_func.executor&quot;: &quot;Run&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
@@ -342,10 +345,31 @@
       <option name="project" value="LOCAL" />
       <updated>1725746027132</updated>
     </task>
-    <option name="localTasksCounter" value="28" />
+    <task id="LOCAL-00028" summary="little fixes replace os.system with check_call&#10;first steps in install Script add wg_start.service file">
+      <option name="closed" value="true" />
+      <created>1725820337669</created>
+      <option name="number" value="00028" />
+      <option name="presentableId" value="LOCAL-00028" />
+      <option name="project" value="LOCAL" />
+      <updated>1725820337669</updated>
+    </task>
+    <task id="LOCAL-00029" summary="little fixes a labels when stop and start, installer first functions works">
+      <option name="closed" value="true" />
+      <created>1725991610908</created>
+      <option name="number" value="00029" />
+      <option name="presentableId" value="LOCAL-00029" />
+      <option name="project" value="LOCAL" />
+      <updated>1725991610908</updated>
+    </task>
+    <option name="localTasksCounter" value="30" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
+    <option name="OPEN_GENERIC_TABS">
+      <map>
+        <entry key="f9756e7d-0c5c-4b84-84e4-660314c46ea4" value="TOOL_WINDOW" />
+      </map>
+    </option>
     <option name="TAB_STATES">
       <map>
         <entry key="MAIN">
@@ -365,13 +389,16 @@
             </State>
           </value>
         </entry>
+        <entry key="f9756e7d-0c5c-4b84-84e4-660314c46ea4">
+          <value>
+            <State />
+          </value>
+        </entry>
       </map>
     </option>
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="Tunnel Start and Stop Work" />
-    <MESSAGE value="wg_import_select in wg_func.py extended" />
     <MESSAGE value="add class Frame and class Massage, delete funktion go 100%, add resize window" />
     <MESSAGE value="add class Frame and class Massage, delete funktion go 100%, add resize window, add warning pic" />
     <MESSAGE value="add class ListTunnels and class ImportTunnel, and add class ExportTunnels (ExportTunnels no finish)" />
@@ -395,6 +422,8 @@
     <MESSAGE value="fixes on empty Listbox now is disable and now works autoconnect label with read and write, delete works now with read and write" />
     <MESSAGE value="add Frame widget 3&#10;for Buttons and Listbox with Scrollbar.&#10;all Widgets new format&#10;delete works now of disable checkbox when Listbox empty (part two)" />
     <MESSAGE value="little fixes" />
-    <option name="LAST_COMMIT_MESSAGE" value="little fixes" />
+    <MESSAGE value="little fixes replace os.system with check_call&#10;first steps in install Script add wg_start.service file" />
+    <MESSAGE value="little fixes a labels when stop and start, installer first functions works" />
+    <option name="LAST_COMMIT_MESSAGE" value="little fixes a labels when stop and start, installer first functions works" />
   </component>
 </project>

install.py

@@ -1,17 +1,34 @@
 #!/usr/bin/python3
-import os
 from pathlib import Path
+from getpass import getpass
 
-home = Path.home()
 # for services file in /lib/systemd/system/
-path_for_a_con = home / '.config/wire_py/wg_py'
-# create dir in home
-mkdir = home / '.config/wire_py'
-os.makedirs(mkdir, exist_ok=True)
+config_path = Path.home() / ".config" / "wire_py" / "wg_py"
 
-with open(mkdir / 'wg_py', 'w+') as file:
-    if 'true' not in file:
-        file.write('false')
+start_file = f'''\
+#!/usr/bin/python3
+from subprocess import check_call
 
-file.close()
+path_to_file = {str(config_path)!r}
 
+with open(path_to_file, 'r') as file:
+    *_, line = file
+a_con = line[5:]
+check_call(['nmcli', 'connection', 'up', a_con])
+'''
+
+Path("start_wg.py").write_text(start_file)
+
+config_path.parent.mkdir(exist_ok=True)
+if not Path.exists(config_path):
+    config_path.write_text("false")
+
+# Prompt the user for the sudo password
+#sudo_password = getpass('Enter sudo password: ')
+#def cp_files():
+
+# Define the command to run the Python script with sudo
+#command = ['sudo', '-S', 'python3', 'script.py']
+
+# Run the command as a subprocess, passing the sudo password
+#subprocess.run(command, input=sudo_password.encode(), check=True)

main.py

@@ -8,7 +8,6 @@ from wg_func import (TunnelActiv, ListTunnels, ImportTunnel, ConToDict, GreenLab
                      FileHandle, ExportTunnels, OnOff)
 
 font_color = '#4011a7'
-home = Path.home()
 
 
 class MainWindow(tk.Tk):
@@ -128,13 +127,12 @@ class FrameWidgets(ttk.Frame):
         # Button Vpn
         if self.a != '':
             StartStopBTN.button_stop(self)
-            wg_read = home / 'tester/' / str(self.a + '.conf')
+            wg_read = Path.home() / 'tester/' / str(self.a + '.conf')
             with open(wg_read, 'r') as file:
                 data = ConToDict.covert_to_dict(file)
             # Address Label
             ShowAddress.init_and_report(self, data)
             ShowAddress.show_data(self)
-            file.close()
         else:
             StartStopBTN.button_start(self)
             # Address Label
@@ -155,30 +153,30 @@ class FrameWidgets(ttk.Frame):
                 select_tl = self.l_box.get(self.select_tunnel[0])
                 check_call(['nmcli', 'connection', 'delete', select_tl])
                 self.l_box.delete(self.select_tunnel[0])
-                os.remove(home / 'tester/' / str(select_tl + '.conf'))
+                os.remove(Path.home() / 'tester/' / str(select_tl + '.conf'))
 
-                path_to_file = home / '.config/wire_py/wg_py'
+                path_to_file = Path.home() / '.config/wire_py/wg_py'
                 with open(path_to_file, 'r') as file2:
                     for line in file2.readlines():
                         a_con = line[5:]
                 if select_tl == a_con:
                     self.selected_option.set(0)
-                    self.auto_con = 'no Autoconnect'
-                    with open(path_to_file, 'w') as file2:
-                        file2.write('false')
-                        file2.close()
-
+                    self.autoconnect_var.set('no Autoconnect')
                 # for disable checkbox when Listbox empty
                 tl = ListTunnels.tl_list()
                 if len(tl) == 0:
                     self.wg_autostart.configure(state='disabled')
+                    with open(path_to_file, 'w') as file2:
+                        file2.write('false')
 
                 if self.a != '' and self.a == select_tl:
                     self.StrVar.set(value='')
                     StartStopBTN.button_start(self)
                     self.l_box.update()
                     # Address Label
-                    ShowAddress.label_empty(self)
+                    self.add.set('')
+                    self.DNS.set('')
+                    self.enp.set('')
 
                 return select_tl
             except IndexError:
@@ -223,13 +221,12 @@ class FrameWidgets(ttk.Frame):
                 self.select_tunnel = self.l_box.curselection()
                 select_tl = self.l_box.get(self.select_tunnel[0])
                 check_call(['nmcli', 'connection', 'up', select_tl])
-                wg_read = home / 'tester/' / str(select_tl + '.conf')
+                wg_read = Path.home() / 'tester/' / str(select_tl + '.conf')
                 with open(wg_read, 'r') as file:
                     data = ConToDict.covert_to_dict(file)
                 # Address Label
                 ShowAddress.init_and_report(self, data)
                 ShowAddress.show_data(self)
-                file.close()
                 # Button Start/Stop
                 StartStopBTN.button_stop(self)
                 self.a = TunnelActiv.active()
@@ -246,7 +243,9 @@ class FrameWidgets(ttk.Frame):
                 self.StrVar.set('')
                 GreenLabel.green_show_label(self)
                 # Address Label
-                ShowAddress.label_empty(self)
+                self.add.set('')
+                self.DNS.set('')
+                self.enp.set('')
                 ShowAddress.show_data(self)
         except IndexError:
             pass

start_wg.py

@@ -1,12 +1,9 @@
 #!/usr/bin/python3
 from subprocess import check_call
-from pathlib import Path
 
-home = Path.home()
-path_to_file = home / '.config/wire_py/wg_py'
+path_to_file = '/home/punix/.config/wire_py/wg_py'
 
 with open(path_to_file, 'r') as file:
-    for line in file.readlines():
-        a_con = line[5:]
+    *_, line = file
+a_con = line[5:]
 check_call(['nmcli', 'connection', 'up', a_con])
-file.close()

wg_func.py

@@ -7,39 +7,37 @@ import tkinter as tk
 from pathlib import Path
 from subprocess import check_call
 
-home = Path.home()
 font_color = '#4011a7'
-path_to_file = home / '.config/wire_py/wg_py'
+path_to_file = Path.home() / '.config/wire_py/wg_py'
 
 
-class Message(tk.Tk):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        self.warning_pic = None
-        self.x_width = 300
-        self.y_height = 120
-        self.monitor_center_x = self.winfo_screenwidth() / 2 - (self.x_width / 2)
-        self.monitor_center_y = self.winfo_screenheight() / 2 - (self.y_height / 2)
-        self.resizable(width=False, height=False)
-        self.title('Import error!')
-        self.configure()
-        self.geometry('%dx%d+%d+%d' % (self.x_width, self.y_height, self.monitor_center_x, self.monitor_center_y))
-        self.columnconfigure(0, weight=1)
-
-        self.label = tk.Label(self,
-                              image=self.warning_pic,
-                              text='Oh... no valid Wireguard File!\nPlease select a valid Wireguard File')
-        self.label.config(font=('Ubuntu', 11), padx=15, pady=15)
-        self.label.grid(column=0, row=0)
-        self.button = tk.Button(self, text='OK', command=self.destroy)
-        self.button.config(padx=15, pady=5)
-        self.button.grid(column=0, row=1)
+def msg_window():
+    msg = tk.Toplevel()
+    msg.resizable(width=False, height=False)
+    msg.x_width = 340
+    msg.y_height = 140
+    msg.title('Import error!')
+    msg.monitor_center_x = msg.winfo_screenwidth() / 2 - (msg.x_width / 2)
+    msg.monitor_center_y = msg.winfo_screenheight() / 2 - (msg.y_height / 2)
+    msg.geometry('%dx%d+%d+%d' % (msg.x_width, msg.y_height, msg.monitor_center_x, msg.monitor_center_y))
+    msg.columnconfigure(0, weight=1)
+    msg.configure(pady=20)
+    msg.warning = tk.PhotoImage(file=r'icons/warning_64.png')
+    msg.i_warning = tk.Label(msg, image=msg.warning)
+    msg.i_warning.grid(column=0, row=0)
+    label = tk.Label(msg, text='Oh... no valid Wireguard File!\nPlease select a valid Wireguard File')
+    label.config(font=('Ubuntu', 11), padx=15, pady=15)
+    label.grid(column=1, row=0)
+    button = tk.Button(msg, text='OK', command=msg.destroy)
+    button.config(padx=15, pady=5)
+    button.grid(column=0, columnspan=2, row=1)
+    wg_icon_2 = tk.PhotoImage(file=r'icons/wg-stop.png')
+    msg.iconphoto(True, wg_icon_2)
+    msg.winfo_toplevel()
 
 
-class GreenLabel(tk.Tk):
-    def __init__(self, container, **kwargs):
-        super().__init__(container, **kwargs)
+class GreenLabel:
+    def __init__(self):
         self.StrVar = None
         self.lb_tunnel = None
 
@@ -50,10 +48,15 @@ class GreenLabel(tk.Tk):
         self.columnconfigure(2, weight=1)
         self.rowconfigure(0, weight=1)
 
+    def columnconfigure(self, param, weight):
+        pass
 
-class StartStopBTN(tk.Tk):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def rowconfigure(self, param, weight):
+        pass
+
+
+class StartStopBTN:
+    def __init__(self):
         self.lb_frame_btn_lbox = None
         self.wg_switch = None
         self.btn_stst = None
@@ -116,9 +119,8 @@ class TunnelActiv:
         return active
 
 
-class ShowAddress(tk.Tk):
-    def __init__(self, container, **kwargs):
-        super().__init__(container, **kwargs)
+class ShowAddress:
+    def __init__(self):
         self.lb_frame2 = None
         self.lb_frame = None
         self.endpoint = None
@@ -165,9 +167,9 @@ class ListTunnels:
         return tl
 
 
-class ImportTunnel(tk.Tk):
-    def __init__(self, container, **kwargs):
-        super().__init__(container, **kwargs)
+class ImportTunnel:
+
+    def __init__(self):
 
         self.select_tunnel = None
         self.wg_switch = None
@@ -179,26 +181,29 @@ class ImportTunnel(tk.Tk):
 
     def wg_import_select(self):
         try:
-            filepath = filedialog.askopenfilename(initialdir=home, title='Select Wireguard config File',
-                                                  filetypes=[('WG config files', '*.conf')])
-            file = open(filepath, 'r')
+            filepath = filedialog.askopenfilename(initialdir=Path.home(), title='Select Wireguard config File',
+                                                  filetypes=[('WG config files', '*.conf')], )
+            with open(filepath, 'r') as file:
                 read = file.read()
-            file.close()
             path_split = filepath.split('/')
             path_split1 = path_split[-1]
+            self.a = TunnelActiv.active()
             if 'PrivateKey = ' in read and 'PublicKey = ' in read:
                 if len(path_split1) > 17:
-                    p1 = shutil.copy(filepath, home / 'tester/')
+                    p1 = shutil.copy(filepath, Path.home() / 'tester/')
                     path_split = path_split1[len(path_split1) - 17:]
-                    os.rename(p1, home / 'tester/' / str(path_split))
+                    os.rename(p1, Path.home() / 'tester/' / str(path_split))
+
                     if self.a != '':
                         check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
-                    check_call(['nmcli', 'connection', 'import', 'type', 'wireguard', 'file', home / 'tester' /
+                        ShowAddress.label_empty(self)
+                    check_call(['nmcli', 'connection', 'import', 'type', 'wireguard', 'file', Path.home() / 'tester' /
                                 path_split])
                 else:
-                    shutil.copy(filepath, home / 'tester/')
+                    shutil.copy(filepath, Path.home() / 'tester/')
                     if self.a != '':
                         check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
+                        ShowAddress.label_empty(self)
                     check_call(['nmcli', 'connection', 'import', 'type', 'wireguard', 'file', filepath])
 
                 self.StrVar.set('')
@@ -209,16 +214,15 @@ class ImportTunnel(tk.Tk):
                 self.StrVar.set(self.a)
                 GreenLabel.green_show_label(self)
                 StartStopBTN.button_stop(self)
-                wg_read = home / 'tester/' / str(self.a + '.conf')
+                wg_read = Path.home() / 'tester/' / str(self.a + '.conf')
                 with open(wg_read, 'r') as file:
                     data = ConToDict.covert_to_dict(file)
                 # Address Label
                 ShowAddress.init_and_report(self, data)
                 ShowAddress.show_data(self)
-                file.close()
                 check_call(['nmcli', 'con', 'mod', self.a, 'connection.autoconnect', 'no'])
             if 'PrivateKey = ' not in read:
-                Message()
+                msg_window()
         except EOFError:
             pass
         except TypeError:
@@ -238,20 +242,20 @@ class FileHandle:
         self.tl = None
         self.selected_option = None
         self.l_box = None
-        self.select_tunnel = None
 
     def box_set(self):
         try:
-            self.select_tunnel = self.l_box.curselection()
-            select_tl = self.l_box.get(self.select_tunnel[0])
+            select_tunnel = self.l_box.curselection()
+            select_tl = self.l_box.get(select_tunnel[0])
             if self.selected_option.get() == 0:
-                off = open(path_to_file, 'w')
+                with open(path_to_file, 'w') as off:
                     off.write('false ' + '\n')
-                off.close()
+                tl = ListTunnels.tl_list()
+                if len(tl) == 0:
+                    self.wg_autostart.configure(state='disabled')
             if self.selected_option.get() >= 1:
-                set_on = open(path_to_file, 'w')
+                with open(path_to_file, 'w') as set_on:
                     set_on.write('true ' + select_tl)
-                set_on.close()
 
         except IndexError:
             self.selected_option.set(1)
@@ -259,9 +263,13 @@ class FileHandle:
         OnOff.on_off(self)
 
 
-class OnOff(tk.Tk, FileHandle):
-    def __init__(self, container, **kwargs):
-        super().__init__(container, **kwargs)
+class OnOff:
+    def __init__(self):
+        self.wg_autostart = None
+        self.selected_option = None
+        self.auto_con = None
+        self.autoconnect = None
+        self.autoconnect_var = None
         self.lb_frame_buttons = None
 
     def on_off(self):
@@ -275,7 +283,6 @@ class OnOff(tk.Tk, FileHandle):
             else:
                 self.wg_autostart.configure(state='disabled')
                 self.auto_con = 'no Autoconnect'
-        file.close()
 
         self.autoconnect_var = tk.StringVar()
         self.autoconnect_var.set(self.auto_con)
@@ -292,8 +299,8 @@ class ExportTunnels:
         tl = ListTunnels.tl_list()
         try:
             if len(tl) != 0:
-                wg_tar = home / now_datetime
-                p_to_conf = home / 'tester/'
+                wg_tar = Path.home() / now_datetime
+                p_to_conf = Path.home() / 'tester/'
                 shutil.make_archive(wg_tar, 'zip', p_to_conf)
                 #if zip_full != 0:
                 #print('Export erfolgraeich')