From be10a644a0ff102e9dbe7b0ae423e15096e30846 Mon Sep 17 00:00:00 2001
From: Donald Zou <donaldzou@live.hk>
Date: Mon, 19 May 2025 21:43:11 +0800
Subject: [PATCH] Update

---
 src/dashboard.py                      | 41 ---------------------------
 src/modules/WireguardConfiguration.py |  9 +++---
 2 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/src/dashboard.py b/src/dashboard.py
index 6c0ae04..91cca6b 100644
--- a/src/dashboard.py
+++ b/src/dashboard.py
@@ -59,47 +59,6 @@ def ResponseObject(status=True, message=None, data=None, status_code = 200) -> F
     response.content_type = "application/json"
     return response       
 
-
-
-
-            
-
-    
-
-    
-
-
-"""
-Database Connection Functions
-"""
-
-sqldb = sqlite3.connect(os.path.join(CONFIGURATION_PATH, 'db', 'wgdashboard.db'), check_same_thread=False)
-sqldb.row_factory = sqlite3.Row
-
-def sqlSelect(statement: str, paramters: tuple = ()) -> sqlite3.Cursor:
-    result = []
-    try:
-        cursor = sqldb.cursor()
-        result = cursor.execute(statement, paramters)
-    except Exception as error:
-        print("[WGDashboard] SQLite Error:" + str(error) + " | Statement: " + statement)
-    return result
-
-def sqlUpdate(statement: str, paramters: tuple = ()) -> sqlite3.Cursor:
-    sqldb = sqlite3.connect(os.path.join(CONFIGURATION_PATH, 'db', 'wgdashboard.db'))
-    sqldb.row_factory = sqlite3.Row
-    cursor = sqldb.cursor()
-    with sqldb:
-        cursor = sqldb.cursor()
-        try:
-            statement = statement.rstrip(';')
-            s = f'BEGIN TRANSACTION;{statement};END TRANSACTION;'
-            cursor.execute(statement, paramters)
-            # sqldb.commit()
-        except Exception as error:
-            print("[WGDashboard] SQLite Error:" + str(error) + " | Statement: " + statement)
-    sqldb.close()
-
 DashboardConfig = DashboardConfig()
 EmailSender = EmailSender(DashboardConfig)
 _, APP_PREFIX = DashboardConfig.GetConfig("Server", "app_prefix")
diff --git a/src/modules/WireguardConfiguration.py b/src/modules/WireguardConfiguration.py
index 7687a4c..c23846b 100644
--- a/src/modules/WireguardConfiguration.py
+++ b/src/modules/WireguardConfiguration.py
@@ -70,7 +70,7 @@ class WireguardConfiguration:
                     os.path.join(
                         self.__getProtocolPath(),
                         'WGDashboard_Backup',
-                        data["Backup"].replace(".conf", ".sql")))
+                        data["Backup"].replace(".conf", ".sql")), True)
             else:
                 self.createDatabase()
 
@@ -213,7 +213,7 @@ class WireguardConfiguration:
                         )
                     )
         except Exception as e:
-            print("[WGDashboard] Error: Drop table failed")
+            print("[WGDashboard] Error: Drop table failed - " + str(e))
             return False
         return True
 
@@ -314,8 +314,9 @@ class WireguardConfiguration:
                     insert_stmt = i.insert().values(dict(row))
                     yield str(insert_stmt.compile(compile_kwargs={"literal_binds": True}))
 
-    def __importDatabase(self, sqlFilePath) -> bool:
-        self.__dropDatabase()
+    def __importDatabase(self, sqlFilePath, restore = False) -> bool:
+        if not restore:
+            self.__dropDatabase()
         self.createDatabase()
         if not os.path.exists(sqlFilePath):
             return False