Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2025-06-02 14:26:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Convert settings to utils method for addon settings

Browse source
This commit is contained in:
angelblue05 2015-08-14 04:03:12 -05:00
parent 811e91a0b5
commit c0f9948cf5
18 changed files with 183 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

20
service.py
View file

@ -10,8 +10,8 @@ import xbmc
import xbmcgui
import xbmcvfs
addon_ = xbmcaddon.Addon(id='plugin.video.emby')
addon_path = addon_.getAddonInfo('path').decode('utf-8')
_addon = xbmcaddon.Addon(id='plugin.video.emby')
addon_path = _addon.getAddonInfo('path').decode('utf-8')
base_resource_path = xbmc.translatePath(os.path.join(addon_path, 'resources', 'lib')).decode('utf-8')
sys.path.append(base_resource_path)
@ -90,7 +90,6 @@ class Service():
def ServiceEntryPoint(self):
WINDOW = self.WINDOW
addon = xbmcaddon.Addon()
# Server auto-detect
ConnectionManager().checkServer()
@ -106,9 +105,6 @@ class Service():
while not self.KodiMonitor.abortRequested():
# Refresh with the latest addon settings
addon = xbmcaddon.Addon()
# Before proceeding, need to make sure:
# 1. Server is online
# 2. User is set
@ -153,7 +149,7 @@ class Service():
else:
# Start up events
self.warn_auth = True
if addon.getSetting('supressConnectMsg') == "false":
if utils.settings('supressConnectMsg') == "false":
if self.welcome_msg:
# Reset authentication warnings
self.welcome_msg = False
@ -236,16 +232,6 @@ class Service():
if self.KodiMonitor.waitForAbort(1):
# Abort was requested while waiting. We should exit
break
# If user reset library database.
if WINDOW.getProperty('SyncInstallRunDone') == "false":
addon.setSetting('SyncInstallRunDone', "false")
# If user delete Emby settings
if WINDOW.getProperty('deletesettings') == "true":
addondir = xbmc.translatePath(addon.getAddonInfo('profile')).decode('utf-8')
dataPath = "%ssettings.xml" % addondir
xbmcvfs.delete(dataPath)
self.logMsg("Deleting: settings.xml", 1)
if (self.newWebSocketThread is not None):
ws.stopClient()