From 3f3ac45ef5c3f284fbf27c47dea770a7af31cd70 Mon Sep 17 00:00:00 2001
From: angelblue05 <tamara.angel05@gmail.com>
Date: Fri, 14 Oct 2016 02:04:59 -0500
Subject: [PATCH] Fix emby connect
---
resources/lib/connectmanager.py | 38 ++++++++++++++++++---------------
resources/lib/service_entry.py | 2 +-
2 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/resources/lib/connectmanager.py b/resources/lib/connectmanager.py
index 96a80a48..1376236e 100644
--- a/resources/lib/connectmanager.py
+++ b/resources/lib/connectmanager.py
@@ -35,35 +35,39 @@ class ConnectManager(object):
self.__dict__ = self._shared_state
- if not self.state and not window('emby_currUser'):
- client_info = clientinfo.ClientInfo()
- self.emby = embyserver.Read_EmbyServer()
+ client_info = clientinfo.ClientInfo()
+ self.emby = embyserver.Read_EmbyServer()
- version = client_info.get_version()
- device_name = client_info.get_device_name()
- device_id = client_info.get_device_id()
-
- self._connect = connectionmanager.ConnectionManager(appName="Kodi",
- appVersion=version,
- deviceName=device_name,
- deviceId=device_id)
- path = xbmc.translatePath(
+ version = client_info.get_version()
+ device_name = client_info.get_device_name()
+ device_id = client_info.get_device_id()
+ self._connect = connectionmanager.ConnectionManager(appName="Kodi",
+ appVersion=version,
+ deviceName=device_name,
+ deviceId=device_id)
+ path = xbmc.translatePath(
"special://profile/addon_data/plugin.video.emby/").decode('utf-8')
- if not xbmcvfs.exists(path):
- xbmcvfs.mkdirs(path)
+ if not xbmcvfs.exists(path):
+ xbmcvfs.mkdirs(path)
- self._connect.setFilePath(path)
+ self._connect.setFilePath(path)
+
+ if window('emby_state.json'):
+ self.state = window('emby_state.json')
+
+ elif not self.state:
self.state = self._connect.connect()
log.info("Started with: %s", self.state)
+ window('emby_state.json', value=self.state)
def update_state(self):
-
self.state = self._connect.connect({'updateDateLastAccessed': False})
- return self.state
+ return self.get_state()
def get_state(self):
+ window('emby_state.json', value=self.state)
return self.state
def get_server(self, server):
diff --git a/resources/lib/service_entry.py b/resources/lib/service_entry.py
index 2d8acd8e..191820a2 100644
--- a/resources/lib/service_entry.py
+++ b/resources/lib/service_entry.py
@@ -67,7 +67,7 @@ class Service(object):
# Reset window props for profile switch
properties = [
- "emby_online", "emby_serverStatus", "emby_onWake",
+ "emby_online", "emby_state.json" "emby_serverStatus", "emby_onWake",
"emby_syncRunning", "emby_dbCheck", "emby_kodiScan",
"emby_shouldStop", "emby_currUser", "emby_dbScan", "emby_sessionId",
"emby_initialScan", "emby_customplaylist", "emby_playbackProps"