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

Fix DB reset on Startup if PMS connection fails

Browse source 
- Should fix #484
This commit is contained in:
Croneter 2018-06-07 17:11:13 +02:00
parent 2f90a29acf
commit 65561eea47
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
resources/lib/librarysync.py
View file

@ -423,9 +423,6 @@ class LibrarySync(Thread):
""" """
Compare the views to Plex Compare the views to Plex
""" """
self.views = []
vnodes = self.vnodes
# Get views # Get views
sections = PF.get_plex_sections() sections = PF.get_plex_sections()
try: try:
@ -436,6 +433,8 @@ class LibrarySync(Thread):
if state.DIRECT_PATHS is True and state.ENABLE_MUSIC is True: if state.DIRECT_PATHS is True and state.ENABLE_MUSIC is True:
# Will reboot Kodi is new library detected # Will reboot Kodi is new library detected
music.excludefromscan_music_folders(xml=sections) music.excludefromscan_music_folders(xml=sections)
self.views = []
vnodes = self.vnodes
self.nodes = { self.nodes = {
v.PLEX_TYPE_MOVIE: [], v.PLEX_TYPE_MOVIE: [],
@ -1511,10 +1510,6 @@ class LibrarySync(Thread):
LOG.info("Db version: %s", settings('dbCreatedWithVersion')) LOG.info("Db version: %s", settings('dbCreatedWithVersion'))
LOG.info('Refreshing video nodes and playlists now') LOG.info('Refreshing video nodes and playlists now')
# Completely refresh Kodi playlists and video nodes
utils.delete_playlists()
utils.delete_nodes()
self.maintain_views()
# Setup the paths for addon-paths (even when using direct paths) # Setup the paths for addon-paths (even when using direct paths)
with kodidb.GetKodiDB('video') as kodi_db: with kodidb.GetKodiDB('video') as kodi_db:
kodi_db.setup_path_table() kodi_db.setup_path_table()
@ -1539,7 +1534,12 @@ class LibrarySync(Thread):
last_time_sync = utils.unix_timestamp() last_time_sync = utils.unix_timestamp()
LOG.info('Initial start-up full sync starting') LOG.info('Initial start-up full sync starting')
xbmc.executebuiltin('InhibitIdleShutdown(true)') xbmc.executebuiltin('InhibitIdleShutdown(true)')
if self.full_sync(): # Completely refresh Kodi playlists and video nodes
utils.delete_playlists()
utils.delete_nodes()
if not self.maintain_views():
LOG.error('Initial maintain_views not successful')
elif self.full_sync():
LOG.info('Initial start-up full sync successful') LOG.info('Initial start-up full sync successful')
settings('SyncInstallRunDone', value='true') settings('SyncInstallRunDone', value='true')
self.install_sync_done = True self.install_sync_done = True
@ -1588,7 +1588,12 @@ class LibrarySync(Thread):
if state.SUSPEND_SYNC: if state.SUSPEND_SYNC:
LOG.warning('Forcing startup sync even if Kodi is playing') LOG.warning('Forcing startup sync even if Kodi is playing')
state.SUSPEND_SYNC = False state.SUSPEND_SYNC = False
if self.full_sync(): # Completely refresh Kodi playlists and video nodes
utils.delete_playlists()
utils.delete_nodes()
if not self.maintain_views():
LOG.info('Initial maintain_views on startup unsuccessful')
elif self.full_sync():
initial_sync_done = True initial_sync_done = True
last_sync = utils.unix_timestamp() last_sync = utils.unix_timestamp()
LOG.info('Done initial sync on Kodi startup') LOG.info('Done initial sync on Kodi startup')