From 6ab9c43c3a5945e48ab6e84cec8ffb37d0545e78 Mon Sep 17 00:00:00 2001
From: punix <polunga40@unity-mail.de>
Date: Mon, 19 Aug 2024 08:29:35 +0200
Subject: [PATCH] add class ListTunnels and class ImportTunnel, and add class
 ExportTunnels (ExportTunnels no finish)

---
 .../shelved.patch                             |  76 +++++++++++++
 .../shelved.patch                             |   0
 ..._Checkout_at_19_08_24__06_49__Changes_.xml |   4 +
 main.py                                       |  10 +-
 wg_func.py                                    | 104 +++++++++++-------
 5 files changed, 150 insertions(+), 44 deletions(-)
 create mode 100644 .idea/shelf/Uncommitted_changes_before_Checkout_at_19_08_24,_06_49_[Changes]/shelved.patch
 create mode 100644 .idea/shelf/Uncommitted_changes_before_Checkout_at_19_08_24,_06_49_[Changes]1/shelved.patch
 create mode 100644 .idea/shelf/Uncommitted_changes_before_Checkout_at_19_08_24__06_49__Changes_.xml

diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_19_08_24,_06_49_[Changes]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Checkout_at_19_08_24,_06_49_[Changes]/shelved.patch
new file mode 100644
index 0000000..99be84b
--- /dev/null
+++ b/.idea/shelf/Uncommitted_changes_before_Checkout_at_19_08_24,_06_49_[Changes]/shelved.patch
@@ -0,0 +1,76 @@
+Index: .idea/workspace.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<project version=\"4\">\n  <component name=\"AutoImportSettings\">\n    <option name=\"autoReloadType\" value=\"SELECTIVE\" />\n  </component>\n  <component name=\"ChangeListManager\">\n    <list default=\"true\" id=\"940e1630-c825-4d4c-be80-bc11f543c122\" name=\"Changes\" comment=\"add class Frame and class Massage, delete funktion go 100%, add resize window, add warning pic\">\n      <change beforePath=\"$PROJECT_DIR$/.idea/workspace.xml\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/.idea/workspace.xml\" afterDir=\"false\" />\n      <change beforePath=\"$PROJECT_DIR$/main.py\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/main.py\" afterDir=\"false\" />\n      <change beforePath=\"$PROJECT_DIR$/wg_func.py\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/wg_func.py\" afterDir=\"false\" />\n    </list>\n    <option name=\"SHOW_DIALOG\" value=\"false\" />\n    <option name=\"HIGHLIGHT_CONFLICTS\" value=\"true\" />\n    <option name=\"HIGHLIGHT_NON_ACTIVE_CHANGELIST\" value=\"false\" />\n    <option name=\"LAST_RESOLUTION\" value=\"IGNORE\" />\n  </component>\n  <component name=\"FileTemplateManagerImpl\">\n    <option name=\"RECENT_TEMPLATES\">\n      <list>\n        <option value=\"Python Script\" />\n      </list>\n    </option>\n  </component>\n  <component name=\"Git.Settings\">\n    <option name=\"RECENT_BRANCH_BY_REPOSITORY\">\n      <map>\n        <entry key=\"$PROJECT_DIR$\" value=\"main\" />\n      </map>\n    </option>\n    <option name=\"RECENT_GIT_ROOT_PATH\" value=\"$PROJECT_DIR$\" />\n  </component>\n  <component name=\"ProjectColorInfo\">{\n  &quot;associatedIndex&quot;: 3\n}</component>\n  <component name=\"ProjectId\" id=\"2kSbZdjOvr0wsVJSNcaMwSfVaxR\" />\n  <component name=\"ProjectLevelVcsManager\" settingsEditedManually=\"true\">\n    <ConfirmationsSetting value=\"2\" id=\"Add\" />\n  </component>\n  <component name=\"ProjectViewState\">\n    <option name=\"hideEmptyMiddlePackages\" value=\"true\" />\n    <option name=\"showLibraryContents\" value=\"true\" />\n  </component>\n  <component name=\"PropertiesComponent\">{\n  &quot;keyToString&quot;: {\n    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,\n    &quot;Python.main.executor&quot;: &quot;Run&quot;,\n    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,\n    &quot;git-widget-placeholder&quot;: &quot;wire-py-reformat-14-08-2024&quot;,\n    &quot;last_opened_file_path&quot;: &quot;/home/punix/Downloads/tkinter-bitcoin_price_converter_objectoriented(1).py&quot;\n  }\n}</component>\n  <component name=\"RunManager\">\n    <configuration name=\"main\" type=\"PythonConfigurationType\" factoryName=\"Python\" nameIsGenerated=\"true\">\n      <module name=\"wire-py\" />\n      <option name=\"ENV_FILES\" value=\"\" />\n      <option name=\"INTERPRETER_OPTIONS\" value=\"\" />\n      <option name=\"PARENT_ENVS\" value=\"true\" />\n      <envs>\n        <env name=\"PYTHONUNBUFFERED\" value=\"1\" />\n      </envs>\n      <option name=\"SDK_HOME\" value=\"\" />\n      <option name=\"WORKING_DIRECTORY\" value=\"$PROJECT_DIR$\" />\n      <option name=\"IS_MODULE_SDK\" value=\"true\" />\n      <option name=\"ADD_CONTENT_ROOTS\" value=\"true\" />\n      <option name=\"ADD_SOURCE_ROOTS\" value=\"true\" />\n      <option name=\"SCRIPT_NAME\" value=\"$PROJECT_DIR$/main.py\" />\n      <option name=\"PARAMETERS\" value=\"\" />\n      <option name=\"SHOW_COMMAND_LINE\" value=\"false\" />\n      <option name=\"EMULATE_TERMINAL\" value=\"false\" />\n      <option name=\"MODULE_MODE\" value=\"false\" />\n      <option name=\"REDIRECT_INPUT\" value=\"false\" />\n      <option name=\"INPUT_FILE\" value=\"\" />\n      <method v=\"2\" />\n    </configuration>\n  </component>\n  <component name=\"SharedIndexes\">\n    <attachedChunks>\n      <set>\n        <option value=\"bundled-python-sdk-8336bb23522e-31b6be0877a2-com.jetbrains.pycharm.community.sharedIndexes.bundled-PC-241.19072.16\" />\n      </set>\n    </attachedChunks>\n  </component>\n  <component name=\"SpellCheckerSettings\" RuntimeDictionaries=\"0\" Folders=\"0\" CustomDictionaries=\"0\" DefaultDictionary=\"application-level\" UseSingleDictionary=\"true\" transferred=\"true\" />\n  <component name=\"TaskManager\">\n    <task active=\"true\" id=\"Default\" summary=\"Default task\">\n      <changelist id=\"940e1630-c825-4d4c-be80-bc11f543c122\" name=\"Changes\" comment=\"\" />\n      <created>1723279982210</created>\n      <option name=\"number\" value=\"Default\" />\n      <option name=\"presentableId\" value=\"Default\" />\n      <updated>1723279982210</updated>\n    </task>\n    <task id=\"LOCAL-00001\" summary=\"Tunnel Start and Stop Work\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1723666001005</created>\n      <option name=\"number\" value=\"00001\" />\n      <option name=\"presentableId\" value=\"LOCAL-00001\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1723666001005</updated>\n    </task>\n    <task id=\"LOCAL-00002\" summary=\"Tunnel Start and Stop Work\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1723666477079</created>\n      <option name=\"number\" value=\"00002\" />\n      <option name=\"presentableId\" value=\"LOCAL-00002\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1723666477079</updated>\n    </task>\n    <task id=\"LOCAL-00003\" summary=\"wg_import_select in wg_func.py extended\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1723847456806</created>\n      <option name=\"number\" value=\"00003\" />\n      <option name=\"presentableId\" value=\"LOCAL-00003\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1723847456806</updated>\n    </task>\n    <task id=\"LOCAL-00004\" summary=\"add class Frame and class Massage, delete funktion go 100%, add resize window\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1724013210356</created>\n      <option name=\"number\" value=\"00004\" />\n      <option name=\"presentableId\" value=\"LOCAL-00004\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1724013210356</updated>\n    </task>\n    <task id=\"LOCAL-00005\" summary=\"add class Frame and class Massage, delete funktion go 100%, add resize window, add warning pic\">\n      <option name=\"closed\" value=\"true\" />\n      <created>1724013251954</created>\n      <option name=\"number\" value=\"00005\" />\n      <option name=\"presentableId\" value=\"LOCAL-00005\" />\n      <option name=\"project\" value=\"LOCAL\" />\n      <updated>1724013251954</updated>\n    </task>\n    <option name=\"localTasksCounter\" value=\"6\" />\n    <servers />\n  </component>\n  <component name=\"Vcs.Log.Tabs.Properties\">\n    <option name=\"TAB_STATES\">\n      <map>\n        <entry key=\"MAIN\">\n          <value>\n            <State>\n              <option name=\"FILTERS\">\n                <map>\n                  <entry key=\"branch\">\n                    <value>\n                      <list>\n                        <option value=\"origin/wire-py-reformat-14-08-2024\" />\n                      </list>\n                    </value>\n                  </entry>\n                </map>\n              </option>\n            </State>\n          </value>\n        </entry>\n      </map>\n    </option>\n  </component>\n  <component name=\"VcsManagerConfiguration\">\n    <option name=\"ADD_EXTERNAL_FILES_SILENTLY\" value=\"true\" />\n    <MESSAGE value=\"Tunnel Start and Stop Work\" />\n    <MESSAGE value=\"wg_import_select in wg_func.py extended\" />\n    <MESSAGE value=\"add class Frame and class Massage, delete funktion go 100%, add resize window\" />\n    <MESSAGE value=\"add class Frame and class Massage, delete funktion go 100%, add resize window, add warning pic\" />\n    <option name=\"LAST_COMMIT_MESSAGE\" value=\"add class Frame and class Massage, delete funktion go 100%, add resize window, add warning pic\" />\n  </component>\n</project>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/workspace.xml b/.idea/workspace.xml
+--- a/.idea/workspace.xml	
++++ b/.idea/workspace.xml	
+@@ -4,10 +4,8 @@
+     <option name="autoReloadType" value="SELECTIVE" />
+   </component>
+   <component name="ChangeListManager">
+-    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="add class Frame and class Massage, delete funktion go 100%, add resize window, add warning pic">
++    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="add class TunnelActive to wg_func works2">
+       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+-      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
+-      <change beforePath="$PROJECT_DIR$/wg_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_func.py" afterDir="false" />
+     </list>
+     <option name="SHOW_DIALOG" value="false" />
+     <option name="HIGHLIGHT_CONFLICTS" value="true" />
+@@ -129,10 +127,33 @@
+       <option name="project" value="LOCAL" />
+       <updated>1724013251954</updated>
+     </task>
+-    <option name="localTasksCounter" value="6" />
++    <task id="LOCAL-00006" summary="add class TunnelActive to wg_func works">
++      <option name="closed" value="true" />
++      <created>1724016284774</created>
++      <option name="number" value="00006" />
++      <option name="presentableId" value="LOCAL-00006" />
++      <option name="project" value="LOCAL" />
++      <updated>1724016284774</updated>
++    </task>
++    <option name="localTasksCounter" value="7" />
+     <servers />
+   </component>
+   <component name="Vcs.Log.Tabs.Properties">
++    <option name="RECENT_FILTERS">
++      <map>
++        <entry key="Branch">
++          <value>
++            <list>
++              <RecentGroup>
++                <option name="FILTER_VALUES">
++                  <option value="main" />
++                </option>
++              </RecentGroup>
++            </list>
++          </value>
++        </entry>
++      </map>
++    </option>
+     <option name="TAB_STATES">
+       <map>
+         <entry key="MAIN">
+@@ -143,7 +164,7 @@
+                   <entry key="branch">
+                     <value>
+                       <list>
+-                        <option value="origin/wire-py-reformat-14-08-2024" />
++                        <option value="wire-py-reformat-14-08-2024" />
+                       </list>
+                     </value>
+                   </entry>
+@@ -161,6 +182,7 @@
+     <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" />
+-    <option name="LAST_COMMIT_MESSAGE" value="add class Frame and class Massage, delete funktion go 100%, add resize window, add warning pic" />
++    <MESSAGE value="add class TunnelActive to wg_func works" />
++    <option name="LAST_COMMIT_MESSAGE" value="add class TunnelActive to wg_func works" />
+   </component>
+ </project>
+\ No newline at end of file
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_19_08_24,_06_49_[Changes]1/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Checkout_at_19_08_24,_06_49_[Changes]1/shelved.patch
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_19_08_24__06_49__Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Checkout_at_19_08_24__06_49__Changes_.xml
new file mode 100644
index 0000000..85897b2
--- /dev/null
+++ b/.idea/shelf/Uncommitted_changes_before_Checkout_at_19_08_24__06_49__Changes_.xml
@@ -0,0 +1,4 @@
+<changelist name="Uncommitted_changes_before_Checkout_at_19_08_24,_06_49_[Changes]" date="1724042999949" recycled="false" toDelete="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_19_08_24,_06_49_[Changes]/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Checkout at 19.08.24, 06:49 [Changes]" />
+</changelist>
\ No newline at end of file
diff --git a/main.py b/main.py
index 0632394..05c1588 100644
--- a/main.py
+++ b/main.py
@@ -3,9 +3,7 @@ import os
 import tkinter as tk
 from tkinter import ttk
 
-from wg_func import tl_list, wg_export, wg_import_select, TunnelActiv
-
-wg_exp = wg_export()
+from wg_func import TunnelActiv, ListTunnels, ImportTunnel, ExportTunnels
 
 
 class MainWindow(tk.Tk):
@@ -67,7 +65,7 @@ class FrameWidgets(ttk.Frame):
         self.l_box.config(font=("Ubuntu", 12, "bold"))
         self.l_box.grid(column=1, rowspan=3, row=1, )
 
-        self.tl = tl_list()
+        self.tl = ListTunnels.tl_list()
         for tunnels in self.tl:
             self.l_box.insert("end", tunnels)
             self.l_box.update()
@@ -80,7 +78,7 @@ class FrameWidgets(ttk.Frame):
             self.btn_stst = tk.Button(self, image=self.wg_vpn_start, bd=0, command=self.wg_switch)
             self.btn_stst.grid(column=0, row=1, padx=15, pady=15, sticky="s")
         # Button Import
-        self.btn_i = tk.Button(self, image=self.imp_pic, bd=0, command=wg_import_select)
+        self.btn_i = tk.Button(self, image=self.imp_pic, bd=0, command=lambda: ImportTunnel.wg_import_select(self))
         self.btn_i.grid(column=0, row=2, padx=15, pady=15)
 
         def delete():
@@ -92,6 +90,8 @@ class FrameWidgets(ttk.Frame):
                 self.StrVar.set(value='')
                 self.btn_stst = tk.Button(self, image=self.wg_vpn_start, bd=0, command=self.wg_switch)
                 self.btn_stst.grid(column=0, row=1, padx=15, pady=15, sticky="s")
+                self.l_box.update()
+                self.l_box.select_set(0)
 
         # Button Trash
         self.btn_tr = tk.Button(self, image=self.tr_pic, bd=0, command=delete)
diff --git a/wg_func.py b/wg_func.py
index b8ed246..a1f5cf0 100644
--- a/wg_func.py
+++ b/wg_func.py
@@ -41,46 +41,72 @@ class TunnelActiv:
         return active
 
 
-def tl_list():
-    wg_s = os.popen('nmcli con show | grep -iPo "(.*)(wireguard)"').read().split()
-    tl = wg_s[::3]  # tl = Tunnel list # Show of 4.Element in list
-    return tl
+class ListTunnels:
+    @staticmethod
+    def tl_list():
+        wg_s = os.popen('nmcli con show | grep -iPo "(.*)(wireguard)"').read().split()
+        tl = wg_s[::3]  # tl = Tunnel list # Show of 4.Element in list
+        return tl
 
 
-def wg_import_select():
-    try:
-        filepath = filedialog.askopenfilename(initialdir=os.environ['HOME'], title="Select Wireguard config File",
-                                              filetypes=[("WG config files", "*.conf")])
-        file = open(filepath, 'r')
-        read = file.read()
-        file.close()
-        pathsplit = filepath.split("/")
-        pathsplit1 = pathsplit[-1]
-        if "PrivateKey = " in read and "PublicKey = " in read:
-            if len(pathsplit1) > 17:
-                pathsplit = pathsplit1[len(pathsplit1) - 17:]
-                os.rename(filepath, os.environ['HOME'] + '/tester/' + str(pathsplit))
-                os.system('nmcli connection down ' + str(TunnelActiv.active()))
-                os.system('nmcli connection import type wireguard file ' + os.environ['HOME'] + '/tester/' +
-                          str(pathsplit))
-                os.system('nmcli con mod ' + str(pathsplit[:-5]) + ' connection.autoconnect no')
-            else:
-                subprocess.call('cp ' + str(filepath) + ' ' + os.environ['HOME'] + '/tester/', shell=True)
-                os.system('nmcli connection down ' + str(TunnelActiv.active()))
-                os.system('nmcli connection import type wireguard file ' + str(filepath))
-                os.system('nmcli con mod ' + str(pathsplit1[:-5]) + ' connection.autoconnect no')
-        if "PrivateKey = " not in read:
-            Message()
-    except EOFError:
-        pass
-    except TypeError:
-        pass
+class ImportTunnel:
+    def __init__(self):
+        self.wg_switch = None
+        self.btn_stst = None
+        self.lb_tunnel = None
+        self.StrVar = None
+        self.a = None
+        self.l_box = None
+
+    def wg_import_select(self):
+        try:
+            filepath = filedialog.askopenfilename(initialdir=os.environ['HOME'], title="Select Wireguard config File",
+                                                  filetypes=[("WG config files", "*.conf")])
+            file = open(filepath, 'r')
+            read = file.read()
+            file.close()
+            pathsplit = filepath.split("/")
+            pathsplit1 = pathsplit[-1]
+            if "PrivateKey = " in read and "PublicKey = " in read:
+                if len(pathsplit1) > 17:
+                    pathsplit = pathsplit1[len(pathsplit1) - 17:]
+                    os.rename(filepath, os.environ['HOME'] + '/tester/' + str(pathsplit))
+                    os.system('nmcli connection down ' + str(TunnelActiv.active()))
+                    os.system('nmcli connection import type wireguard file ' + os.environ['HOME'] + '/tester/' +
+                              str(pathsplit))
+                    os.system('nmcli con mod ' + str(pathsplit[:-5]) + ' connection.autoconnect no')
+                else:
+                    subprocess.call('cp ' + str(filepath) + ' ' + os.environ['HOME'] + '/tester/', shell=True)
+                    os.system('nmcli connection down ' + str(TunnelActiv.active()))
+                    os.system('nmcli connection import type wireguard file ' + str(filepath))
+                    os.system('nmcli con mod ' + str(pathsplit1[:-5]) + ' connection.autoconnect no')
+                self.StrVar.set(value='                               ')
+                self.a = TunnelActiv.active()
+                self.l_box.insert(0, self.a)
+                self.l_box.update()
+                self.StrVar = tk.StringVar()
+                self.StrVar.set(self.a)
+                self.lb_tunnel = tk.Label(self, textvariable=self.StrVar, fg='green')
+                self.lb_tunnel.config(font=("Ubuntu", 11, "bold"))
+                self.lb_tunnel.grid(column=3, row=1, sticky="w")
+                self.btn_stst = tk.Button(self, image=self.wg_vpn_stop, bd=0, command=self.wg_switch)
+                self.btn_stst.grid(column=0, row=1, padx=15, pady=15, sticky="s")
+            if "PrivateKey = " not in read:
+                Message()
+        except EOFError:
+            pass
+        except TypeError:
+            pass
+        except FileNotFoundError:
+            pass
 
 
-def wg_export():
-    try:
-        wg_exp = os.popen('nmcli con show | grep -iPo "(.*)(wireguard)"').read().split()
-        wg_exp = wg_exp[1]
-        return wg_exp
-    except IndexError:
-        pass
+class ExportTunnels:
+    @staticmethod
+    def wg_export():
+        try:
+            wg_exp = os.popen('nmcli con show | grep -iPo "(.*)(wireguard)"').read().split()
+            wg_exp = wg_exp[1]
+            return wg_exp
+        except IndexError:
+            pass
-- 
2.45.2