diff --git a/server/database.py b/server/database.py index 6a460c7c..8f09acd2 100755 --- a/server/database.py +++ b/server/database.py @@ -542,8 +542,7 @@ class DB(): # Plugin state sql_Plugins_Objects = """ CREATE TABLE IF NOT EXISTS Plugins_Objects( "Index" INTEGER, - Plugin TEXT NOT NULL, - ObjectGUID TEXT, + Plugin TEXT NOT NULL, Object_PrimaryID TEXT NOT NULL, Object_SecondaryID TEXT NOT NULL, DateTimeCreated TEXT NOT NULL, @@ -561,6 +560,7 @@ class DB(): "HelpVal2" TEXT, "HelpVal3" TEXT, "HelpVal4" TEXT, + ObjectGUID TEXT, PRIMARY KEY("Index" AUTOINCREMENT) ); """ self.sql.execute(sql_Plugins_Objects) diff --git a/server/plugin.py b/server/plugin.py index f07a6af1..4bf3b361 100755 --- a/server/plugin.py +++ b/server/plugin.py @@ -797,7 +797,7 @@ class plugin_object_class: def __init__(self, plugin, objDbRow): self.index = objDbRow[0] self.pluginPref = objDbRow[1] - self.primaryId = objDbRow[2] + self.primaryId = objDbRow[2] self.secondaryId = objDbRow[3] self.created = objDbRow[4] # can be null self.changed = objDbRow[5] # never null (data coming from plugin) @@ -819,7 +819,8 @@ class plugin_object_class: # Check if self.status is valid 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(self.primaryId) + str(self.secondaryId)