From 06097316ecb7db142088c93a719acf402a9596e4 Mon Sep 17 00:00:00 2001 From: freetushkan Date: Tue, 24 Feb 2026 12:23:01 +0300 Subject: [PATCH] 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. --- src/dashboard.py | 4 ++-- src/modules/WireguardConfiguration.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dashboard.py b/src/dashboard.py index dd3b466b..40121633 100644 --- a/src/dashboard.py +++ b/src/dashboard.py @@ -560,8 +560,8 @@ def API_getAllWireguardConfigurationBackup(): files.sort(key=lambda x: x[1], reverse=True) for f, ct in files: - if RegexMatch(r"^(.*)_(.*)\.(conf)$", f): - s = re.search(r"^(.*)_(.*)\.(conf)$", f) + if RegexMatch(r"^(.+)_(\d+)\.(conf)$", f): + s = re.search(r"^(.+)_(\d+)\.(conf)$", f) name = s.group(1) if name not in existingConfiguration: if name not in data['NonExistingConfigurations'].keys(): diff --git a/src/modules/WireguardConfiguration.py b/src/modules/WireguardConfiguration.py index 59785203..e77acdbe 100644 --- a/src/modules/WireguardConfiguration.py +++ b/src/modules/WireguardConfiguration.py @@ -903,8 +903,8 @@ class WireguardConfiguration: files.sort(key=lambda x: x[1], reverse=True) for f, ct in files: - if RegexMatch(f"^({self.Name})_(.*)\\.(conf)$", f): - s = re.search(f"^({self.Name})_(.*)\\.(conf)$", f) + if RegexMatch(f"^({self.Name})_(\d+)\\.(conf)$", f): + s = re.search(f"^({self.Name})_(\d+)\\.(conf)$", f) date = s.group(2) d = { "filename": f,