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

Merge pull request #712 from croneter/fix-videos-disappearing

Browse source 
Fix movies or shows disappearing in fringe cases
This commit is contained in:
croneter 2019-02-08 15:19:50 +01:00 committed by GitHub
commit 80f3542737
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
resources/lib/kodi_db/video.py
View file

@ -9,6 +9,9 @@ from .. import path_ops, timing, variables as v, app
LOG = getLogger('PLEX.kodi_db.video') LOG = getLogger('PLEX.kodi_db.video')
MOVIE_PATH = 'plugin://%s.movies/' % v.ADDON_ID
SHOW_PATH = 'plugin://%s.tvshows/' % v.ADDON_ID
class KodiVideoDB(common.KodiDBBase): class KodiVideoDB(common.KodiDBBase):
db_kind = 'video' db_kind = 'video'
@ -23,7 +26,7 @@ class KodiVideoDB(common.KodiDBBase):
For some reason, Kodi ignores this if done via itemtypes while e.g. For some reason, Kodi ignores this if done via itemtypes while e.g.
adding or updating items. (addPath method does NOT work) adding or updating items. (addPath method does NOT work)
""" """
path_id = self.get_path('plugin://%s.movies/' % v.ADDON_ID) path_id = self.get_path(MOVIE_PATH)
if path_id is None: if path_id is None:
self.cursor.execute("SELECT COALESCE(MAX(idPath),0) FROM path") self.cursor.execute("SELECT COALESCE(MAX(idPath),0) FROM path")
path_id = self.cursor.fetchone()[0] + 1 path_id = self.cursor.fetchone()[0] + 1
@ -37,13 +40,13 @@ class KodiVideoDB(common.KodiDBBase):
VALUES (?, ?, ?, ?, ?, ?) VALUES (?, ?, ?, ?, ?, ?)
''' '''
self.cursor.execute(query, (path_id, self.cursor.execute(query, (path_id,
'plugin://%s.movies/' % v.ADDON_ID, MOVIE_PATH,
'movies', 'movies',
'metadata.local', 'metadata.local',
1, 1,
0)) 0))
# And TV shows # And TV shows
path_id = self.get_path('plugin://%s.tvshows/' % v.ADDON_ID) path_id = self.get_path(SHOW_PATH)
if path_id is None: if path_id is None:
self.cursor.execute("SELECT COALESCE(MAX(idPath),0) FROM path") self.cursor.execute("SELECT COALESCE(MAX(idPath),0) FROM path")
path_id = self.cursor.fetchone()[0] + 1 path_id = self.cursor.fetchone()[0] + 1
@ -57,7 +60,7 @@ class KodiVideoDB(common.KodiDBBase):
VALUES (?, ?, ?, ?, ?, ?) VALUES (?, ?, ?, ?, ?, ?)
''' '''
self.cursor.execute(query, (path_id, self.cursor.execute(query, (path_id,
'plugin://%s.tvshows/' % v.ADDON_ID, SHOW_PATH,
'tvshows', 'tvshows',
'metadata.local', 'metadata.local',
1, 1,
@ -227,8 +230,12 @@ class KodiVideoDB(common.KodiDBBase):
self.cursor.execute('SELECT idFile FROM files WHERE idPath = ? LIMIT 1', self.cursor.execute('SELECT idFile FROM files WHERE idPath = ? LIMIT 1',
(path_id,)) (path_id,))
if self.cursor.fetchone() is None: if self.cursor.fetchone() is None:
self.cursor.execute('DELETE FROM path WHERE idPath = ?', # Make sure we're not deleting our root paths!
(path_id,)) query = '''
DELETE FROM path
WHERE idPath = ? AND strPath NOT IN (?, ?)
'''
self.cursor.execute(query, (path_id, MOVIE_PATH, SHOW_PATH))
@common.catch_operationalerrors @common.catch_operationalerrors
def _modify_link_and_table(self, kodi_id, kodi_type, entries, link_table, def _modify_link_and_table(self, kodi_id, kodi_type, entries, link_table,