Revert db change

resources/lib/Utils.py

@@ -63,37 +63,39 @@ def KodiSQL(type="video"):
 
 def getKodiVideoDBPath():
 
-    dirs, files = xbmcvfs.listdir("special://database")
+    kodibuild = xbmc.getInfoLabel("System.BuildVersion")
-    dbVersions = {}
 
-    for database in files:
+    if kodibuild.startswith("13"):
-        if "MyVideos" in database and database.endswith("db"):
+        # Gotham
-            version = database[len("MyVideos"):-len(".db")]
+        dbVersion = "78"
-            dbVersions[int(version)] = database
+    elif kodibuild.startswith("14"):
-    # Sort by highest version number
+        # Helix
-    versions = sorted(dbVersions.keys(), reverse=True)
+        dbVersion = "90"
+    elif kodibuild.startswith("15"):
+        # Isengard
+        dbVersion = "93"
+    else:
+        # Not a compatible build
+        xbmc.log("This Kodi version is incompatible. Current version: %s" % kodibuild)
 
-    dbPath = xbmc.translatePath("special://database/%s" % dbVersions[versions[0]])
+    dbPath = xbmc.translatePath("special://profile/Database/MyVideos" + dbVersion + ".db")
-    logMsg("Utils", "Path to Video database: %s" % dbPath, 0)
     
-    return dbPath
+    return dbPath  
 
 def getKodiMusicDBPath():
-
+    if xbmc.getInfoLabel("System.BuildVersion").startswith("13"):
-    dirs, files = xbmcvfs.listdir("special://database")
+        #gotham
-    dbVersions = {}
+        dbVersion = "46"
-
+    elif xbmc.getInfoLabel("System.BuildVersion").startswith("15"):
-    for database in files:
+        #isengard
-        if "MyMusic" in database and database.endswith("db"):
+        dbVersion = "52"
-            version = database[len("MyMusic"):-len(".db")]
+    else: 
-            dbVersions[int(version)] = database
+        #helix
-    # Sort by highest version number
+        dbVersion = "48"
-    versions = sorted(dbVersions.keys(), reverse=True)
+    
-
+    dbPath = xbmc.translatePath("special://profile/Database/MyMusic" + dbVersion + ".db")
-    dbPath = xbmc.translatePath("special://database/%s" % dbVersions[versions[0]])
+    
-    logMsg("Utils", "Path to Music database: %s" % dbPath, 0)
+    return dbPath   
-
-    return dbPath
     
 def prettifyXml(elem):
     rough_string = etree.tostring(elem, "utf-8")