evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use voluptuous for SqueezeBox (#3212)

Browse source 
* Migrate to voluptuous

* Remove name
This commit is contained in:
Fabian Affolter 2016-09-05 19:27:06 +02:00 • committed by GitHub
parent ea1e4ea215
commit 428db4a644
1 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

50
homeassistant/components/media_player/squeezebox.py
View file

@ -8,48 +8,53 @@ import logging
import telnetlib import telnetlib
import urllib.parse import urllib.parse
import voluptuous as vol
from homeassistant.components.media_player import ( from homeassistant.components.media_player import (
DOMAIN, MEDIA_TYPE_MUSIC, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, MEDIA_TYPE_MUSIC, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, PLATFORM_SCHEMA,
SUPPORT_PREVIOUS_TRACK, SUPPORT_SEEK, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_PREVIOUS_TRACK, SUPPORT_SEEK, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, MediaPlayerDevice) SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET, MediaPlayerDevice)
from homeassistant.const import ( from homeassistant.const import (
CONF_HOST, CONF_PASSWORD, CONF_USERNAME, STATE_IDLE, STATE_OFF, CONF_HOST, CONF_PASSWORD, CONF_USERNAME, STATE_IDLE, STATE_OFF,
STATE_PAUSED, STATE_PLAYING, STATE_UNKNOWN) STATE_PAUSED, STATE_PLAYING, STATE_UNKNOWN, CONF_PORT)
import homeassistant.helpers.config_validation as cv
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
DEFAULT_PORT = 9090
KNOWN_DEVICES = []
SUPPORT_SQUEEZEBOX = SUPPORT_PAUSE | SUPPORT_VOLUME_SET | \ SUPPORT_SQUEEZEBOX = SUPPORT_PAUSE | SUPPORT_VOLUME_SET | \
SUPPORT_VOLUME_MUTE | SUPPORT_PREVIOUS_TRACK | SUPPORT_NEXT_TRACK | \ SUPPORT_VOLUME_MUTE | SUPPORT_PREVIOUS_TRACK | SUPPORT_NEXT_TRACK | \
SUPPORT_SEEK | SUPPORT_TURN_ON | SUPPORT_TURN_OFF SUPPORT_SEEK | SUPPORT_TURN_ON | SUPPORT_TURN_OFF
KNOWN_DEVICES = [] PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Required(CONF_HOST): cv.string,
vol.Optional(CONF_PASSWORD): cv.string,
vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
vol.Optional(CONF_USERNAME): cv.string,
})
def setup_platform(hass, config, add_devices, discovery_info=None): def setup_platform(hass, config, add_devices, discovery_info=None):
"""Setup the squeezebox platform.""" """Setup the squeezebox platform."""
username = config.get(CONF_USERNAME)
password = config.get(CONF_PASSWORD)
if discovery_info is not None: if discovery_info is not None:
host = discovery_info[0] host = discovery_info[0]
port = 9090 port = DEFAULT_PORT
else: else:
host = config.get(CONF_HOST) host = config.get(CONF_HOST)
port = int(config.get('port', 9090)) port = config.get(CONF_PORT)
if not host:
_LOGGER.error(
"Missing required configuration items in %s: %s",
DOMAIN,
CONF_HOST)
return False
# Only add a media server once # Only add a media server once
if host in KNOWN_DEVICES: if host in KNOWN_DEVICES:
return False return False
KNOWN_DEVICES.append(host) KNOWN_DEVICES.append(host)
lms = LogitechMediaServer( lms = LogitechMediaServer(host, port, username, password)
host, port,
config.get(CONF_USERNAME),
config.get(CONF_PASSWORD))
if not lms.init_success: if not lms.init_success:
return False return False
@ -77,18 +82,13 @@ class LogitechMediaServer(object):
try: try:
http_port = self.query('pref', 'httpport', '?') http_port = self.query('pref', 'httpport', '?')
if not http_port: if not http_port:
_LOGGER.error( _LOGGER.error("Unable to read data from server %s:%s",
"Unable to read data from server %s:%s", self.host, self.port)
self.host,
self.port)
return return
return http_port return http_port
except ConnectionError as ex: except ConnectionError as ex:
_LOGGER.error( _LOGGER.error("Failed to connect to server %s:%s - %s",
"Failed to connect to server %s:%s - %s", self.host, self.port, ex)
self.host,
self.port,
ex)
return return
def create_players(self): def create_players(self):