Merge pull request #627 from croneter/missing_items

Fix 'NoneType' object has no attribute 'execute' when Plex artwork is not synced and an item is deleted
This commit is contained in:
croneter 2019-01-28 20:21:14 +01:00 committed by GitHub
commit 06964fab7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 15 deletions

View file

@ -6,7 +6,7 @@ from ntpath import dirname
from ..plex_db import PlexDB, PLEXDB_LOCK from ..plex_db import PlexDB, PLEXDB_LOCK
from ..kodi_db import KodiVideoDB, KODIDB_LOCK from ..kodi_db import KodiVideoDB, KODIDB_LOCK
from .. import utils, timing, app from .. import utils, timing
LOG = getLogger('PLEX.itemtypes.common') LOG = getLogger('PLEX.itemtypes.common')
@ -61,14 +61,10 @@ class ItemBase(object):
self.plexcursor = self.plexconn.cursor() self.plexcursor = self.plexconn.cursor()
self.kodiconn = utils.kodi_sql('video') self.kodiconn = utils.kodi_sql('video')
self.kodicursor = self.kodiconn.cursor() self.kodicursor = self.kodiconn.cursor()
if app.SYNC.artwork: self.artconn = utils.kodi_sql('texture')
self.artconn = utils.kodi_sql('texture') self.artcursor = self.artconn.cursor()
self.artcursor = self.artconn.cursor()
else:
self.artconn = None
self.artcursor = None
self.plexdb = PlexDB(plexconn=self.plexconn, lock=False) self.plexdb = PlexDB(plexconn=self.plexconn, lock=False)
self.kodidb = KodiVideoDB(texture_db=app.SYNC.artwork, self.kodidb = KodiVideoDB(texture_db=True,
kodiconn=self.kodiconn, kodiconn=self.kodiconn,
artconn=self.artconn, artconn=self.artconn,
lock=False) lock=False)

View file

@ -24,14 +24,10 @@ class MusicMixin(object):
self.plexcursor = self.plexconn.cursor() self.plexcursor = self.plexconn.cursor()
self.kodiconn = utils.kodi_sql('music') self.kodiconn = utils.kodi_sql('music')
self.kodicursor = self.kodiconn.cursor() self.kodicursor = self.kodiconn.cursor()
if app.SYNC.artwork: self.artconn = utils.kodi_sql('texture')
self.artconn = utils.kodi_sql('texture') self.artcursor = self.artconn.cursor()
self.artcursor = self.artconn.cursor()
else:
self.artconn = None
self.artcursor = None
self.plexdb = PlexDB(plexconn=self.plexconn, lock=False) self.plexdb = PlexDB(plexconn=self.plexconn, lock=False)
self.kodidb = KodiMusicDB(texture_db=app.SYNC.artwork, self.kodidb = KodiMusicDB(texture_db=True,
kodiconn=self.kodiconn, kodiconn=self.kodiconn,
artconn=self.artconn, artconn=self.artconn,
lock=False) lock=False)