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

Prettify logging

Browse source
This commit is contained in:
croneter 2018-02-25 13:37:30 +01:00
parent ae6fb9ecfa
commit b42a9e2062
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
resources/lib/kodidb_functions.py
View file

@ -10,7 +10,7 @@ import variables as v
############################################################################### ###############################################################################
log = getLogger("PLEX."+__name__) LOG = getLogger("PLEX." + __name__)
############################################################################### ###############################################################################
@ -254,7 +254,7 @@ class Kodidb_Functions():
query = "INSERT INTO country(country_id, name) values(?, ?)" query = "INSERT INTO country(country_id, name) values(?, ?)"
self.cursor.execute(query, (country_id, country)) self.cursor.execute(query, (country_id, country))
log.debug("Add country to media, processing: %s" % country) LOG.debug("Add country to media, processing: %s", country)
finally: # Assign country to content finally: # Assign country to content
query = ( query = (
@ -413,7 +413,7 @@ class Kodidb_Functions():
query = "INSERT INTO genre(genre_id, name) values(?, ?)" query = "INSERT INTO genre(genre_id, name) values(?, ?)"
self.cursor.execute(query, (genre_id, genre)) self.cursor.execute(query, (genre_id, genre))
log.debug("Add Genres to media, processing: %s" % genre) LOG.debug("Add Genres to media, processing: %s", genre)
finally: finally:
# Assign genre to item # Assign genre to item
@ -447,7 +447,7 @@ class Kodidb_Functions():
query = "INSERT INTO studio(studio_id, name) values(?, ?)" query = "INSERT INTO studio(studio_id, name) values(?, ?)"
self.cursor.execute(query, (studioid, studio)) self.cursor.execute(query, (studioid, studio))
log.debug("Add Studios to media, processing: %s" % studio) LOG.debug("Add Studios to media, processing: %s", studio)
finally: # Assign studio to item finally: # Assign studio to item
query = ( query = (
@ -557,7 +557,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:
log.info('Did not find any file, abort') LOG.info('Did not find any file, abort')
return return
query = ' '.join(( query = ' '.join((
"SELECT strPath", "SELECT strPath",
@ -581,12 +581,12 @@ 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:
log.info('Did not find matching paths, abort') LOG.info('Did not find matching paths, abort')
return return
# 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:
log.warn('We found too many items with matching filenames and ' LOG.warn('We found too many items with matching filenames and '
' paths, aborting') ' paths, aborting')
return return
idFile = result[0] idFile = result[0]
@ -613,7 +613,7 @@ class Kodidb_Functions():
itemId = self.cursor.fetchone()[0] itemId = self.cursor.fetchone()[0]
typus = v.KODI_TYPE_EPISODE typus = v.KODI_TYPE_EPISODE
except TypeError: except TypeError:
log.warn('Unexpectantly did not find a match!') LOG.warn('Unexpectantly did not find a match!')
return return
return itemId, typus return itemId, typus
@ -630,7 +630,7 @@ class Kodidb_Functions():
self.cursor.execute(query, (path,)) self.cursor.execute(query, (path,))
path_id = self.cursor.fetchall() path_id = self.cursor.fetchall()
if len(path_id) != 1: if len(path_id) != 1:
log.error('Found wrong number of path ids: %s for path %s, abort', LOG.error('Found wrong number of path ids: %s for path %s, abort',
path_id, path) path_id, path)
return return
query = ''' query = '''
@ -641,7 +641,7 @@ class Kodidb_Functions():
self.cursor.execute(query, (filename, path_id[0])) self.cursor.execute(query, (filename, path_id[0]))
song_id = self.cursor.fetchall() song_id = self.cursor.fetchall()
if len(song_id) != 1: if len(song_id) != 1:
log.info('Found wrong number of songs %s, abort', song_id) LOG.info('Found wrong number of songs %s, abort', song_id)
return return
return song_id[0] return song_id[0]
@ -755,7 +755,7 @@ class Kodidb_Functions():
self.cursor.execute(query, (kodiid, mediatype)) self.cursor.execute(query, (kodiid, mediatype))
# Add tags # Add tags
log.debug("Adding Tags: %s" % tags) LOG.debug("Adding Tags: %s", tags)
for tag in tags: for tag in tags:
self.addTag(kodiid, tag, mediatype) self.addTag(kodiid, tag, mediatype)
@ -774,7 +774,7 @@ class Kodidb_Functions():
except TypeError: except TypeError:
# Create the tag, because it does not exist # Create the tag, because it does not exist
tag_id = self.createTag(tag) tag_id = self.createTag(tag)
log.debug("Adding tag: %s" % tag) LOG.debug("Adding tag: %s", tag)
finally: finally:
# Assign tag to item # Assign tag to item
@ -807,7 +807,7 @@ class Kodidb_Functions():
query = "INSERT INTO tag(tag_id, name) values(?, ?)" query = "INSERT INTO tag(tag_id, name) values(?, ?)"
self.cursor.execute(query, (tag_id, name)) self.cursor.execute(query, (tag_id, name))
log.debug("Create tag_id: %s name: %s" % (tag_id, name)) LOG.debug("Create tag_id: %s name: %s", tag_id, name)
return tag_id return tag_id
def updateTag(self, oldtag, newtag, kodiid, mediatype): def updateTag(self, oldtag, newtag, kodiid, mediatype):
@ -863,7 +863,7 @@ class Kodidb_Functions():
def createBoxset(self, boxsetname): def createBoxset(self, boxsetname):
log.debug("Adding boxset: %s" % boxsetname) LOG.debug("Adding boxset: %s", boxsetname)
query = ' '.join(( query = ' '.join((
"SELECT idSet", "SELECT idSet",
@ -1202,11 +1202,11 @@ def kodiid_from_filename(path, kodi_type):
try: try:
kodi_id, _ = kodi_db.music_id_from_filename(filename, path) kodi_id, _ = kodi_db.music_id_from_filename(filename, path)
except TypeError: except TypeError:
log.debug('No Kodi audio db element found for path %s', path) LOG.debug('No Kodi audio db element found for path %s', path)
else: else:
with GetKodiDB('video') as kodi_db: with GetKodiDB('video') as kodi_db:
try: try:
kodi_id, _ = kodi_db.video_id_from_filename(filename, path) kodi_id, _ = kodi_db.video_id_from_filename(filename, path)
except TypeError: except TypeError:
log.debug('No kodi video db element found for path %s', path) LOG.debug('No kodi video db element found for path %s', path)
return kodi_id return kodi_id