Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge conflicts kodidb_functions.py

Browse source
This commit is contained in:
tomkat83 2016-08-30 16:43:56 +02:00
parent 9def7d3e6a
commit d61fa64ed8
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
resources/lib/kodidb_functions.py
View file

@ -9,8 +9,11 @@ from ntpath import dirname
import artwork import artwork
import clientinfo import clientinfo
from utils import settings from utils import settings, kodiSQL
from utils import logging, kodiSQL
###############################################################################
log = logging.getLogger("PLEX."+__name__)
############################################################################### ###############################################################################
@ -33,25 +36,22 @@ class GetKodiDB():
self.kodiconn = kodiSQL(self.itemType) self.kodiconn = kodiSQL(self.itemType)
self.emby_db = Kodidb_Functions(self.kodiconn.cursor()) self.emby_db = Kodidb_Functions(self.kodiconn.cursor())
return self.emby_db return self.emby_db
#################################################################################################
def __exit__(self, type, value, traceback): def __exit__(self, type, value, traceback):
self.kodiconn.commit() self.kodiconn.commit()
self.kodiconn.close() self.kodiconn.close()
#################################################################################################
@logging
class Kodidb_Functions(): class Kodidb_Functions():
kodiversion = int(xbmc.getInfoLabel("System.BuildVersion")[:2]) kodiversion = int(xbmc.getInfoLabel("System.BuildVersion")[:2])
def __init__(self, cursor): def __init__(self, cursor):
self.cursor = cursor self.cursor = cursor
self.clientInfo = clientinfo.ClientInfo() self.clientInfo = clientinfo.ClientInfo()
self.artwork = artwork.Artwork() self.artwork = artwork.Artwork()
def pathHack(self): def pathHack(self):
""" """
Use with Kodi video DB Use with Kodi video DB
@ -811,7 +811,7 @@ class Kodidb_Functions():
self.cursor.execute(query, (filename,)) self.cursor.execute(query, (filename,))
files = self.cursor.fetchall() files = self.cursor.fetchall()
if len(files) == 0: if len(files) == 0:
self.logMsg('Did not find any file, abort', 1) log.info('Did not find any file, abort')
return return
query = ' '.join(( query = ' '.join((
"SELECT strPath", "SELECT strPath",
@ -835,17 +835,17 @@ class Kodidb_Functions():
if strPath == path: if strPath == path:
result.append(file[0]) result.append(file[0])
if len(result) == 0: if len(result) == 0:
self.logMsg('Did not find matching paths, abort', 1) log.info('Did not find matching paths, abort')
return return
self.logMsg('Result: %s' % result) log.debug('Result: %s' % result)
# Kodi seems to make ONE temporary entry; we only want the earlier, # Kodi seems to make ONE temporary entry; we only want the earlier,
# permanent one # permanent one
if len(result) > 2: if len(result) > 2:
self.logMsg('We found too many items with matching filenames and ' log.warn('We found too many items with matching filenames and '
' paths, aborting', 1) ' paths, aborting')
return return
idFile = result[0] idFile = result[0]
self.logMsg('idFile: %s' % idFile) log.debug('idFile: %s' % idFile)
# Try movies first # Try movies first
query = ' '.join(( query = ' '.join((
@ -869,7 +869,7 @@ class Kodidb_Functions():
itemId = self.cursor.fetchone()[0] itemId = self.cursor.fetchone()[0]
typus = 'episode' typus = 'episode'
except TypeError: except TypeError:
self.logMsg('Unexpectantly did not find a match!', 1) log.warn('Unexpectantly did not find a match!')
return return
return itemId, typus return itemId, typus