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

Revert "Add option to delete user info"

Browse source 
This reverts commit 705b5f29d5.
This commit is contained in:
angelblue05 2015-04-12 08:33:36 -05:00
parent 705b5f29d5
commit 39f7d67c0e
2 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
resources/lib/Utils.py
View file

@ -154,18 +154,10 @@ def removeDirectory(path):
def reset():
WINDOW = xbmcgui.Window( 10000 )
return_value = xbmcgui.Dialog().yesno("Warning", "Are you sure you want to reset your local database?")
if return_value == 0:
return
# Ask if user information should be deleted too.
return_user = xbmcgui.Dialog().yesno("Warning", "Do you wish to erase your saved Emby user information?")
if return_user == 1:
WINDOW.setProperty("EraseUserInfo", "true")
# first stop any db sync
WINDOW = xbmcgui.Window( 10000 )
WINDOW.setProperty("SyncDatabaseShouldStop", "true")
@ -197,6 +189,6 @@ def reset():
WINDOW.setProperty("SyncInstallRunDone", "false")
dialog = xbmcgui.Dialog()
dialog.ok('Emby Reset', 'Database reset has completed, Kodi will now restart to apply the changes.')
dialog.ok('Emby Reset', 'Database reset has completed, kodi will now restart to apply the changes.')
xbmc.executebuiltin("RestartApp")

13
service.py
View file

@ -1,8 +1,6 @@
import xbmcaddon
import xbmc
import xbmcgui
import xbmcvfs
import os
import threading
import json
@ -120,7 +118,7 @@ class Service():
xbmc.log("Doing_Db_Sync: syncDatabase (Finished) " + str(libSync))
countSync = librarySync.updatePlayCounts()
xbmc.log("Doing_Db_Sync: updatePlayCounts (Finished) " + str(countSync))
xbmc.executebuiltin("UpdateLibrary(video)")
if(libSync and countSync):
startupComplete = True
else:
@ -135,17 +133,10 @@ class Service():
# If user reset library database.
WINDOW = xbmcgui.Window(10000)
addon = xbmcaddon.Addon('plugin.video.emby')
if WINDOW.getProperty("SyncInstallRunDone") == "false":
addon = xbmcaddon.Addon('plugin.video.emby')
addon.setSetting("SyncInstallRunDone", "false")
if WINDOW.getProperty("EraseUserInfo") == "true":
addondir = xbmc.translatePath(addon.getAddonInfo('profile'))
dataPath = os.path.join(addondir + "settings.xml")
xbmcvfs.delete(dataPath)
xbmc.log("Deleted saved user information for: %s" % user.currUser)
if (self.newWebSocketThread != None):
ws.stopClient()