vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move ObjectGUID to the end

Browse Source
This commit is contained in:
jokob-sk
2025-03-31 08:12:32 +11:00
parent 02b19c833e
commit d86c2a5023
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/database.py
View File

@@ -542,8 +542,7 @@ class DB():
# Plugin state # Plugin state
sql_Plugins_Objects = """ CREATE TABLE IF NOT EXISTS Plugins_Objects( sql_Plugins_Objects = """ CREATE TABLE IF NOT EXISTS Plugins_Objects(
"Index" INTEGER, "Index" INTEGER,
Plugin TEXT NOT NULL, Plugin TEXT NOT NULL,
ObjectGUID TEXT,
Object_PrimaryID TEXT NOT NULL, Object_PrimaryID TEXT NOT NULL,
Object_SecondaryID TEXT NOT NULL, Object_SecondaryID TEXT NOT NULL,
DateTimeCreated TEXT NOT NULL, DateTimeCreated TEXT NOT NULL,
@@ -561,6 +560,7 @@ class DB():
"HelpVal2" TEXT, "HelpVal2" TEXT,
"HelpVal3" TEXT, "HelpVal3" TEXT,
"HelpVal4" TEXT, "HelpVal4" TEXT,
ObjectGUID TEXT,
PRIMARY KEY("Index" AUTOINCREMENT) PRIMARY KEY("Index" AUTOINCREMENT)
); """ ); """
self.sql.execute(sql_Plugins_Objects) self.sql.execute(sql_Plugins_Objects)

5
server/plugin.py
View File

@@ -797,7 +797,7 @@ class plugin_object_class:
def __init__(self, plugin, objDbRow): def __init__(self, plugin, objDbRow):
self.index = objDbRow[0] self.index = objDbRow[0]
self.pluginPref = objDbRow[1] self.pluginPref = objDbRow[1]
self.primaryId = objDbRow[2] self.primaryId = objDbRow[2]
self.secondaryId = objDbRow[3] self.secondaryId = objDbRow[3]
self.created = objDbRow[4] # can be null self.created = objDbRow[4] # can be null
self.changed = objDbRow[5] # never null (data coming from plugin) self.changed = objDbRow[5] # never null (data coming from plugin)
@@ -819,7 +819,8 @@ class plugin_object_class:
# Check if self.status is valid # Check if self.status is valid
if self.status not in ["exists", "watched-changed", "watched-not-changed", "new", "not-processed", "missing-in-last-scan"]: if self.status not in ["exists", "watched-changed", "watched-not-changed", "new", "not-processed", "missing-in-last-scan"]:
raise ValueError("Invalid status value for plugin object:", self.status) mylog('none', [f'[plugin_object_class] ERROR on objDbRow: {objDbRow}'])
raise ValueError(f"Invalid status value for plugin object ({self.pluginPref}|{self.primaryId}|{self.watched1}) invalid status: {self.status} on objDbRow:", objDbRow)
self.idsHash = str(hash(str(self.primaryId) + str(self.secondaryId))) self.idsHash = str(hash(str(self.primaryId) + str(self.secondaryId)))
# self.idsHash = str(self.primaryId) + str(self.secondaryId) # self.idsHash = str(self.primaryId) + str(self.secondaryId)