From c0f0a1978f4f56853ee9d066a614cbaab0f4f581 Mon Sep 17 00:00:00 2001
From: angelblue05 <tamara.angel05@gmail.com>
Date: Tue, 28 Jun 2016 17:24:12 -0500
Subject: [PATCH] Preparation for centralized queries
To handle exceptions, etc.
---
resources/lib/utils.py | 55 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 54 insertions(+), 1 deletion(-)
diff --git a/resources/lib/utils.py b/resources/lib/utils.py
index e2bfea65..cda4c5e2 100644
--- a/resources/lib/utils.py
+++ b/resources/lib/utils.py
@@ -99,7 +99,7 @@ def kodiSQL(media_type="video"):
else:
dbPath = getKodiVideoDBPath()
- connection = sqlite3.connect(dbPath)
+ connection = sqlite3.connect(dbPath, timeout=20)
return connection
def getKodiVideoDBPath():
@@ -134,6 +134,59 @@ def getKodiMusicDBPath():
% dbVersion.get(xbmc.getInfoLabel('System.BuildVersion')[:2], "")).decode('utf-8')
return dbPath
+def querySQL(query, args=None, cursor=None, conntype=None):
+
+ result = None
+ manualconn = False
+ failed = False
+
+ if cursor is None:
+ if conntype is None:
+ log("New connection type is missing.", 1)
+ return result
+ else:
+ manualconn = True
+ connection = kodiSQL(conntype)
+ cursor = connection.cursor()
+
+ attempts = 0
+ while attempts < 3:
+ try:
+ log("Query: %s Args: %s" % (query, args), 2)
+ if args is None:
+ result = cursor.execute(query)
+ else:
+ result = cursor.execute(query, args)
+ break # Query successful, break out of while loop
+ except sqlite3.OperationalError as e:
+ if "database is locked" in e:
+ log("%s...Attempt: %s" % (e, attempts), 0)
+ attempts += 1
+ xbmc.sleep(1000)
+ else:
+ log("Error sqlite3: %s" % e, 0)
+ if manualconn:
+ cursor.close()
+ raise
+ except sqlite3.Error as e:
+ log("Error sqlite3: %s" % e, 0)
+ if manualconn:
+ cursor.close()
+ raise
+ else:
+ failed = True
+ log("FAILED // Query: %s Args: %s" % (query, args), 1)
+
+ if manualconn:
+ if failed:
+ cursor.close()
+ else:
+ connection.commit()
+ cursor.close()
+
+ log(result, 2)
+ return result
+
#################################################################################################
# Utility methods