Compare commits
26 Commits
e9814f2b60
...
24-02-2025
Author | SHA1 | Date | |
---|---|---|---|
7881355f00 | |||
e28235af4b | |||
5fe6fd3f29 | |||
48a48ffd4c | |||
1278b02a95 | |||
52f22beec6 | |||
a6742a0c0e | |||
762694aa94 | |||
cc54f329fe | |||
8c01c1b984 | |||
ebafdbdcb3 | |||
ce4f6c84dc | |||
c4565ed169 | |||
485cfff457 | |||
1a0fc74a80 | |||
971c86c97f | |||
cf71eae7d3 | |||
1f80d5342c | |||
e719a1f23f | |||
a0da356cec | |||
ac87e0a4a7 | |||
6a3a982057 | |||
aab90eec70 | |||
511d5f72df | |||
ed93e99026 | |||
10c3b07053 |
214
.idea/workspace.xml
generated
214
.idea/workspace.xml
generated
@ -4,21 +4,9 @@
|
|||||||
<option name="autoReloadType" value="SELECTIVE" />
|
<option name="autoReloadType" value="SELECTIVE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="- methods from class MainWindow move to class FrameWidgets for active color_label when theme change - optimize columnconfigure, rowconfigure in class MainWindow and FrameWidgets - add new Frame for Widgets on Bottom - optimize from tkinter * to from tkinter import filedialog, ttk, TclError">
|
<list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment=" - Update Translate Files">
|
||||||
<change afterPath="$PROJECT_DIR$/lx-icons/128/error.png" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/lx-icons/128/info.png" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/lx-icons/256/error.png" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/lx-icons/256/info.png" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/lx-icons/32/error.png" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/lx-icons/32/info.png" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/lx-icons/48/error.png" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/lx-icons/48/info.png" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/lx-icons/64/error.png" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/lx-icons/64/info.png" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/install" beforeDir="false" afterPath="$PROJECT_DIR$/install" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/cls_mth_fc.py" beforeDir="false" afterPath="$PROJECT_DIR$/cls_mth_fc.py" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/wg_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/cls_mth_fc.py" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/wg_main.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_main.py" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
@ -56,25 +44,25 @@
|
|||||||
<option name="hideEmptyMiddlePackages" value="true" />
|
<option name="hideEmptyMiddlePackages" value="true" />
|
||||||
<option name="showLibraryContents" value="true" />
|
<option name="showLibraryContents" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent"><![CDATA[{
|
<component name="PropertiesComponent">{
|
||||||
"keyToString": {
|
"keyToString": {
|
||||||
"ASKED_ADD_EXTERNAL_FILES": "true",
|
"ASKED_ADD_EXTERNAL_FILES": "true",
|
||||||
"Python.INSTALL.executor": "Run",
|
"Python.INSTALL.executor": "Run",
|
||||||
"Python.install.executor": "Run",
|
"Python.install.executor": "Run",
|
||||||
"Python.main.executor": "Run",
|
"Python.main.executor": "Run",
|
||||||
"Python.messagebox.executor": "Run",
|
"Python.messagebox.executor": "Run",
|
||||||
"Python.start_wg.executor": "Run",
|
"Python.start_wg.executor": "Run",
|
||||||
"Python.testtheme.executor": "Run",
|
"Python.testtheme.executor": "Run",
|
||||||
"Python.wg_func.executor": "Run",
|
"Python.wg_func.executor": "Run",
|
||||||
"Python.wg_main.executor": "Run",
|
"Python.wg_main.executor": "Run",
|
||||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||||
"Shell Script.install.executor": "Run",
|
"Shell Script.install.executor": "Run",
|
||||||
"Shell Script.run_as.executor": "Run",
|
"Shell Script.run_as.executor": "Run",
|
||||||
"git-widget-placeholder": "1.11.0824",
|
"git-widget-placeholder": "1.11.1024",
|
||||||
"last_opened_file_path": "/home/punix/Pyapps/wire-py/lx-icons",
|
"last_opened_file_path": "/home/punix/Pyapps/wire-py",
|
||||||
"settings.editor.selected.configurable": "reference.settingsdialog.IDE.editor.colors"
|
"settings.editor.selected.configurable": "reference.settingsdialog.IDE.editor.colors"
|
||||||
}
|
}
|
||||||
}]]></component>
|
}</component>
|
||||||
<component name="RecentsManager">
|
<component name="RecentsManager">
|
||||||
<key name="CopyFile.RECENT_KEYS">
|
<key name="CopyFile.RECENT_KEYS">
|
||||||
<recent name="$PROJECT_DIR$/lx-icons" />
|
<recent name="$PROJECT_DIR$/lx-icons" />
|
||||||
@ -154,78 +142,6 @@
|
|||||||
<option name="presentableId" value="Default" />
|
<option name="presentableId" value="Default" />
|
||||||
<updated>1723279982210</updated>
|
<updated>1723279982210</updated>
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00020" summary="columnconfigure on all widgets set">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1724778892233</created>
|
|
||||||
<option name="number" value="00020" />
|
|
||||||
<option name="presentableId" value="LOCAL-00020" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1724778892233</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00021" summary="little fixes a " " to ' '">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1725119445803</created>
|
|
||||||
<option name="number" value="00021" />
|
|
||||||
<option name="presentableId" value="LOCAL-00021" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1725119445803</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00022" summary="add class FileHandle, add Label to show autoconnect Tunnel disable checkbox when Listbox is empty or no select Tunnel">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1725391658456</created>
|
|
||||||
<option name="number" value="00022" />
|
|
||||||
<option name="presentableId" value="LOCAL-00022" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1725391658456</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00023" summary="add if question and add autoconnect, autoconnect_var to class Filehandle in box_set no finish!">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1725434328731</created>
|
|
||||||
<option name="number" value="00023" />
|
|
||||||
<option name="presentableId" value="LOCAL-00023" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1725434328731</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00024" summary="fixes on empty Listbox now is disable and now works autoconnect label with read and write, delete works now with read and write">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1725475967338</created>
|
|
||||||
<option name="number" value="00024" />
|
|
||||||
<option name="presentableId" value="LOCAL-00024" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1725475967338</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00025" summary="add Frame widget 3 for Buttons and Listbox with Scrollbar. all Widgets new format delete works now of disable checkbox when Listbox empty (part two)">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1725567453540</created>
|
|
||||||
<option name="number" value="00025" />
|
|
||||||
<option name="presentableId" value="LOCAL-00025" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1725567453540</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00026" summary="little fixes">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1725639633873</created>
|
|
||||||
<option name="number" value="00026" />
|
|
||||||
<option name="presentableId" value="LOCAL-00026" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1725639633873</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00027" summary="little fixes">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1725746027132</created>
|
|
||||||
<option name="number" value="00027" />
|
|
||||||
<option name="presentableId" value="LOCAL-00027" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1725746027132</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00028" summary="little fixes replace os.system with check_call 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">
|
<task id="LOCAL-00029" summary="little fixes a labels when stop and start, installer first functions works">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
<created>1725991610908</created>
|
<created>1725991610908</created>
|
||||||
@ -434,7 +350,7 @@
|
|||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1727379755537</updated>
|
<updated>1727379755537</updated>
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00055" summary="fix installer add .keys file">
|
<task id="LOCAL-00055" summary="fix installer add keys file">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
<created>1727380793216</created>
|
<created>1727380793216</created>
|
||||||
<option name="number" value="00055" />
|
<option name="number" value="00055" />
|
||||||
@ -546,7 +462,79 @@
|
|||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1731098372497</updated>
|
<updated>1731098372497</updated>
|
||||||
</task>
|
</task>
|
||||||
<option name="localTasksCounter" value="69" />
|
<task id="LOCAL-00069" summary=" - - Fix Checkbutton Autostart when first install Wire-Py">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731690583059</created>
|
||||||
|
<option name="number" value="00069" />
|
||||||
|
<option name="presentableId" value="LOCAL-00069" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731690583060</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00070" summary=" - - Fix Checkbutton Autostart when first install Wire-Py">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731836942211</created>
|
||||||
|
<option name="number" value="00070" />
|
||||||
|
<option name="presentableId" value="LOCAL-00070" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731836942212</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00071" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731840048762</created>
|
||||||
|
<option name="number" value="00071" />
|
||||||
|
<option name="presentableId" value="LOCAL-00071" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731840048763</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00072" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731840089956</created>
|
||||||
|
<option name="number" value="00072" />
|
||||||
|
<option name="presentableId" value="LOCAL-00072" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731840089956</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00073" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731840188277</created>
|
||||||
|
<option name="number" value="00073" />
|
||||||
|
<option name="presentableId" value="LOCAL-00073" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731840188278</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00074" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731840383592</created>
|
||||||
|
<option name="number" value="00074" />
|
||||||
|
<option name="presentableId" value="LOCAL-00074" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731840383592</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00075" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731841930614</created>
|
||||||
|
<option name="number" value="00075" />
|
||||||
|
<option name="presentableId" value="LOCAL-00075" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731841930615</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00076" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731844213239</created>
|
||||||
|
<option name="number" value="00076" />
|
||||||
|
<option name="presentableId" value="LOCAL-00076" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731844213239</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00077" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731844339039</created>
|
||||||
|
<option name="number" value="00077" />
|
||||||
|
<option name="presentableId" value="LOCAL-00077" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731844339039</updated>
|
||||||
|
</task>
|
||||||
|
<option name="localTasksCounter" value="78" />
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="UnknownFeatures">
|
<component name="UnknownFeatures">
|
||||||
@ -577,8 +565,6 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
||||||
<MESSAGE value="install rollback bash to py wirepy and wirepy rollback to py" />
|
|
||||||
<MESSAGE value="fix install and .desktop File Tar works now for user home and filebrowser.askfilebrowser start now in user home" />
|
|
||||||
<MESSAGE value="replace tar with zip and Check if Zip file is empty" />
|
<MESSAGE value="replace tar with zip and Check if Zip file is empty" />
|
||||||
<MESSAGE value="Create your own message boxes for export" />
|
<MESSAGE value="Create your own message boxes for export" />
|
||||||
<MESSAGE value="chown Export File to 1000:1000" />
|
<MESSAGE value="chown Export File to 1000:1000" />
|
||||||
@ -593,7 +579,7 @@
|
|||||||
<MESSAGE value="info icon shadow fix end msg Export fix to" />
|
<MESSAGE value="info icon shadow fix end msg Export fix to" />
|
||||||
<MESSAGE value="little fixes" />
|
<MESSAGE value="little fixes" />
|
||||||
<MESSAGE value="fix msg_boxes when tunnel list = 0 a Start, Delete and Export" />
|
<MESSAGE value="fix msg_boxes when tunnel list = 0 a Start, Delete and Export" />
|
||||||
<MESSAGE value="fix installer add .keys file" />
|
<MESSAGE value="fix installer add keys file" />
|
||||||
<MESSAGE value="Changelog create When exporting, the folder is now copied to /tmp and the non .conf files are deleted before the zip file is created. In main.py os import removed. Since os have been replaced by pathlib and shutil. Start with version number 1.4.7 Message window size corrected so text is displayed better" />
|
<MESSAGE value="Changelog create When exporting, the folder is now copied to /tmp and the non .conf files are deleted before the zip file is created. In main.py os import removed. Since os have been replaced by pathlib and shutil. Start with version number 1.4.7 Message window size corrected so text is displayed better" />
|
||||||
<MESSAGE value="Fix msg_window and remove x , y argument Install further adapted and with colored text if user is not in group sudo or wheel. Added to install Opensuse for installation" />
|
<MESSAGE value="Fix msg_window and remove x , y argument Install further adapted and with colored text if user is not in group sudo or wheel. Added to install Opensuse for installation" />
|
||||||
<MESSAGE value=" - Menu add - New Modern Dark and Light(default) Theme" />
|
<MESSAGE value=" - Menu add - New Modern Dark and Light(default) Theme" />
|
||||||
@ -602,15 +588,17 @@
|
|||||||
<MESSAGE value="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip" />
|
<MESSAGE value="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip" />
|
||||||
<MESSAGE value="- Optimize Class and Tooltip" />
|
<MESSAGE value="- Optimize Class and Tooltip" />
|
||||||
<MESSAGE value="- methods from class MainWindow move to class FrameWidgets for active color_label when theme change - optimize columnconfigure, rowconfigure in class MainWindow and FrameWidgets - add new Frame for Widgets on Bottom - optimize from tkinter * to from tkinter import filedialog, ttk, TclError" />
|
<MESSAGE value="- methods from class MainWindow move to class FrameWidgets for active color_label when theme change - optimize columnconfigure, rowconfigure in class MainWindow and FrameWidgets - add new Frame for Widgets on Bottom - optimize from tkinter * to from tkinter import filedialog, ttk, TclError" />
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="- methods from class MainWindow move to class FrameWidgets for active color_label when theme change - optimize columnconfigure, rowconfigure in class MainWindow and FrameWidgets - add new Frame for Widgets on Bottom - optimize from tkinter * to from tkinter import filedialog, ttk, TclError" />
|
<MESSAGE value=" - - Fix Checkbutton Autostart when first install Wire-Py" />
|
||||||
|
<MESSAGE value=" - Update Translate Files" />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value=" - Update Translate Files" />
|
||||||
</component>
|
</component>
|
||||||
<component name="XDebuggerManager">
|
<component name="XDebuggerManager">
|
||||||
<breakpoint-manager>
|
<breakpoint-manager>
|
||||||
<breakpoints>
|
<breakpoints>
|
||||||
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
|
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
|
||||||
<url>file://$PROJECT_DIR$/start_wg.py</url>
|
<url>file://$PROJECT_DIR$/wg_main.py</url>
|
||||||
<line>1</line>
|
<line>1128</line>
|
||||||
<option name="timeStamp" value="2" />
|
<option name="timeStamp" value="3" />
|
||||||
</line-breakpoint>
|
</line-breakpoint>
|
||||||
</breakpoints>
|
</breakpoints>
|
||||||
</breakpoint-manager>
|
</breakpoint-manager>
|
||||||
|
40
Changelog
40
Changelog
@ -6,7 +6,39 @@ My standard System: Linux Mint 22 Cinnamon
|
|||||||
- os import in cls_mth_fc.py replaced by other methods
|
- os import in cls_mth_fc.py replaced by other methods
|
||||||
- If Wire-Py already runs, prevent further start
|
- If Wire-Py already runs, prevent further start
|
||||||
- for loops with lists replaced by List Comprehensions
|
- for loops with lists replaced by List Comprehensions
|
||||||
- Update search after start of Wire-Py
|
- Crypt and Decrypt Config Files in ~/.config/wire_py
|
||||||
|
|
||||||
|
### Added
|
||||||
|
02-03-2025
|
||||||
|
|
||||||
|
- Fix ipv6 in Config File on import
|
||||||
|
- Wirepy run now as user
|
||||||
|
- settings, keys 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.
|
||||||
|
|
||||||
|
### Added
|
||||||
|
10-11-2024
|
||||||
|
|
||||||
|
- Fix Checkbutton Autostart when first install Wire-Py
|
||||||
|
- Update Translate Files
|
||||||
|
|
||||||
|
### Added
|
||||||
|
10-11-2024
|
||||||
|
|
||||||
|
- Translate file de_De complete
|
||||||
|
- new FrameWidget for rename Entry and rename Button
|
||||||
|
|
||||||
|
|
||||||
|
### Added
|
||||||
|
09-11-2024
|
||||||
|
|
||||||
|
- Move Tips Method in separate class for Tooltips in another Apps
|
||||||
|
- Move Version Variable in main script
|
||||||
|
- Edit Class GiteaUpdate for requests in api_down and download
|
||||||
|
- Description on Class GiteaUpdate
|
||||||
|
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
08-11-2024
|
08-11-2024
|
||||||
@ -15,6 +47,7 @@ My standard System: Linux Mint 22 Cinnamon
|
|||||||
- separate folder for general icons
|
- separate folder for general icons
|
||||||
- install edit for new dir lx-icons
|
- install edit for new dir lx-icons
|
||||||
|
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
08-11-2024
|
08-11-2024
|
||||||
|
|
||||||
@ -23,6 +56,7 @@ My standard System: Linux Mint 22 Cinnamon
|
|||||||
- add new Frame for Widgets on Bottom
|
- add new Frame for Widgets on Bottom
|
||||||
- optimize from tkinter * to from tkinter import filedialog, ttk, TclError
|
- optimize from tkinter * to from tkinter import filedialog, ttk, TclError
|
||||||
|
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
07-11-2024
|
07-11-2024
|
||||||
|
|
||||||
@ -32,7 +66,7 @@ My standard System: Linux Mint 22 Cinnamon
|
|||||||
### Added
|
### Added
|
||||||
27-10-2024
|
27-10-2024
|
||||||
|
|
||||||
- Add Autoconnect settings to settings.conf
|
- Add Autoconnect settings to settings
|
||||||
|
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
@ -40,7 +74,7 @@ My standard System: Linux Mint 22 Cinnamon
|
|||||||
|
|
||||||
- Add run_as Bash script and open_gitea.py python script
|
- Add run_as Bash script and open_gitea.py python script
|
||||||
- Add Tooltip disable/enable
|
- Add Tooltip disable/enable
|
||||||
- Rename settings to settings.conf for theme, updates and tooltip enable in one file
|
- Rename settings to settings for theme, updates and tooltip enable in one file
|
||||||
|
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Type=Application
|
Type=Application
|
||||||
Name=Wire-Py
|
Name=Wire-Py
|
||||||
Exec=/usr/bin/wirepy.py
|
Exec=/usr/local/bin/wg_main.py
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Categories=Network;
|
Categories=Network;
|
||||||
Icon=/usr/share/icons/wp-icons/128/wg_vpn.png
|
Icon=/usr/share/icons/wp-icons/128/wg_vpn.png
|
||||||
|
BIN
__pycache__/cls_mth_fc.cpython-312.pyc
Normal file
BIN
__pycache__/cls_mth_fc.cpython-312.pyc
Normal file
Binary file not shown.
BIN
__pycache__/message.cpython-312.pyc
Normal file
BIN
__pycache__/message.cpython-312.pyc
Normal file
Binary file not shown.
BIN
__pycache__/start_wg.cpython-312.pyc
Normal file
BIN
__pycache__/start_wg.cpython-312.pyc
Normal file
Binary file not shown.
BIN
__pycache__/wg_main.cpython-312.pyc
Normal file
BIN
__pycache__/wg_main.cpython-312.pyc
Normal file
Binary file not shown.
134
cls_mth_fc.py
134
cls_mth_fc.py
@ -1,62 +1,99 @@
|
|||||||
""" Wireguard Classes and Method for Wire-Py """
|
""" Classes Method and functions for lx apps """
|
||||||
|
|
||||||
|
import gettext
|
||||||
|
import locale
|
||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
import time
|
from subprocess import check_call
|
||||||
import tkinter as tk
|
import tkinter as tk
|
||||||
import zipfile
|
import zipfile
|
||||||
import gettext
|
|
||||||
import locale
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from subprocess import check_call
|
|
||||||
from tkinter import ttk
|
from tkinter import ttk
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
APP = 'cls_mth_fc'
|
APP = 'wirepy'
|
||||||
LOCALE_DIR = "/usr/share/locale/"
|
LOCALE_DIR = "/usr/share/locale/"
|
||||||
locale.bindtextdomain(APP, LOCALE_DIR)
|
locale.bindtextdomain(APP, LOCALE_DIR)
|
||||||
gettext.bindtextdomain(APP, LOCALE_DIR)
|
gettext.bindtextdomain(APP, LOCALE_DIR)
|
||||||
gettext.textdomain(APP)
|
gettext.textdomain(APP)
|
||||||
_ = gettext.gettext
|
_ = gettext.gettext
|
||||||
''' 1 = 1. Year, 09 = Month of the Year, 2924 = Day and Year of the Year '''
|
|
||||||
version = 'v. 1.11.0824'
|
|
||||||
|
|
||||||
path_to_file2 = Path('/etc/wire_py/settings.conf')
|
def dirs_and_files():
|
||||||
_u = Path.read_text(Path('/tmp/_u'))
|
|
||||||
|
|
||||||
|
pth = Path.home() / '.config/wire_py'
|
||||||
|
pth.mkdir(parents=True, exist_ok=True)
|
||||||
|
sett = Path.home() / '.config/wire_py/settings'
|
||||||
|
ks = Path.home() / '.config/wire_py/keys'
|
||||||
|
|
||||||
|
if sett.exists():
|
||||||
|
pass
|
||||||
|
|
||||||
|
else:
|
||||||
|
sett.touch()
|
||||||
|
sett.write_text('[UPDATES]\non\n[THEME]\nlight\n[TOOLTIP]\nTrue\n[AUTOSTART ON]\noff')
|
||||||
|
|
||||||
|
if ks.exists():
|
||||||
|
pass
|
||||||
|
|
||||||
|
else:
|
||||||
|
ks.touch()
|
||||||
|
|
||||||
|
def files_for_autostart():
|
||||||
|
|
||||||
|
pth2 = Path.home() / '.config/systemd/user'
|
||||||
|
pth2.mkdir(parents=True, exist_ok=True)
|
||||||
|
wg_ser = Path.home() / '.config/systemd/user/wg_start.service'
|
||||||
|
|
||||||
|
if wg_ser.exists():
|
||||||
|
pass
|
||||||
|
|
||||||
|
else:
|
||||||
|
wg_ser.touch()
|
||||||
|
sett.write_text('[Unit]\nDescription=Automatic Tunnel Start\nAfter=network-online.target\n\n[Service]\nType=oneshot\nExecStartPre=/bin/sleep 5\nExecStart=/usr/local/bin/start_wg.py\n[Install]\nWantedBy=default.target')
|
||||||
|
check_call(['systemctl', '--user', 'enable', wg_start.service])
|
||||||
|
|
||||||
|
wg_set = Path(Path.home() / '.config/wire_py/settings')
|
||||||
|
|
||||||
|
|
||||||
class GiteaUpdate:
|
class GiteaUpdate:
|
||||||
|
"""
|
||||||
|
Calling api_down requests the URL and the version of the running script.
|
||||||
|
Example: version = 'v. 1.1.1.1' GiteaUpdate.api_down(http://example.de, version)
|
||||||
|
|
||||||
|
Calling download requests the download URL of the running script,
|
||||||
|
the taskbar image for the “Download OK” window, the taskbar image for the
|
||||||
|
“Download error” window and the variable res
|
||||||
|
"""
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def api_down(UPDATE_API_URL):
|
def api_down(update_api_url, version):
|
||||||
try:
|
try:
|
||||||
response = requests.get(UPDATE_API_URL)
|
response = requests.get(update_api_url)
|
||||||
response_dict = response.json()
|
response_dict = response.json()
|
||||||
response_dict = response_dict[0]
|
response_dict = response_dict[0]
|
||||||
with open(path_to_file2, 'r') as set_file:
|
with open(wg_set, 'r') as set_file:
|
||||||
set_file = set_file.read()
|
set_file = set_file.read()
|
||||||
if 'on\n' in set_file:
|
if 'on\n' in set_file:
|
||||||
if version[3:] != response_dict['tag_name']:
|
if version[3:] != response_dict['tag_name']:
|
||||||
return response_dict['tag_name']
|
return response_dict['tag_name']
|
||||||
else:
|
else:
|
||||||
return _('No Updates')
|
return 'No Updates'
|
||||||
else:
|
else:
|
||||||
return _('False')
|
return 'False'
|
||||||
except requests.exceptions.ConnectionError:
|
except requests.exceptions.ConnectionError:
|
||||||
return 'No Internet Connection!'
|
return 'No Internet Connection!'
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def download(URLD):
|
def download(urld, down_ok_image, down_not_ok_image, res):
|
||||||
try:
|
try:
|
||||||
to_down = 'wget -qP ' + str(_u) + ' ' + URLD
|
to_down = 'wget -qP ' + str(Path.home()) + ' ' + urld
|
||||||
result = subprocess.call(to_down, shell=True)
|
result = subprocess.call(to_down, shell=True)
|
||||||
if result == 0:
|
if result == 0:
|
||||||
shutil.chown(str(_u) + f'/{res}.zip', 1000, 1000)
|
shutil.chown(str(Path.home()) + f'/{res}.zip', 1000, 1000)
|
||||||
"""img_w, img_i, w_title, w_txt hand over"""
|
"""img_w, img_i, w_title, w_txt hand over"""
|
||||||
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_vpn.png'
|
ii = down_ok_image
|
||||||
wt = _('Download Successful')
|
wt = _('Download Successful')
|
||||||
msg_t = _('Your zip file is in home directory')
|
msg_t = _('Your zip file is in home directory')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
@ -64,23 +101,19 @@ class GiteaUpdate:
|
|||||||
else:
|
else:
|
||||||
"""img_w, img_i, w_title, w_txt hand over"""
|
"""img_w, img_i, w_title, w_txt hand over"""
|
||||||
iw = r'/usr/share/icons/lx-icons/64/error.png'
|
iw = r'/usr/share/icons/lx-icons/64/error.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
ii = down_not_ok_image
|
||||||
wt = _('Download error')
|
wt = _('Download error')
|
||||||
msg_t = _('Download failed! Please try again')
|
msg_t = _('Download failed! Please try again')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
except subprocess.CalledProcessError:
|
except subprocess.CalledProcessError:
|
||||||
"""img_w, img_i, w_title, w_txt hand over"""
|
"""img_w, img_i, w_title, w_txt hand over"""
|
||||||
iw = r'/usr/share/icons/lx-icons/64/error.png'
|
iw = r'/usr/share/icons/lx-icons/64/error.png'
|
||||||
ii = r'/usr/share/icons/wg-icons/48/wg_msg.png'
|
ii = down_not_ok_image
|
||||||
wt = _('Download error')
|
wt = _('Download error')
|
||||||
msg_t = _('Download failed! No internet connection!')
|
msg_t = _('Download failed! No internet connection!')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
|
|
||||||
res = GiteaUpdate.api_down('https://git.ilunix.de/api/v1/repos/punix/Wire-Py/releases')
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def msg_window(img_w, img_i, w_title, w_txt, txt2=None, com=None):
|
def msg_window(img_w, img_i, w_title, w_txt, txt2=None, com=None):
|
||||||
"""
|
"""
|
||||||
Function for different message windows for the user. with 4 arguments to be passed.
|
Function for different message windows for the user. with 4 arguments to be passed.
|
||||||
@ -90,8 +123,9 @@ def msg_window(img_w, img_i, w_title, w_txt, txt2=None, com=None):
|
|||||||
img_i = Image for Icon
|
img_i = Image for Icon
|
||||||
w_title = Windows Title
|
w_title = Windows Title
|
||||||
w_txt = Text for Tk Window
|
w_txt = Text for Tk Window
|
||||||
|
txt2 = Text for Button two
|
||||||
|
com = function for Button command
|
||||||
"""
|
"""
|
||||||
|
|
||||||
msg = tk.Toplevel()
|
msg = tk.Toplevel()
|
||||||
msg.resizable(width=False, height=False)
|
msg.resizable(width=False, height=False)
|
||||||
msg.title(w_title)
|
msg.title(w_title)
|
||||||
@ -103,7 +137,7 @@ def msg_window(img_w, img_i, w_title, w_txt, txt2=None, com=None):
|
|||||||
|
|
||||||
label.grid(column=1, row=0)
|
label.grid(column=1, row=0)
|
||||||
|
|
||||||
if txt2 != None and com != None:
|
if txt2 is not None and com is not None:
|
||||||
label.config(font=('Ubuntu', 11), padx=15, justify='left')
|
label.config(font=('Ubuntu', 11), padx=15, justify='left')
|
||||||
msg.i_window.grid(column=0, row=0, sticky='nw')
|
msg.i_window.grid(column=0, row=0, sticky='nw')
|
||||||
button2 = ttk.Button(msg, text=f'{txt2}', command=com, padding=4)
|
button2 = ttk.Button(msg, text=f'{txt2}', command=com, padding=4)
|
||||||
@ -125,7 +159,6 @@ def msg_window(img_w, img_i, w_title, w_txt, txt2=None, com=None):
|
|||||||
|
|
||||||
|
|
||||||
class Tunnel:
|
class Tunnel:
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Class of Methods for Wire-Py
|
Class of Methods for Wire-Py
|
||||||
"""
|
"""
|
||||||
@ -134,7 +167,6 @@ class Tunnel:
|
|||||||
The config file is packed into a dictionary,
|
The config file is packed into a dictionary,
|
||||||
to display the values Address , DNS and Peer in the labels
|
to display the values Address , DNS and Peer in the labels
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def con_to_dict(cls, file):
|
def con_to_dict(cls, file):
|
||||||
|
|
||||||
@ -147,6 +179,8 @@ class Tunnel:
|
|||||||
for items in dictlist:
|
for items in dictlist:
|
||||||
if items == '=':
|
if items == '=':
|
||||||
dictlist.remove(items)
|
dictlist.remove(items)
|
||||||
|
if items == '::/0':
|
||||||
|
dictlist.remove(items)
|
||||||
|
|
||||||
''' Here is the beginning (Loop) of convert List to Dictionary '''
|
''' Here is the beginning (Loop) of convert List to Dictionary '''
|
||||||
for _ in dictlist:
|
for _ in dictlist:
|
||||||
@ -176,11 +210,9 @@ class Tunnel:
|
|||||||
pre_key = final_dict['PreSharedKey']
|
pre_key = final_dict['PreSharedKey']
|
||||||
return address, dns, endpoint, pre_key
|
return address, dns, endpoint, pre_key
|
||||||
|
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Shows the Active Tunnel
|
Shows the Active Tunnel
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def active():
|
def active():
|
||||||
|
|
||||||
@ -193,41 +225,38 @@ class Tunnel:
|
|||||||
return active
|
return active
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Shows all existing Wireguard tunnels
|
Shows all existing Wireguard tunnels a login user
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def list():
|
def list():
|
||||||
wg_s = os.popen('nmcli con show | grep -iPo "(.*)(wireguard)"').read().split()
|
dirname = Path.home() / '.config/wire_py/'
|
||||||
|
wg_s = os.listdir(dirname)
|
||||||
''' tl = Tunnel list # Show of 4.Element in list '''
|
wg_s.remove('keys')
|
||||||
tl = wg_s[::3]
|
wg_s.remove('settings')
|
||||||
return tl
|
|
||||||
|
|
||||||
|
return wg_s
|
||||||
|
|
||||||
"""
|
"""
|
||||||
This will export the tunnels.
|
This will export the tunnels.
|
||||||
A zipfile with current date and time is created
|
A zipfile with current date and time is created
|
||||||
in the user's home directory with correct right
|
in the user's home directory with correct right
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def export():
|
def export():
|
||||||
_u1 = str(_u[6:])
|
|
||||||
now_time = datetime.now()
|
now_time = datetime.now()
|
||||||
now_datetime = now_time.strftime('wg-exp-' + '%m-%d-%Y' + '-' + '%H:%M')
|
now_datetime = now_time.strftime('wg-exp-' + '%m-%d-%Y' + '-' + '%H:%M')
|
||||||
tl = Tunnel.list()
|
tl = Tunnel.list()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if len(tl) != 0:
|
if len(tl) != 0:
|
||||||
wg_tar = str(_u) + '/' + now_datetime
|
wg_tar = str(Path.home()) + '/' + now_datetime
|
||||||
shutil.copytree('/etc/wire_py', '/tmp/wire_py', dirs_exist_ok=True)
|
shutil.copytree(Path.home() / '.config/wire_py/', '/tmp/wire_py', dirs_exist_ok=True)
|
||||||
source = Path('/tmp/wire_py')
|
source = Path('/tmp/wire_py')
|
||||||
Path.unlink(Path(source) / 'wg_py', missing_ok=True)
|
Path.unlink(Path(source) / 'wg_py', missing_ok=True)
|
||||||
Path.unlink(Path(source) / '.keys', missing_ok=True)
|
Path.unlink(Path(source) / 'keys', missing_ok=True)
|
||||||
Path.unlink(Path(source) / 'settings.conf', missing_ok=True)
|
Path.unlink(Path(source) / 'settings', missing_ok=True)
|
||||||
shutil.make_archive(wg_tar, 'zip', source)
|
shutil.make_archive(wg_tar, 'zip', source)
|
||||||
shutil.chown(wg_tar + '.zip', 1000, 1000)
|
#shutil.chown(wg_tar + '.zip', 1000, 1000)
|
||||||
shutil.rmtree(source)
|
shutil.rmtree(source)
|
||||||
with zipfile.ZipFile((wg_tar + '.zip'), 'r') as zf:
|
with zipfile.ZipFile((wg_tar + '.zip'), 'r') as zf:
|
||||||
if len(zf.namelist()) != 0:
|
if len(zf.namelist()) != 0:
|
||||||
@ -254,19 +283,26 @@ class Tunnel:
|
|||||||
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||||
wt = _('Select tunnel')
|
wt = _('Select tunnel')
|
||||||
msg_t = _('Please first import tunnel.')
|
msg_t = _('Please first import tunnel')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
except TypeError:
|
except TypeError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class Tipi:
|
||||||
|
"""
|
||||||
|
Class for Tooltip setting write in File
|
||||||
|
Calling request path to file
|
||||||
|
"""
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def if_tip():
|
def if_tip(path):
|
||||||
with open(path_to_file2, 'r') as set_file2:
|
with open(path, 'r') as set_file2:
|
||||||
lines2 = set_file2.readlines()
|
lines2 = set_file2.readlines()
|
||||||
if 'False\n' in lines2:
|
if 'False\n' in lines2:
|
||||||
return False
|
return False
|
||||||
else:
|
else:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
tips = Tunnel.if_tip()
|
|
||||||
|
wg_tips = Tipi.if_tip(wg_set)
|
||||||
|
34
install
34
install
@ -6,25 +6,25 @@ BLUE='\033[30;1;34m'
|
|||||||
|
|
||||||
install_file_with(){
|
install_file_with(){
|
||||||
clear
|
clear
|
||||||
|
mkdir -p ~/.config/wire_py && touch ~/.config/wire_py/keys && cp -u settings ~/.config/wire_py/ && \
|
||||||
|
mkdir -p ~/.config/systemd/user && cp -u wg_start.service ~/.config/systemd/user/ && \
|
||||||
|
systemctl --user enable wg_start.service
|
||||||
sudo apt install python3-tk && \
|
sudo apt install python3-tk && \
|
||||||
sudo cp -u wg_main.py start_wg.py cls_mth_fc.py wirepy.py run_as open_gitea.py /usr/bin/ && \
|
sudo cp -u wg_main.py start_wg.py cls_mth_fc.py /usr/local/bin/ && \
|
||||||
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && sudo cp -u settings.conf /etc/wire_py/ && \
|
|
||||||
sudo cp -uR wp-icons lx-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
|
sudo cp -uR wp-icons lx-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
|
||||||
sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
|
||||||
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
sudo ln -sf /usr/local/bin/wg_main.py /usr/local/bin/wirepy && \
|
||||||
sudo cp -u org.wirepy.policy /usr/share/polkit-1/actions/ && \
|
sudo cp -u Wire-Py.desktop /usr/share/applications/
|
||||||
sudo cp -u Wire-Py.desktop /usr/share/applications/ && \
|
|
||||||
sudo cp -u wg_start.service /lib/systemd/system/ && \
|
|
||||||
sudo systemctl enable wg_start.service
|
|
||||||
}
|
}
|
||||||
|
|
||||||
install_arch_d(){
|
install_arch_d(){
|
||||||
clear
|
clear
|
||||||
sudo pacman -S --noconfirm tk python3 python-requests && \
|
sudo pacman -S --noconfirm tk python3 python-requests && \
|
||||||
sudo cp -u wg_main.py start_wg.py cls_mth_fc.py wirepy.py run_as open_gitea.py /usr/bin/ && \
|
sudo cp -u wg_main.py start_wg.py cls_mth_fc.py && \
|
||||||
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && sudo cp -u settings.conf /etc/wire_py/ && \
|
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/keys && sudo cp -u settings /etc/wire_py/ && \
|
||||||
sudo cp -uR wp-icons lx-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
|
sudo cp -uR wp-icons lx-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
|
||||||
sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
||||||
|
sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
|
||||||
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
||||||
sudo cp -u org.wirepy.policy /usr/share/polkit-1/actions/ && \
|
sudo cp -u org.wirepy.policy /usr/share/polkit-1/actions/ && \
|
||||||
sudo cp -u Wire-Py.desktop /usr/share/applications/ && \
|
sudo cp -u Wire-Py.desktop /usr/share/applications/ && \
|
||||||
@ -89,9 +89,10 @@ elif grep -i 'fedora' /etc/os-release > /dev/null 2>&1
|
|||||||
if ! which python3-tkinter &> /dev/null
|
if ! which python3-tkinter &> /dev/null
|
||||||
then sudo dnf install python3-tkinter -y
|
then sudo dnf install python3-tkinter -y
|
||||||
|
|
||||||
sudo cp -u wg_main.py start_wg.py cls_mth_fc.py wirepy.py run_as open_gitea.py /usr/bin/ && \
|
sudo cp -u wg_main.py start_wg.py cls_mth_fc.py && \
|
||||||
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && \
|
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/keys && \
|
||||||
sudo cp -u settings.conf /etc/wire_py/ && \
|
sudo cp -u settings /etc/wire_py/ && \
|
||||||
|
sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
|
||||||
sudo cp -uR wp-icons lx-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
|
sudo cp -uR wp-icons lx-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
|
||||||
sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
||||||
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
||||||
@ -105,9 +106,10 @@ elif grep -i 'suse' /etc/os-release > /dev/null 2>&1
|
|||||||
then
|
then
|
||||||
if ! which python311-tk &> /dev/null
|
if ! which python311-tk &> /dev/null
|
||||||
then sudo zypper install python311-tk
|
then sudo zypper install python311-tk
|
||||||
sudo cp -u wg_main.py start_wg.py cls_mth_fc.py wirepy.py run_as open_gitea.py /usr/bin/ && \
|
sudo cp -u wg_main.py start_wg.py cls_mth_fc.py && \
|
||||||
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && \
|
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/keys && \
|
||||||
sudo cp -u settings.conf /etc/wire_py/ && \
|
sudo cp -u settings /etc/wire_py/ && \
|
||||||
|
sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
|
||||||
sudo cp -uR wp-icons lx-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
|
sudo cp -uR wp-icons lx-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
|
||||||
sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
||||||
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
||||||
|
BIN
languages/de/wirepy.mo
Normal file
BIN
languages/de/wirepy.mo
Normal file
Binary file not shown.
@ -1,5 +0,0 @@
|
|||||||
#!/usr/bin/python3
|
|
||||||
|
|
||||||
import webbrowser
|
|
||||||
|
|
||||||
webbrowser.open('https://git.ilunix.de/punix/Wire-Py')
|
|
@ -1,16 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
|
|
||||||
<policyconfig>
|
|
||||||
<vendor>Project Wire-Py</vendor>
|
|
||||||
<vendor_url>https://git.ilunix.de/punix/Wire-Py</vendor_url>
|
|
||||||
<icon_name>wg-vpn</icon_name>
|
|
||||||
<action id="org.wirepy">
|
|
||||||
<defaults>
|
|
||||||
<allow_any>auth_admin_keep</allow_any>
|
|
||||||
<allow_inactive>auth_admin_keep</allow_inactive>
|
|
||||||
<allow_active>yes</allow_active>
|
|
||||||
</defaults>
|
|
||||||
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/wg_main.py</annotate>
|
|
||||||
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
|
|
||||||
</action>
|
|
||||||
</policyconfig>
|
|
@ -2,7 +2,7 @@
|
|||||||
from subprocess import check_call
|
from subprocess import check_call
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
path_to_file = Path('/etc/wire_py/settings.conf')
|
path_to_file = Path(Path.home() / '.config/wire_py/settings')
|
||||||
|
|
||||||
with open(path_to_file, 'r') as a_con:
|
with open(path_to_file, 'r') as a_con:
|
||||||
lines = a_con.readlines()
|
lines = a_con.readlines()
|
||||||
|
168
wg_main.py
168
wg_main.py
@ -1,6 +1,8 @@
|
|||||||
#!/usr/bin/python3
|
#!/usr/bin/python3
|
||||||
|
|
||||||
import gettext
|
import gettext
|
||||||
import locale
|
import locale
|
||||||
|
import webbrowser
|
||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
@ -8,19 +10,23 @@ import tkinter as tk
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from subprocess import check_call
|
from subprocess import check_call
|
||||||
from tkinter import filedialog, ttk, TclError
|
from tkinter import filedialog, ttk, TclError
|
||||||
|
from cls_mth_fc import (Tunnel, msg_window, GiteaUpdate, wg_tips, dirs_and_files, wg_set, files_for_autostart)
|
||||||
from cls_mth_fc import (Tunnel, msg_window, GiteaUpdate, res, _u, version, path_to_file2, tips)
|
|
||||||
|
|
||||||
tcl_path = Path('/usr/share/TK-Themes')
|
tcl_path = Path('/usr/share/TK-Themes')
|
||||||
|
|
||||||
APP = 'wg_main'
|
''' 1 = 1. Year, 09 = Month of the Year, 2924 = Day and Year of the Year '''
|
||||||
|
version = 'v. 2.03.0225'
|
||||||
|
|
||||||
|
res = GiteaUpdate.api_down('https://git.ilunix.de/api/v1/repos/punix/Wire-Py/releases', version)
|
||||||
|
|
||||||
|
''' Translate '''
|
||||||
|
APP = 'wirepy'
|
||||||
LOCALE_DIR = "/usr/share/locale/"
|
LOCALE_DIR = "/usr/share/locale/"
|
||||||
locale.bindtextdomain(APP, LOCALE_DIR)
|
locale.bindtextdomain(APP, LOCALE_DIR)
|
||||||
gettext.bindtextdomain(APP, LOCALE_DIR)
|
gettext.bindtextdomain(APP, LOCALE_DIR)
|
||||||
gettext.textdomain(APP)
|
gettext.textdomain(APP)
|
||||||
_ = gettext.gettext
|
_ = gettext.gettext
|
||||||
|
|
||||||
|
|
||||||
class MainWindow(tk.Tk):
|
class MainWindow(tk.Tk):
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
@ -40,7 +46,7 @@ class MainWindow(tk.Tk):
|
|||||||
self.style = ttk.Style(self)
|
self.style = ttk.Style(self)
|
||||||
self.tk.call('source', str(tcl_path) + '/water.tcl')
|
self.tk.call('source', str(tcl_path) + '/water.tcl')
|
||||||
''' self.tk.call('source', 'TK-Themes/water.tcl') '''
|
''' self.tk.call('source', 'TK-Themes/water.tcl') '''
|
||||||
with open(path_to_file2, 'r') as read_file:
|
with open(wg_set, 'r') as read_file:
|
||||||
lines = read_file.readlines()
|
lines = read_file.readlines()
|
||||||
if 'light\n' in lines:
|
if 'light\n' in lines:
|
||||||
self.tk.call('set_theme', 'light')
|
self.tk.call('set_theme', 'light')
|
||||||
@ -79,34 +85,34 @@ class FrameWidgets(ttk.Frame):
|
|||||||
|
|
||||||
def update():
|
def update():
|
||||||
if set_update.get() == 1:
|
if set_update.get() == 1:
|
||||||
with open(path_to_file2, 'r') as set_file2:
|
with open(wg_set, 'r') as set_file2:
|
||||||
lines2 = set_file2.readlines()
|
lines2 = set_file2.readlines()
|
||||||
lines2[1] = 'off\n'
|
lines2[1] = 'off\n'
|
||||||
with open(path_to_file2, 'w') as set_file2:
|
with open(wg_set, 'w') as set_file2:
|
||||||
set_file2.writelines(lines2)
|
set_file2.writelines(lines2)
|
||||||
|
|
||||||
if set_update.get() == 0:
|
if set_update.get() == 0:
|
||||||
with open(path_to_file2, 'r') as set_file2:
|
with open(wg_set, 'r') as set_file2:
|
||||||
lines2 = set_file2.readlines()
|
lines2 = set_file2.readlines()
|
||||||
lines2[1] = 'on\n'
|
lines2[1] = 'on\n'
|
||||||
with open(path_to_file2, 'w') as set_file2:
|
with open(wg_set, 'w') as set_file2:
|
||||||
set_file2.writelines(lines2)
|
set_file2.writelines(lines2)
|
||||||
|
|
||||||
''' Set True or False in file '''
|
''' Set True or False in file '''
|
||||||
|
|
||||||
def tooltip():
|
def tooltip():
|
||||||
if set_tip.get():
|
if set_tip.get():
|
||||||
with open(path_to_file2, 'r') as set_file2:
|
with open(wg_set, 'r') as set_file2:
|
||||||
lines2 = set_file2.readlines()
|
lines2 = set_file2.readlines()
|
||||||
lines2[5] = 'False\n'
|
lines2[5] = 'False\n'
|
||||||
with open(path_to_file2, 'w') as set_file2:
|
with open(wg_set, 'w') as set_file2:
|
||||||
set_file2.writelines(lines2)
|
set_file2.writelines(lines2)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
with open(path_to_file2, 'r') as set_file2:
|
with open(wg_set, 'r') as set_file2:
|
||||||
lines2 = set_file2.readlines()
|
lines2 = set_file2.readlines()
|
||||||
lines2[5] = 'True\n'
|
lines2[5] = 'True\n'
|
||||||
with open(path_to_file2, 'w') as set_file2:
|
with open(wg_set, 'w') as set_file2:
|
||||||
set_file2.writelines(lines2)
|
set_file2.writelines(lines2)
|
||||||
|
|
||||||
''' Set dark or light '''
|
''' Set dark or light '''
|
||||||
@ -115,10 +121,10 @@ class FrameWidgets(ttk.Frame):
|
|||||||
if self.tk.call("ttk::style", "theme", "use") == "water-dark":
|
if self.tk.call("ttk::style", "theme", "use") == "water-dark":
|
||||||
''' Set light theme '''
|
''' Set light theme '''
|
||||||
self.tk.call('set_theme', 'light')
|
self.tk.call('set_theme', 'light')
|
||||||
with open(path_to_file2, 'r') as theme_set2:
|
with open(wg_set, 'r') as theme_set2:
|
||||||
lines3 = theme_set2.readlines()
|
lines3 = theme_set2.readlines()
|
||||||
lines3[3] = 'light\n'
|
lines3[3] = 'light\n'
|
||||||
with open(path_to_file2, 'w') as theme_set2:
|
with open(wg_set, 'w') as theme_set2:
|
||||||
theme_set2.writelines(lines3)
|
theme_set2.writelines(lines3)
|
||||||
self.color_label()
|
self.color_label()
|
||||||
|
|
||||||
@ -126,18 +132,16 @@ class FrameWidgets(ttk.Frame):
|
|||||||
if not self.tk.call("ttk::style", "theme", "use") == "water-dark":
|
if not self.tk.call("ttk::style", "theme", "use") == "water-dark":
|
||||||
''' Set dark theme '''
|
''' Set dark theme '''
|
||||||
self.tk.call('set_theme', 'dark')
|
self.tk.call('set_theme', 'dark')
|
||||||
with open(path_to_file2, 'r') as theme_set2:
|
with open(wg_set, 'r') as theme_set2:
|
||||||
lines4 = theme_set2.readlines()
|
lines4 = theme_set2.readlines()
|
||||||
lines4[3] = 'dark\n'
|
lines4[3] = 'dark\n'
|
||||||
with open(path_to_file2, 'w') as theme_set2:
|
with open(wg_set, 'w') as theme_set2:
|
||||||
theme_set2.writelines(lines4)
|
theme_set2.writelines(lines4)
|
||||||
self.color_label()
|
self.color_label()
|
||||||
|
|
||||||
def info():
|
def info():
|
||||||
def link_btn():
|
def link_btn():
|
||||||
_u1 = str(_u[6:])
|
webbrowser.open('https://git.ilunix.de/punix/Wire-Py')
|
||||||
path_to_file = Path('/usr/bin/./run_as')
|
|
||||||
check_call(['su', _u1, path_to_file])
|
|
||||||
|
|
||||||
"""img_w, img_i, w_title, w_txt , txt2, com hand over"""
|
"""img_w, img_i, w_title, w_txt , txt2, com hand over"""
|
||||||
iw = r'/usr/share/icons/wp-icons/48/wg_vpn.png'
|
iw = r'/usr/share/icons/wp-icons/48/wg_vpn.png'
|
||||||
@ -172,7 +176,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
window.my_tool_tip.destroy()
|
window.my_tool_tip.destroy()
|
||||||
|
|
||||||
self.options_btn = ttk.Menubutton(self.menu_frame, text=_('Options'))
|
self.options_btn = ttk.Menubutton(self.menu_frame, text=_('Options'))
|
||||||
self.options_btn.grid(column=1, row=0)
|
self.options_btn.grid(column=1, columnspan=1, row=0)
|
||||||
|
|
||||||
def sets_enter(event):
|
def sets_enter(event):
|
||||||
""" The mouse moves into the entry widget """
|
""" The mouse moves into the entry widget """
|
||||||
@ -199,14 +203,14 @@ class FrameWidgets(ttk.Frame):
|
|||||||
|
|
||||||
''' About BTN Menu / Label '''
|
''' About BTN Menu / Label '''
|
||||||
self.about_btn = ttk.Button(self.menu_frame, text=_('About'), style='Toolbutton', command=info)
|
self.about_btn = ttk.Button(self.menu_frame, text=_('About'), style='Toolbutton', command=info)
|
||||||
self.about_btn.grid(column=2, row=0)
|
self.about_btn.grid(column=2, columnspan=2, row=0)
|
||||||
self.readme = tk.Menu(self)
|
self.readme = tk.Menu(self)
|
||||||
|
|
||||||
''' Update and Tooltip Label '''
|
''' Update and Tooltip Label '''
|
||||||
self.updates_lb = ttk.Label(self.menu_frame)
|
self.updates_lb = ttk.Label(self.menu_frame)
|
||||||
self.updates_lb.grid(column=3, row=0, padx=10)
|
self.updates_lb.grid(column=4, columnspan=3, row=0, padx=10)
|
||||||
'''View Checkbox for enable or disable Tooltip '''
|
'''View Checkbox for enable or disable Tooltip '''
|
||||||
if tips:
|
if wg_tips:
|
||||||
set_tip.set(value=False)
|
set_tip.set(value=False)
|
||||||
else:
|
else:
|
||||||
set_tip.set(value=True)
|
set_tip.set(value=True)
|
||||||
@ -245,11 +249,11 @@ class FrameWidgets(ttk.Frame):
|
|||||||
self.updates_lb.bind('<Leave>', congratulations_leave)
|
self.updates_lb.bind('<Leave>', congratulations_leave)
|
||||||
else:
|
else:
|
||||||
set_update.set(value=0)
|
set_update.set(value=0)
|
||||||
text = _(f'Update {res} available!')
|
text = f'Update {res} ' + _('available!')
|
||||||
|
|
||||||
''' Update BTN Menu'''
|
''' Update BTN Menu'''
|
||||||
self.update_btn = ttk.Menubutton(self.menu_frame, text=text)
|
self.update_btn = ttk.Menubutton(self.menu_frame, text=text)
|
||||||
self.update_btn.grid(column=4, row=0, padx=0)
|
self.update_btn.grid(column=4, columnspan=3, row=0, padx=0)
|
||||||
|
|
||||||
def download_enter(event):
|
def download_enter(event):
|
||||||
""" The mouse moves into the entry widget """
|
""" The mouse moves into the entry widget """
|
||||||
@ -266,8 +270,15 @@ class FrameWidgets(ttk.Frame):
|
|||||||
self.download = tk.Menu(self, relief='flat')
|
self.download = tk.Menu(self, relief='flat')
|
||||||
|
|
||||||
self.update_btn.configure(menu=self.download, style='Toolbutton')
|
self.update_btn.configure(menu=self.download, style='Toolbutton')
|
||||||
self.download.add_command(label=_('Download'), command=GiteaUpdate.download(f'https://git.ilunix.de/punix'
|
self.download.add_command(label=_('Download'),
|
||||||
f'/Wire-Py/archive/{res}.zip'))
|
command=lambda: GiteaUpdate.download(f'https://git.ilunix.de/punix'
|
||||||
|
f'/Wire-Py/archive/'
|
||||||
|
f'{res}.zip', r'/usr/'
|
||||||
|
r'share/icons/wp-icons'
|
||||||
|
r'/48/wg_vpn.png',
|
||||||
|
r'/usr/share/icons/wp-icons'
|
||||||
|
r'/48/wg_msg.png', res))
|
||||||
|
|
||||||
''' Show active Tunnel '''
|
''' Show active Tunnel '''
|
||||||
self.a = Tunnel.active()
|
self.a = Tunnel.active()
|
||||||
|
|
||||||
@ -291,6 +302,11 @@ class FrameWidgets(ttk.Frame):
|
|||||||
self.lb_frame3.configure(relief='flat')
|
self.lb_frame3.configure(relief='flat')
|
||||||
self.lb_frame3.grid(column=0, row=5, columnspan=4, sticky='snew', padx=2, pady=2)
|
self.lb_frame3.grid(column=0, row=5, columnspan=4, sticky='snew', padx=2, pady=2)
|
||||||
|
|
||||||
|
''' Bottom Frame 5 '''
|
||||||
|
self.lb_frame4 = ttk.Frame(self)
|
||||||
|
self.lb_frame4.configure(relief='flat')
|
||||||
|
self.lb_frame4.grid(column=2, row=5, columnspan=3, sticky='e', padx=15)
|
||||||
|
|
||||||
''' Show active Label '''
|
''' Show active Label '''
|
||||||
self.select_tunnel = None
|
self.select_tunnel = None
|
||||||
self.lb = ttk.Label(self, text=_('Active: '))
|
self.lb = ttk.Label(self, text=_('Active: '))
|
||||||
@ -314,7 +330,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
''' Listbox with Scrollbar '''
|
''' Listbox with Scrollbar '''
|
||||||
|
|
||||||
def enable_check_box(_):
|
def enable_check_box(_):
|
||||||
|
files_for_autostart()
|
||||||
if self.l_box.size() != 0:
|
if self.l_box.size() != 0:
|
||||||
self.wg_autostart.configure(state='normal')
|
self.wg_autostart.configure(state='normal')
|
||||||
self.lb_rename.config(state='normal')
|
self.lb_rename.config(state='normal')
|
||||||
@ -333,7 +349,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
''' Tunnel List '''
|
''' Tunnel List '''
|
||||||
self.tl = Tunnel.list()
|
self.tl = Tunnel.list()
|
||||||
for tunnels in self.tl:
|
for tunnels in self.tl:
|
||||||
self.l_box.insert("end", tunnels)
|
self.l_box.insert("end", tunnels[:-5])
|
||||||
self.l_box.update()
|
self.l_box.update()
|
||||||
|
|
||||||
def list_empty_enter(event):
|
def list_empty_enter(event):
|
||||||
@ -364,7 +380,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
''' Button Vpn '''
|
''' Button Vpn '''
|
||||||
if self.a != '':
|
if self.a != '':
|
||||||
self.stop()
|
self.stop()
|
||||||
wg_read = Path('/etc/wire_py') / str(self.a + '.conf')
|
wg_read = str(Path.home()) + '/.config/wire_py/' + str(self.a + '.conf')
|
||||||
with open(wg_read, 'r') as file:
|
with open(wg_read, 'r') as file:
|
||||||
data = Tunnel.con_to_dict(file)
|
data = Tunnel.con_to_dict(file)
|
||||||
|
|
||||||
@ -402,28 +418,28 @@ class FrameWidgets(ttk.Frame):
|
|||||||
try:
|
try:
|
||||||
self.select_tunnel = self.l_box.curselection()
|
self.select_tunnel = self.l_box.curselection()
|
||||||
select_tl = self.l_box.get(self.select_tunnel[0])
|
select_tl = self.l_box.get(self.select_tunnel[0])
|
||||||
with open('/etc/wire_py/' + select_tl + '.conf', 'r+') as file2:
|
with open(str(Path.home()) + '/.config/wire_py/' + select_tl + '.conf', 'r+') as file2:
|
||||||
key = Tunnel.con_to_dict(file2)
|
key = Tunnel.con_to_dict(file2)
|
||||||
pre_key = key[3]
|
pre_key = key[3]
|
||||||
check_call(['nmcli', 'connection', 'delete', select_tl])
|
check_call(['nmcli', 'connection', 'delete', select_tl])
|
||||||
self.l_box.delete(self.select_tunnel[0])
|
self.l_box.delete(self.select_tunnel[0])
|
||||||
with open(path_to_file2, 'r') as set_file6:
|
with open(wg_set, 'r') as set_file6:
|
||||||
lines6 = set_file6.readlines()
|
lines6 = set_file6.readlines()
|
||||||
if select_tl == lines6[7].strip() and 'off' not in lines6[7].strip():
|
if select_tl == lines6[7].strip() and 'off\n' not in lines6[7].strip():
|
||||||
lines6[7] = 'off'
|
lines6[7] = 'off\n'
|
||||||
with open(path_to_file2, 'w') as set_file7:
|
with open(wg_set, 'w') as set_file7:
|
||||||
set_file7.writelines(lines6)
|
set_file7.writelines(lines6)
|
||||||
self.selected_option.set(0)
|
self.selected_option.set(0)
|
||||||
self.autoconnect_var.set(_('no Autoconnect'))
|
self.autoconnect_var.set(_('no Autoconnect'))
|
||||||
|
|
||||||
Path.unlink(Path('/etc/wire_py') / str(select_tl + '.conf'))
|
Path.unlink(str(Path.home()) + '/.config/wire_py/' + str(select_tl + '.conf'))
|
||||||
with open('/etc/wire_py/.keys', 'r') as readfile:
|
with open(str(Path.home()) + '/.config/wire_py/keys', 'r') as readfile:
|
||||||
with open('/etc/wire_py/.keys2', 'w') as writefile:
|
with open(str(Path.home()) + '/.config/wire_py/keys2', 'w') as writefile:
|
||||||
for line in readfile:
|
for line in readfile:
|
||||||
if pre_key not in line.strip("\n"):
|
if pre_key not in line.strip("\n"):
|
||||||
writefile.write(line)
|
writefile.write(line)
|
||||||
file_one = Path('/etc/wire_py/.keys2')
|
file_one = Path(str(Path.home()) + '/.config/wire_py/keys2')
|
||||||
file_two = file_one.with_name('.keys')
|
file_two = file_one.with_name('keys')
|
||||||
file_one.replace(file_two)
|
file_one.replace(file_two)
|
||||||
self.wg_autostart.configure(state='disabled')
|
self.wg_autostart.configure(state='disabled')
|
||||||
|
|
||||||
@ -474,7 +490,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||||
wt = _('Select tunnel')
|
wt = _('Select tunnel')
|
||||||
msg_t = _('Please select a tunnel from the list.')
|
msg_t = _('Please select a tunnel from the list')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
@ -483,7 +499,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||||
wt = _('Select tunnel')
|
wt = _('Select tunnel')
|
||||||
msg_t = _('Please first import tunnel.')
|
msg_t = _('Please first import tunnel')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
''' Button Trash '''
|
''' Button Trash '''
|
||||||
@ -548,7 +564,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
self.btn_exp.bind('<Leave>', exp_leave)
|
self.btn_exp.bind('<Leave>', exp_leave)
|
||||||
|
|
||||||
''' Label Entry '''
|
''' Label Entry '''
|
||||||
self.lb_rename = ttk.Entry(self.lb_frame3, width=20)
|
self.lb_rename = ttk.Entry(self.lb_frame4, width=20)
|
||||||
self.lb_rename.grid(column=2, row=0, padx=8, pady=10, sticky='ne')
|
self.lb_rename.grid(column=2, row=0, padx=8, pady=10, sticky='ne')
|
||||||
self.lb_rename.insert(0, _('Max. 12 characters!'))
|
self.lb_rename.insert(0, _('Max. 12 characters!'))
|
||||||
self.lb_rename.config(state='disable')
|
self.lb_rename.config(state='disable')
|
||||||
@ -589,7 +605,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||||
wt = _('Renaming not possible')
|
wt = _('Renaming not possible')
|
||||||
msg_t = _('The new name may contain only 12 characters.')
|
msg_t = _('The new name may contain only 12 characters')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
elif len(self.lb_rename.get()) == 0:
|
elif len(self.lb_rename.get()) == 0:
|
||||||
@ -598,7 +614,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||||
wt = _('Renaming not possible')
|
wt = _('Renaming not possible')
|
||||||
msg_t = _('At least one character must be entered.')
|
msg_t = _('At least one character must be entered')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
elif any(ch in special_characters for ch in self.lb_rename.get()):
|
elif any(ch in special_characters for ch in self.lb_rename.get()):
|
||||||
@ -618,7 +634,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
|
|
||||||
''' nmcli connection modify old connection.id iphone '''
|
''' nmcli connection modify old connection.id iphone '''
|
||||||
check_call(['nmcli', 'connection', 'modify', select_tl, 'connection.id', self.lb_rename.get()])
|
check_call(['nmcli', 'connection', 'modify', select_tl, 'connection.id', self.lb_rename.get()])
|
||||||
source = Path('/etc/wire_py') / str(select_tl + '.conf')
|
source = Path.home() / '.config/wire_py' / str(select_tl + '.conf')
|
||||||
destination = source.with_name(str(self.lb_rename.get() + '.conf'))
|
destination = source.with_name(str(self.lb_rename.get() + '.conf'))
|
||||||
source.replace(destination)
|
source.replace(destination)
|
||||||
self.l_box.delete(self.select_tunnel[0])
|
self.l_box.delete(self.select_tunnel[0])
|
||||||
@ -629,11 +645,11 @@ class FrameWidgets(ttk.Frame):
|
|||||||
if self.a != '' and self.a == select_tl:
|
if self.a != '' and self.a == select_tl:
|
||||||
self.a = Tunnel.active()
|
self.a = Tunnel.active()
|
||||||
self.StrVar.set(value=self.a)
|
self.StrVar.set(value=self.a)
|
||||||
with open(path_to_file2, 'r') as set_file5:
|
with open(wg_set, 'r') as set_file5:
|
||||||
lines5 = set_file5.readlines()
|
lines5 = set_file5.readlines()
|
||||||
if select_tl == lines5[7].strip() and 'off' not in lines5[7].strip():
|
if select_tl == lines5[7].strip() and 'off\n' not in lines5[7].strip():
|
||||||
lines5[7] = new_a_connect
|
lines5[7] = new_a_connect
|
||||||
with open(path_to_file2, 'w') as theme_set5:
|
with open(wg_set, 'w') as theme_set5:
|
||||||
theme_set5.writelines(lines5)
|
theme_set5.writelines(lines5)
|
||||||
self.autoconnect_var.set(value=new_a_connect)
|
self.autoconnect_var.set(value=new_a_connect)
|
||||||
|
|
||||||
@ -645,11 +661,11 @@ class FrameWidgets(ttk.Frame):
|
|||||||
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||||
wt = _('Renaming not possible')
|
wt = _('Renaming not possible')
|
||||||
msg_t = _('Please select a tunnel from the list.')
|
msg_t = _('Please select a tunnel from the list')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
''' Button Rename '''
|
''' Button Rename '''
|
||||||
self.btn_rename = ttk.Button(self.lb_frame3, text=_('Rename'), state='disable', command=tl_rename, padding=4,
|
self.btn_rename = ttk.Button(self.lb_frame4, text=_('Rename'), state='disable', command=tl_rename, padding=4,
|
||||||
style='RnButton.TButton')
|
style='RnButton.TButton')
|
||||||
self.btn_rename.grid(column=3, row=0, padx=5, pady=10, sticky='ne')
|
self.btn_rename.grid(column=3, row=0, padx=5, pady=10, sticky='ne')
|
||||||
|
|
||||||
@ -720,8 +736,11 @@ class FrameWidgets(ttk.Frame):
|
|||||||
If True then the name is automatically shortened to 12 characters and then imported.
|
If True then the name is automatically shortened to 12 characters and then imported.
|
||||||
If in each case false comes out, a corresponding window comes to inform the user that something is wrong.
|
If in each case false comes out, a corresponding window comes to inform the user that something is wrong.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
dirs_and_files()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
filepath = filedialog.askopenfilename(initialdir=str(_u), title=_('Select Wireguard config File'),
|
filepath = filedialog.askopenfilename(initialdir=str(Path.home()), title=_('Select Wireguard config File'),
|
||||||
filetypes=[(_('WG config files'), '*.conf')], )
|
filetypes=[(_('WG config files'), '*.conf')], )
|
||||||
|
|
||||||
with open(filepath, 'r') as file:
|
with open(filepath, 'r') as file:
|
||||||
@ -735,7 +754,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
key = Tunnel.con_to_dict(file)
|
key = Tunnel.con_to_dict(file)
|
||||||
pre_key = key[3]
|
pre_key = key[3]
|
||||||
if len(pre_key) != 0:
|
if len(pre_key) != 0:
|
||||||
with open('/etc/wire_py/.keys', 'r') as readfile:
|
with open(str(Path.home()) + '/.config/wire_py/keys', 'r') as readfile:
|
||||||
p_key = readfile.readlines()
|
p_key = readfile.readlines()
|
||||||
if pre_key in p_key or pre_key + '\n' in p_key:
|
if pre_key in p_key or pre_key + '\n' in p_key:
|
||||||
"""img_w, img_i, w_title, w_txt hand over"""
|
"""img_w, img_i, w_title, w_txt hand over"""
|
||||||
@ -747,13 +766,13 @@ class FrameWidgets(ttk.Frame):
|
|||||||
|
|
||||||
else:
|
else:
|
||||||
|
|
||||||
with open('/etc/wire_py/.keys', 'a') as keyfile:
|
with open(str(Path.home()) + '/.config/wire_py/keys', 'a') as keyfile:
|
||||||
keyfile.write(pre_key + '\r')
|
keyfile.write(pre_key + '\r')
|
||||||
if len(path_split1) > 17:
|
if len(path_split1) > 17:
|
||||||
p1 = shutil.copy(filepath, Path('/etc/wire_py/'))
|
p1 = shutil.copy(filepath, str(Path.home()) + '/.config/wire_py/')
|
||||||
path_split = path_split1[len(path_split1) - 17:]
|
path_split = path_split1[len(path_split1) - 17:]
|
||||||
os.rename(p1, Path('/etc/wire_py') / str(path_split))
|
os.rename(p1, str(Path.home()) + '/.config/wire_py/' + str(path_split))
|
||||||
new_conf = '/etc/wire_py/' + path_split
|
new_conf = str(Path.home()) + '/.config/wire_py/' + path_split
|
||||||
if self.a != '':
|
if self.a != '':
|
||||||
check_call(['nmcli', 'connection', 'down', Tunnel.active()])
|
check_call(['nmcli', 'connection', 'down', Tunnel.active()])
|
||||||
self.label_empty()
|
self.label_empty()
|
||||||
@ -762,7 +781,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
'wireguard', 'file', new_conf], text=True)
|
'wireguard', 'file', new_conf], text=True)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
shutil.copy(filepath, Path('/etc/wire_py/'))
|
shutil.copy(filepath, str(Path.home()) + '/.config/wire_py/')
|
||||||
if self.a != '':
|
if self.a != '':
|
||||||
check_call(['nmcli', 'connection', 'down', Tunnel.active()])
|
check_call(['nmcli', 'connection', 'down', Tunnel.active()])
|
||||||
self.label_empty()
|
self.label_empty()
|
||||||
@ -847,7 +866,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
self.StrVar.set(self.a)
|
self.StrVar.set(self.a)
|
||||||
self.color_label()
|
self.color_label()
|
||||||
self.stop()
|
self.stop()
|
||||||
wg_read = Path('/etc/wire_py') / str(self.a + '.conf')
|
wg_read = str(Path.home()) + '/.config/wire_py/' + str(self.a + '.conf')
|
||||||
with open(wg_read, 'r') as file_for_key:
|
with open(wg_read, 'r') as file_for_key:
|
||||||
data = Tunnel.con_to_dict(file_for_key)
|
data = Tunnel.con_to_dict(file_for_key)
|
||||||
|
|
||||||
@ -886,10 +905,10 @@ class FrameWidgets(ttk.Frame):
|
|||||||
select_tl = self.l_box.get(select_tunnel[0])
|
select_tl = self.l_box.get(select_tunnel[0])
|
||||||
|
|
||||||
if self.selected_option.get() == 0:
|
if self.selected_option.get() == 0:
|
||||||
with open(path_to_file2, 'r') as set_file3:
|
with open(wg_set, 'r') as set_file3:
|
||||||
lines3 = set_file3.readlines()
|
lines3 = set_file3.readlines()
|
||||||
lines3[7] = 'off'
|
lines3[7] = 'off\n'
|
||||||
with open(path_to_file2, 'w') as set_file3:
|
with open(wg_set, 'w') as set_file3:
|
||||||
set_file3.writelines(lines3)
|
set_file3.writelines(lines3)
|
||||||
|
|
||||||
tl = Tunnel.list()
|
tl = Tunnel.list()
|
||||||
@ -898,10 +917,10 @@ class FrameWidgets(ttk.Frame):
|
|||||||
self.wg_autostart.configure(state='disabled')
|
self.wg_autostart.configure(state='disabled')
|
||||||
|
|
||||||
if self.selected_option.get() >= 1:
|
if self.selected_option.get() >= 1:
|
||||||
with open(path_to_file2, 'r') as set_file3:
|
with open(wg_set, 'r') as set_file3:
|
||||||
lines3 = set_file3.readlines()
|
lines3 = set_file3.readlines()
|
||||||
lines3[7] = select_tl
|
lines3[7] = select_tl
|
||||||
with open(path_to_file2, 'w') as set_file3:
|
with open(wg_set, 'w') as set_file3:
|
||||||
set_file3.writelines(lines3)
|
set_file3.writelines(lines3)
|
||||||
|
|
||||||
except IndexError:
|
except IndexError:
|
||||||
@ -915,18 +934,19 @@ class FrameWidgets(ttk.Frame):
|
|||||||
Set (on), the selected tunnel is displayed in the label.
|
Set (on), the selected tunnel is displayed in the label.
|
||||||
At (off) the label is first emptied then filled with No Autoconnect
|
At (off) the label is first emptied then filled with No Autoconnect
|
||||||
"""
|
"""
|
||||||
with open(path_to_file2, 'r') as set_file4:
|
with open(wg_set, 'r') as set_file4:
|
||||||
lines4 = set_file4.readlines()
|
lines4 = set_file4.readlines()
|
||||||
|
|
||||||
if lines4[7] != 'off':
|
if lines4[7] != 'off\n':
|
||||||
|
print(lines4[7])
|
||||||
self.selected_option.set(1)
|
self.selected_option.set(1)
|
||||||
self.autoconnect_var.set('')
|
self.autoconnect_var.set('')
|
||||||
self.auto_con = lines4[7]
|
self.auto_con = lines4[7]
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
self.selected_option.set(0)
|
||||||
self.wg_autostart.configure(state='disabled')
|
|
||||||
self.auto_con = _('no Autoconnect')
|
self.auto_con = _('no Autoconnect')
|
||||||
|
|
||||||
self.autoconnect_var.set('')
|
self.autoconnect_var.set('')
|
||||||
self.autoconnect_var = tk.StringVar()
|
self.autoconnect_var = tk.StringVar()
|
||||||
self.autoconnect_var.set(self.auto_con)
|
self.autoconnect_var.set(self.auto_con)
|
||||||
@ -1021,7 +1041,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
def color_label(self):
|
def color_label(self):
|
||||||
""" View activ Tunnel in color green or yellow """
|
""" View activ Tunnel in color green or yellow """
|
||||||
|
|
||||||
with open(path_to_file2, 'r') as read_file:
|
with open(wg_set, 'r') as read_file:
|
||||||
lines = read_file.readlines()
|
lines = read_file.readlines()
|
||||||
if 'light\n' in lines:
|
if 'light\n' in lines:
|
||||||
self.lb_tunnel = ttk.Label(self, textvariable=self.StrVar, foreground='green')
|
self.lb_tunnel = ttk.Label(self, textvariable=self.StrVar, foreground='green')
|
||||||
@ -1042,7 +1062,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
self.select_tunnel = self.l_box.curselection()
|
self.select_tunnel = self.l_box.curselection()
|
||||||
select_tl = self.l_box.get(self.select_tunnel[0])
|
select_tl = self.l_box.get(self.select_tunnel[0])
|
||||||
check_call(['nmcli', 'connection', 'up', select_tl])
|
check_call(['nmcli', 'connection', 'up', select_tl])
|
||||||
wg_read = Path('/etc/wire_py') / str(select_tl + '.conf')
|
wg_read = str(Path.home()) + '/.config/wire_py/' + str(select_tl + '.conf')
|
||||||
with open(wg_read, 'r') as file:
|
with open(wg_read, 'r') as file:
|
||||||
data = Tunnel.con_to_dict(file)
|
data = Tunnel.con_to_dict(file)
|
||||||
|
|
||||||
@ -1083,7 +1103,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||||
wt = _('Select tunnel')
|
wt = _('Select tunnel')
|
||||||
msg_t = _('Please select a tunnel from the list.')
|
msg_t = _('Please select a tunnel from the list')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
@ -1092,14 +1112,14 @@ class FrameWidgets(ttk.Frame):
|
|||||||
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||||
wt = _('Select tunnel')
|
wt = _('Select tunnel')
|
||||||
msg_t = _('Please first import tunnel.')
|
msg_t = _('Please first import tunnel')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
|
|
||||||
class MyToolTip(tk.Toplevel):
|
class MyToolTip(tk.Toplevel):
|
||||||
TIP_X_OFFSET = 20
|
TIP_X_OFFSET = 20
|
||||||
TIP_Y_OFFSET = 20
|
TIP_Y_OFFSET = 20
|
||||||
if not tips:
|
if not wg_tips:
|
||||||
AUTO_CLEAR_TIME = 0
|
AUTO_CLEAR_TIME = 0
|
||||||
else:
|
else:
|
||||||
AUTO_CLEAR_TIME = 2000 # Millisecond. (1/200 sec.)
|
AUTO_CLEAR_TIME = 2000 # Millisecond. (1/200 sec.)
|
||||||
|
@ -5,6 +5,6 @@ After=network-online.target
|
|||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
ExecStartPre=/bin/sleep 5
|
ExecStartPre=/bin/sleep 5
|
||||||
ExecStart=/usr/bin/start_wg.py
|
ExecStart=/usr/local/bin/start_wg.py
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=default.target
|
||||||
|
Reference in New Issue
Block a user