Jellyfin
/
jellyfin-kodi
mirror of https://github.com/jellyfin/jellyfin-kodi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix server migration and typo

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()
try:
publicInfo = self._tryConnect(address, options)
publicInfo = self._tryConnect(address, options=options)
except Exception:
return _onFail()
else:

26
resources/lib/initialsetup.py
View File

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