version 0.3.0, rev187, Trusted authorization sites support, --publish option on signing, cryptSign command line option, OpenSSL enabled on OSX, Crypto verify allows list of valid addresses, Option for version 2 json DB tables, DbCursor SELECT parameters bugfix, Add peer to site on ListModified, Download blind includes when new site added, Publish command better messages, Multi-threaded announce, New http Torrent trackers, Wait for dbschema.json on query, Handle json import errors, More compact writeJson storage command, Testcase for signing and verifying, Workaround to make non target=_top links work, More clean UiWebsocket command route, Send cert_user_id on siteinfo, Notify other local clients on local file modify, Option to wait for file download before sql query, File rules websocket API command, Cert add and select, set websocket API command, Put focus on innerframe, innerloaded wrapper api command to add hashtag, Allow more file error on big sites, Keep worker running after stuked on done task, New more stable openSSL layer that works on OSX, Noparallel parameter bugfix, RateLimit allowed again interval bugfix, Updater skips non-writeable files, Try to close openssl dll before update

src/Db/Db.py

@@ -6,6 +6,7 @@ class Db:
 		self.db_path = db_path
 		self.db_dir = os.path.dirname(db_path)+"/"
 		self.schema = schema
+		self.schema["version"] = self.schema.get("version", 1)
 		self.conn = None
 		self.cur = None
 		self.log = logging.getLogger("Db:%s" % schema["db_name"])
@@ -85,6 +86,7 @@ class Db:
 		cur.execute("BEGIN")
 
 		# Check internal tables
+		# Check keyvalue table
 		changed = cur.needTable("keyvalue", [
 			["keyvalue_id", "INTEGER PRIMARY KEY AUTOINCREMENT"],
 			["key", "TEXT"],
@@ -92,15 +94,25 @@ class Db:
 			["json_id", "INTEGER REFERENCES json (json_id)"],
 		],[
 			"CREATE UNIQUE INDEX key_id ON keyvalue(json_id, key)"
-		], version=1)
+		], version=self.schema["version"])
 		if changed: changed_tables.append("keyvalue")
 
-		changed = cur.needTable("json", [
-			["json_id", "INTEGER PRIMARY KEY AUTOINCREMENT"],
-			["path", "VARCHAR(255)"]
-		], [
-			"CREATE UNIQUE INDEX path ON json(path)"
-		], version=1)
+		# Check json table
+		if self.schema["version"] == 1:
+			changed = cur.needTable("json", [
+				["json_id", "INTEGER PRIMARY KEY AUTOINCREMENT"],
+				["path", "VARCHAR(255)"]
+			], [
+				"CREATE UNIQUE INDEX path ON json(path)"
+			], version=self.schema["version"])
+		else:
+			changed = cur.needTable("json", [
+				["json_id", "INTEGER PRIMARY KEY AUTOINCREMENT"],
+				["directory", "VARCHAR(255)"],
+				["file_name", "VARCHAR(255)"]
+			], [
+				"CREATE UNIQUE INDEX path ON json(directory, file_name)"
+			], version=self.schema["version"])
 		if changed: changed_tables.append("json")
 
 		# Check schema tables

src/Db/DbCursor.py

@@ -1,4 +1,4 @@
-import time
+import time, re
 
 # Special sqlite cursor
 class DbCursor: 
@@ -12,7 +12,7 @@ class DbCursor:
 	def execute(self, query, params=None):
 		if isinstance(params, dict): # Make easier select and insert by allowing dict params
 			if query.startswith("SELECT") or query.startswith("DELETE"): # Convert param dict to SELECT * FROM table WHERE key = ?, key2 = ? format
-				wheres = ", ".join([key+" = ?" for key in params])
+				wheres = "AND ".join([key+" = ?" for key in params])
 				query = query.replace("?", wheres)
 				params = params.values()
 			else: # Convert param dict to INSERT INTO table (key, key2) VALUES (?, ?) format
@@ -94,12 +94,21 @@ class DbCursor:
 	# Get or create a row for json file
 	# Return: The database row
 	def getJsonRow(self, file_path):
-		res = self.execute("SELECT * FROM json WHERE ? LIMIT 1", {"path": file_path})
-		row = res.fetchone()
-		if not row: # No row yet, create it
-			self.execute("INSERT INTO json ?", {"path": file_path})
+		directory, file_name = re.match("^(.*?)/*([^/]*)$", file_path).groups()
+		if self.db.schema["version"] == 1:
 			res = self.execute("SELECT * FROM json WHERE ? LIMIT 1", {"path": file_path})
 			row = res.fetchone()
+			if not row: # No row yet, create it
+				self.execute("INSERT INTO json ?", {"path": file_path})
+				res = self.execute("SELECT * FROM json WHERE ? LIMIT 1", {"path": file_path})
+				row = res.fetchone()
+		else:
+			res = self.execute("SELECT * FROM json WHERE ? LIMIT 1", {"directory": directory, "file_name": file_name})
+			row = res.fetchone()
+			if not row: # No row yet, create it
+				self.execute("INSERT INTO json ?", {"directory": directory, "file_name": file_name})
+				res = self.execute("SELECT * FROM json WHERE ? LIMIT 1", {"directory": directory, "file_name": file_name})
+				row = res.fetchone()
 		return row
 
 	def close(self):