punix/Wire-Py
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 8 Wiki Activity

28-09-2024 #15

Merged
punix merged 28 commits from 28-09-2024 into main 2024-09-28 14:17:38 +02:00
Conversation 0 Commits 28 Files Changed 65 +15 -10
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 217a73182a - Show all commits

21
.idea/workspace.xml
View File

@ -4,12 +4,7 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="replace tar with zip and Check if Zip file is empty">
<change afterPath="$PROJECT_DIR$/wp-icons/128/info.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/256/info.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/32/info.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/48/info.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/64/info.png" afterDir="false" />
<list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="Create your own message boxes for export">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wg_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_func.py" afterDir="false" />
</list>
@ -466,7 +461,15 @@
<option name="project" value="LOCAL" />
<updated>1726836930251</updated>
</task>
<option name="localTasksCounter" value="42" />
<task id="LOCAL-00042" summary="Create your own message boxes for export">
<option name="closed" value="true" />
<created>1726841190285</created>
<option name="number" value="00042" />
<option name="presentableId" value="LOCAL-00042" />
<option name="project" value="LOCAL" />
<updated>1726841190285</updated>
</task>
<option name="localTasksCounter" value="43" />
<servers />
</component>
<component name="UnknownFeatures">
@ -507,7 +510,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="fix label when laat Tunnel delete and fix Tuple error in delete and Start/Stop when listbox empty" />
<MESSAGE value="remove a ',' in DNS Name" />
<MESSAGE value="fix when Filname &gt; 17 first copy file after rename" />
<MESSAGE value="add export Tunnel as zip" />
@ -532,6 +534,7 @@
<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" />
<option name="LAST_COMMIT_MESSAGE" value="replace tar with zip and Check if Zip file is empty" />
<MESSAGE value="Create your own message boxes for export" />
<option name="LAST_COMMIT_MESSAGE" value="Create your own message boxes for export" />
</component>
</project>

4
wg_func.py
View File

@ -345,7 +345,7 @@ class OnOff:
class ExportTunnels:
@staticmethod
def wg_export():
_u1 = str(_u[6:])
now_time = datetime.now()
now_datetime = now_time.strftime('wg-exp-' + '%m-%d-%Y' + '-' + '%H:%M')
tl = ListTunnels.tl_list()
@ -354,10 +354,12 @@ class ExportTunnels:
wg_tar = str(_u) + '/' + now_datetime
p_to_conf = Path('/etc/wire_py/')
shutil.make_archive(wg_tar, 'zip', p_to_conf)
os.chown(wg_tar + '.zip', 1000, 1000)
with zipfile.ZipFile((wg_tar + '.zip'), 'r') as zf:
if len(zf.namelist()) != 0:
msg_exp_successful_window()
else:
msg_exp_fail_window()
except TypeError:
pass