Mirrors/WGDashboard
1
0
Fork 0
mirror of https://github.com/donaldzou/WGDashboard.git synced 2025-06-28 01:06:58 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update dashboard.py

Browse Source 
- Fixed #737
- Removed unnecessary code
This commit is contained in:
Donald Zou 2025-05-07 13:00:18 +08:00
parent 91b499fb14
commit ada4c4f816
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/dashboard.py
View File

@ -432,21 +432,6 @@ class WireguardConfiguration:
original = [l.rstrip("\n") for l in f.readlines()] original = [l.rstrip("\n") for l in f.readlines()]
try: try:
start = original.index("[Interface]") start = original.index("[Interface]")
# Clean
for i in range(start, len(original)):
if original[i] == "[Peer]":
break
split = re.split(r'\s*=\s*', original[i], 1)
if len(split) == 2:
key = split[0]
if key in dir(self):
if isinstance(getattr(self, key), bool):
setattr(self, key, False)
else:
setattr(self, key, "")
# Set
for i in range(start, len(original)): for i in range(start, len(original)):
if original[i] == "[Peer]": if original[i] == "[Peer]":
break break
@ -459,7 +444,10 @@ class WireguardConfiguration:
setattr(self, key, StringToBoolean(value)) setattr(self, key, StringToBoolean(value))
else: else:
if len(getattr(self, key)) > 0: if len(getattr(self, key)) > 0:
if key not in ["PostUp", "PostDown", "PreUp", "PreDown"]:
setattr(self, key, f"{getattr(self, key)}, {value}") setattr(self, key, f"{getattr(self, key)}, {value}")
else:
setattr(self, key, f"{getattr(self, key)}; {value}")
else: else:
setattr(self, key, value) setattr(self, key, value)
except ValueError as e: except ValueError as e:
@ -1209,15 +1197,15 @@ AmneziaWG Configuration
""" """
class AmneziaWireguardConfiguration(WireguardConfiguration): class AmneziaWireguardConfiguration(WireguardConfiguration):
def __init__(self, name: str = None, data: dict = None, backup: dict = None, startup: bool = False): def __init__(self, name: str = None, data: dict = None, backup: dict = None, startup: bool = False):
self.Jc = 0 self.Jc = "0"
self.Jmin = 0 self.Jmin = "0"
self.Jmax = 0 self.Jmax = "0"
self.S1 = 0 self.S1 = "0"
self.S2 = 0 self.S2 = "0"
self.H1 = 1 self.H1 = "1"
self.H2 = 2 self.H2 = "2"
self.H3 = 3 self.H3 = "3"
self.H4 = 4 self.H4 = "4"
super().__init__(name, data, backup, startup, wg=False) super().__init__(name, data, backup, startup, wg=False)