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

Cleanup __shortcuts__ in client.py and associated code (#66)

Browse source 
* client.py - remove "connected"

* client.py - remove "config" & configuration.py - removed shortcuts and get/set item functions

* client.py - remove "auth" & connection_manager.py - remove __shortcuts__ & __getitem__

* client.py - remove "auth" & connection_manager.py - remove __shortcuts__ & __getitem__

* client.py - remove "callback"

* client.py - remove "websocket" and __getitem__ & ws_client.py - remove __shortcuts__

* Fix rebase mess-up
This commit is contained in:
Abby 2019-09-09 01:20:58 +01:00 • committed by mcarlton00
parent 138451d516
commit 4049023559
19 changed files with 134 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

7
resources/lib/dialogs/loginmanual.py
View file

@ -118,9 +118,10 @@ class LoginManual(xbmcgui.WindowXMLDialog):
def _login(self, username, password):
mode = self.connect_manager['server-mode']
server = self.connect_manager['server-address']
result = self.connect_manager['login'](server, username, password)
mode = self.connect_manager.get_server_info(self.connect_manager.server_id)['LastConnectionMode']
server_data = self.connect_manager.get_server_info(self.connect_manager.server_id)
server = self.connect_manager.get_server_address(server_data, server_data['LastConnectionMode'])
result = self.connect_manager.login(server, username, password)
if not result:
self._error(ERROR['Invalid'], _('invalid_auth'))

2
resources/lib/dialogs/serverconnect.py
View file

@ -116,7 +116,7 @@ class ServerConnect(xbmcgui.WindowXMLDialog):
self.message_box.setVisibleCondition('true')
self.busy.setVisibleCondition('true')
result = self.connect_manager['connect-to-server'](server)
result = self.connect_manager.connect_to_server(server)
if result['State'] == CONNECTION_STATE['Unavailable']:
self.busy.setVisibleCondition('false')

2
resources/lib/dialogs/servermanual.py
View file

@ -118,7 +118,7 @@ class ServerManual(xbmcgui.WindowXMLDialog):
server_address = "%s:%s" % (server, port) if port else server
self._message("%s %s..." % (_(30610), server_address))
result = self.connect_manager['manual-server'](server_address)
result = self.connect_manager.connect_to_address(server_address)
if result['State'] == CONNECTION_STATE['Unavailable']:
self._message(_(30609))