jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 13:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

change url to host

Browse Source
This commit is contained in:
Per SandstrÃom 2016-02-11 21:07:47 +00:00
parent 15ad48a7a0
commit aafd36d2ce
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
homeassistant/components/media_player/kodi.py
View File

@ -25,19 +25,22 @@ SUPPORT_KODI = SUPPORT_PAUSE | SUPPORT_VOLUME_SET | SUPPORT_VOLUME_MUTE | \
def setup_platform(hass, config, add_devices, discovery_info=None): def setup_platform(hass, config, add_devices, discovery_info=None):
""" Sets up the kodi platform. """ """ Sets up the kodi platform. """
url = '{}:{}'.format(config.get('host'), config.get('port', '8080'))
jsonrpc_url = config.get('url') # deprecated
if jsonrpc_url:
url = jsonrpc_url.rstrip('/jsonrpc')
add_devices([ add_devices([
KodiDevice( KodiDevice(
config.get('name', 'Kodi'), config.get('name', 'Kodi'),
config.get('url'), url,
auth=( auth=(
config.get('user', ''), config.get('user', ''),
config.get('password', ''))), config.get('password', ''))),
]) ])
class KodiDevice(MediaPlayerDevice): class KodiDevice(MediaPlayerDevice):
""" Represents a XBMC/Kodi device. """ """ Represents a XBMC/Kodi device. """
@ -47,12 +50,13 @@ class KodiDevice(MediaPlayerDevice):
import jsonrpc_requests import jsonrpc_requests
self._name = name self._name = name
self._url = url self._url = url
self._server = jsonrpc_requests.Server(url, auth=auth) self._server = jsonrpc_requests.Server(
'{}/jsonrpc'.format(self._url),
auth=auth)
self._players = None self._players = None
self._properties = None self._properties = None
self._item = None self._item = None
self._app_properties = None self._app_properties = None
self.update() self.update()
@property @property
@ -157,10 +161,9 @@ class KodiDevice(MediaPlayerDevice):
url_components = urllib.parse.urlparse(self._item['thumbnail']) url_components = urllib.parse.urlparse(self._item['thumbnail'])
if url_components.scheme == 'image': if url_components.scheme == 'image':
return\ return '{}/image/{}'.format(
self._url.split('/jsonrpc')[0] +\ self._url,
"/image/" +\ urllib.parse.quote_plus(self._item['thumbnail']))
urllib.parse.quote_plus(self._item['thumbnail'])
@property @property
def media_title(self): def media_title(self):