Removed all uses of httpapi for sql db access, replaced with smart (d…

…b finding) direct access. Should solve #101, #61 the freezing of xbmc when syncing seen back to xbmc.

addon.xml

@@ -6,6 +6,7 @@
     <requires>
         <import addon="xbmc.python" version="1.0"/>
         <import addon="script.module.simplejson" version="2.0.10"/>
+        <import addon="script.module.myconnpy" version="0.3.2"/>
     </requires>
     <extension point="xbmc.python.script" library="default.py">
         <provides>video</provides>

raw_xbmc_database.py

@@ -0,0 +1,90 @@
+import os, xbmc
+from utilities import Debug
+#provides access to the raw xbmc video database
+
+
+global _RawXbmcDb__conn
+_RawXbmcDb__conn = None
+class RawXbmcDb():
+
+    # make a httpapi based XBMC db query (get data)
+    @staticmethod
+    def query(query):
+        global _RawXbmcDb__conn
+        if _RawXbmcDb__conn is None:
+            _RawXbmcDb__conn = _findXbmcDb()
+
+        Debug("[RawXbmcDb] query: "+query)
+        cursor = _RawXbmcDb__conn.cursor()
+        cursor.execute(query)
+
+        matches = []
+        for row in cursor:
+            matches.append(row)
+
+        Debug("[RawXbmcDb] matches: "+unicode(matches))
+
+        _RawXbmcDb__conn.commit()
+        cursor.close()
+        return matches
+
+    # execute a httpapi based XBMC db query (set data)
+    @staticmethod
+    def execute(query):
+        global _RawXbmcDb__conn
+        if _RawXbmcDb__conn is None:
+            _RawXbmcDb__conn = _findXbmcDb()
+        cursor = _RawXbmcDb__conn.cursor()
+        Debug("[RawXbmcDb] query: "+query)
+        cursor.execute(query)
+
+def _findXbmcDb():
+    type = None
+    host = None
+    port = 3306
+    name = None
+    user = None
+    passwd = None
+    if not os.path.exists(xbmc.translatePath("special://userdata/advancedsettings.xml")):
+        type = 'sqlite3'
+    else:
+        from xml.etree.ElementTree import ElementTree
+        advancedsettings = ElementTree()
+        advancedsettings.parse(xbmc.translatePath("special://userdata/advancedsettings.xml"))
+        settings = advancedsettings.getroot().find("videodatabase")
+        if settings is not None:
+            for setting in settings:
+                if setting.tag == 'type':
+                    type = setting.text
+                elif setting.tag == 'host':
+                    host = setting.text
+                elif setting.tag == 'port':
+                    port = setting.text
+                elif setting.tag == 'name':
+                    name = setting.text
+                elif setting.tag == 'user':
+                    user = setting.text
+                elif setting.tag == 'pass':
+                    passwd = setting.text
+        else:
+            type = 'sqlite3'
+
+    if type == 'sqlite3':
+        if host is None:
+            path = xbmc.translatePath("special://userdata/database")
+            files = os.listdir(path)
+            latest = ""
+            for file in files:
+                if file[:8] == 'MyVideos':
+                    if file > latest:
+                        latest = file
+            Debug(latest)
+            host = os.path.join(path,latest)
+        else:
+            host += ".db"
+        import sqlite3
+        return sqlite3.connect(host)
+    if type == 'mysql':
+        import mysql.connector
+        return mysql.connector.Connect(host = host, port = port, database = name, user = user, password = passwd)
+

utilities.py

@@ -51,6 +51,9 @@ def Debug(msg, force=False):
         except UnicodeEncodeError:
             print "Trakt Utilities: " + msg.encode( "utf-8", "ignore" )
 
+#This class needs debug
+from raw_xbmc_database import RawXbmcDb
+
 def notification( header, message, time=5000, icon=__settings__.getAddonInfo( "icon" ) ):
     xbmc.executebuiltin( "XBMC.Notification(%s,%s,%i,%s)" % ( header, message, time, icon ) )
 
@@ -85,25 +88,6 @@ def checkSettings(daemon=False):
 def xcp(s):
     return re.sub('''(['])''', r"''", unicode(s))
 
-# make a httpapi based XBMC db query (get data)
-def xbmcHttpapiQuery(query):
-    Debug("[httpapi-sql] query: "+query)
-
-    xml_data = xbmc.executehttpapi( "QueryVideoDatabase(%s)" % urllib.quote_plus(query), )
-    match = re.findall( "<field>((?:[^<]|<(?!/))*)</field>", xml_data,)
-
-    Debug("[httpapi-sql] responce: "+xml_data)
-    Debug("[httpapi-sql] matches: "+unicode(match))
-
-    return match
-
-# execute a httpapi based XBMC db query (set data)
-def xbmcHttpapiExec(query):
-    Debug("[httpapi-sql] query: "+query)
-    xml_data = xbmc.executehttpapi( "ExecVideoDatabase(%s)" % urllib.quote_plus(query), )
-    Debug("[httpapi-sql] responce: "+xml_data)
-    return xml_data
-
 # get a connection to trakt
 def getTraktConnection():
     try:
@@ -418,15 +402,15 @@ def setXBMCMoviePlaycount(imdb_id, playcount):
 
     # httpapi till jsonrpc supports playcount update
     # c09 => IMDB ID
-    match = xbmcHttpapiQuery(
+    match = RawXbmcDb.query(
     "SELECT movie.idFile FROM movie"+
     " WHERE movie.c09='%(imdb_id)s'" % {'imdb_id':xcp(imdb_id)})
 
     if not match:
         #add error message here
         return
 
-    result = xbmcHttpapiExec(
+    RawXbmcDb.execute(
     "UPDATE files"+
     " SET playcount=%(playcount)d" % {'playcount':int(playcount)}+
     " WHERE idFile=%(idFile)s" % {'idFile':xcp(match[0])})
@@ -436,7 +420,7 @@ def setXBMCMoviePlaycount(imdb_id, playcount):
 # sets the playcount of a given episode by tvdb_id
 def setXBMCEpisodePlaycount(tvdb_id, seasonid, episodeid, playcount):
     # httpapi till jsonrpc supports playcount update
-    responce = xbmcHttpapiExec(
+    RawXbmcDb.execute(
     "UPDATE files"+
     " SET playcount=%(playcount)s" % {'playcount':xcp(playcount)}+
     " WHERE idFile IN ("+
@@ -448,8 +432,6 @@ def setXBMCEpisodePlaycount(tvdb_id, seasonid, episodeid, playcount):
     "    AND episode.c12='%(seasonid)s'" % {'seasonid':xcp(seasonid)}+
     "    AND episode.c13='%(episodeid)s'" % {'episodeid':xcp(episodeid)}+
     " )")
-
-    Debug("xml answer: " + str(responce))
 
 # get current video being played from XBMC
 def getCurrentPlayingVideoFromXBMC():
@@ -536,7 +518,7 @@ def getMovieIdFromXBMC(imdb_id, title):
     # Get id of movie by movies IMDB
     Debug("Searching for movie: "+imdb_id+", "+title)
 
-    match = xbmcHttpapiQuery(
+    match = RawXbmcDb.query(
     " SELECT idMovie FROM movie"+
     "  WHERE c09='%(imdb_id)s'" % {'imdb_id':imdb_id}+
     " UNION"+
@@ -556,7 +538,7 @@ def getShowIdFromXBMC(tvdb_id, title):
 
     Debug("Searching for show: "+str(tvdb_id)+", "+title)
 
-    match = xbmcHttpapiQuery(
+    match = RawXbmcDb.query(
     " SELECT idShow FROM tvshow"+
     "  WHERE c12='%(tvdb_id)s'" % {'tvdb_id':xcp(tvdb_id)}+
     " UNION"+
@@ -881,8 +863,7 @@ def scrobbleEpisodeOnTrakt(tvdb_id, title, year, season, episode, duration, perc
         Debug("Error in request from 'scrobbleEpisodeOnTrakt()'")
     return responce
 
-
-
+
 """
 ToDo: