superrob1500
/
mirror-WGDashboard
mirror of https://github.com/WGDashboard/WGDashboard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: incorrect backup regex 

* More accurate backup regex.

Fixed an issue with picking up other backups when the names partially match.

* More accurate backup regex 2.
pull/1158/head
freetushkan 2026-02-24 12:23:01 +03:00 committed by GitHub
parent e71179a2d4
commit 06097316ec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dashboard.py
View File

@ -560,8 +560,8 @@ def API_getAllWireguardConfigurationBackup():
files.sort(key=lambda x: x[1], reverse=True) files.sort(key=lambda x: x[1], reverse=True)
for f, ct in files: for f, ct in files:
if RegexMatch(r"^(.*)_(.*)\.(conf)$", f): if RegexMatch(r"^(.+)_(\d+)\.(conf)$", f):
s = re.search(r"^(.*)_(.*)\.(conf)$", f) s = re.search(r"^(.+)_(\d+)\.(conf)$", f)
name = s.group(1) name = s.group(1)
if name not in existingConfiguration: if name not in existingConfiguration:
if name not in data['NonExistingConfigurations'].keys(): if name not in data['NonExistingConfigurations'].keys():

4
src/modules/WireguardConfiguration.py
View File

@ -903,8 +903,8 @@ class WireguardConfiguration:
files.sort(key=lambda x: x[1], reverse=True) files.sort(key=lambda x: x[1], reverse=True)
for f, ct in files: for f, ct in files:
if RegexMatch(f"^({self.Name})_(.*)\\.(conf)$", f): if RegexMatch(f"^({self.Name})_(\d+)\\.(conf)$", f):
s = re.search(f"^({self.Name})_(.*)\\.(conf)$", f) s = re.search(f"^({self.Name})_(\d+)\\.(conf)$", f)
date = s.group(2) date = s.group(2)
d = { d = {
"filename": f, "filename": f,