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

Fix server migration and typo

Browse source
This commit is contained in:
angelblue05 2016-10-27 23:42:25 -05:00
parent 1149af84aa
commit 1a961e853b
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/lib/connect/connectionmanager.py
View file

@ -308,7 +308,7 @@ class ConnectionManager(object):
return self._resolveFailure() return self._resolveFailure()
try: try:
publicInfo = self._tryConnect(address, options) publicInfo = self._tryConnect(address, options=options)
except Exception: except Exception:
return _onFail() return _onFail()
else: else:

16
resources/lib/initialsetup.py
View file

@ -77,8 +77,15 @@ class InitialSetup(object):
###$ Begin migration $### ###$ Begin migration $###
if settings('server') == "": if settings('server') == "":
self.user_client.get_server()
log.info("server migration completed")
self.user_client.get_userid()
self.user_client.get_token()
###$ End migration $###
current_server = self.user_client.get_server() current_server = self.user_client.get_server()
if current_server is not None: if current_server and not settings('serverId'):
server = self.connectmanager.get_server(current_server, server = self.connectmanager.get_server(current_server,
{'ssl': self.user_client.get_ssl()}) {'ssl': self.user_client.get_ssl()})
log.info("Detected: %s", server) log.info("Detected: %s", server)
@ -87,13 +94,8 @@ class InitialSetup(object):
settings('serverId', value=server_id) settings('serverId', value=server_id)
except Exception as error: except Exception as error:
log.error(error) log.error(error)
log.info("server migration completed")
self.user_client.get_userid() if current_server:
self.user_client.get_token()
###$ End migration $###
if settings('server'):
current_state = self.connectmanager.get_state() current_state = self.connectmanager.get_state()
try: try:
for server in current_state['Servers']: for server in current_state['Servers']: