Add support for newer SamsungTV models (#31537)
* Added support for newer SamsungTV models * Fixed legacy port * store token in HA config directory * Change token name * rebasing and exception handling * implement update * fix error creating mediaplayer * Debug logging * Increase timeout * Restore update timeout * Store token_file path in config_entry * Introduction of samsung bridge class * Added bridge class functions * Code cleanup * more fixes * Begin testing * samsungtvws 1.2.0 * Config flow tests 0.1 * Fixed some mediaplayer tests * Fixed fixture in media player * use of constants and turn off * more media player tests * samsungtvws 1.3.1 and other fixes * WS tv update rewritten * more tests * test_init * fixed tests * removed reset mock * tests reset mock * close_remote and tests * deprecate port config * deprecate port config 2 * deprecate port config 3 * save token only if needed * cleanup * better websocket protocol detection * config removal
This commit is contained in:
1 parent
2e802c88f8
commit
a8758ed3a1
11 files changed
+646
-266
No files matched your search
@@ -23,6 +23,7 @@ CONFIG_SCHEMA = vol.Schema(
|
||||
DOMAIN: vol.All(
|
||||
cv.ensure_list,
|
||||
[
|
||||
cv.deprecated(CONF_PORT),
|
||||
vol.Schema(
|
||||
{
|
||||
vol.Required(CONF_HOST): cv.string,
|
||||
@@ -30,7 +31,7 @@ CONFIG_SCHEMA = vol.Schema(
|
||||
vol.Optional(CONF_PORT): cv.port,
|
||||
vol.Optional(CONF_ON_ACTION): cv.SCRIPT_SCHEMA,
|
||||
}
|
||||
)
|
||||
),
|
||||
],
|
||||
ensure_unique_hosts,
|
||||
)
|
||||
|
||||
@@ -0,0 +1,254 @@
|
||||
"""samsungctl and samsungtvws bridge classes."""
|
||||
from abc import ABC, abstractmethod
|
||||
|
||||
from samsungctl import Remote
|
||||
from samsungctl.exceptions import AccessDenied, ConnectionClosed, UnhandledResponse
|
||||
from samsungtvws import SamsungTVWS
|
||||
from samsungtvws.exceptions import ConnectionFailure
|
||||
from websocket import WebSocketException
|
||||
|
||||
from homeassistant.const import (
|
||||
CONF_HOST,
|
||||
CONF_ID,
|
||||
CONF_METHOD,
|
||||
CONF_NAME,
|
||||
CONF_PORT,
|
||||
CONF_TIMEOUT,
|
||||
CONF_TOKEN,
|
||||
)
|
||||
|
||||
from .const import (
|
||||
CONF_DESCRIPTION,
|
||||
LOGGER,
|
||||
METHOD_LEGACY,
|
||||
RESULT_AUTH_MISSING,
|
||||
RESULT_NOT_SUCCESSFUL,
|
||||
RESULT_NOT_SUPPORTED,
|
||||
RESULT_SUCCESS,
|
||||
VALUE_CONF_ID,
|
||||
VALUE_CONF_NAME,
|
||||
)
|
||||
|
||||
|
||||
class SamsungTVBridge(ABC):
|
||||
"""The Base Bridge abstract class."""
|
||||
|
||||
@staticmethod
|
||||
def get_bridge(method, host, port=None, token=None):
|
||||
"""Get Bridge instance."""
|
||||
if method == METHOD_LEGACY:
|
||||
return SamsungTVLegacyBridge(method, host, port)
|
||||
return SamsungTVWSBridge(method, host, port, token)
|
||||
|
||||
def __init__(self, method, host, port):
|
||||
"""Initialize Bridge."""
|
||||
self.port = port
|
||||
self.method = method
|
||||
self.host = host
|
||||
self.token = None
|
||||
self._remote = None
|
||||
self._callback = None
|
||||
|
||||
def register_reauth_callback(self, func):
|
||||
"""Register a callback function."""
|
||||
self._callback = func
|
||||
|
||||
@abstractmethod
|
||||
def try_connect(self):
|
||||
"""Try to connect to the TV."""
|
||||
|
||||
def is_on(self):
|
||||
"""Tells if the TV is on."""
|
||||
self.close_remote()
|
||||
|
||||
try:
|
||||
return self._get_remote() is not None
|
||||
except (
|
||||
UnhandledResponse,
|
||||
AccessDenied,
|
||||
ConnectionFailure,
|
||||
):
|
||||
# We got a response so it's working.
|
||||
return True
|
||||
except OSError:
|
||||
# Different reasons, e.g. hostname not resolveable
|
||||
return False
|
||||
|
||||
def send_key(self, key):
|
||||
"""Send a key to the tv and handles exceptions."""
|
||||
try:
|
||||
# recreate connection if connection was dead
|
||||
retry_count = 1
|
||||
for _ in range(retry_count + 1):
|
||||
try:
|
||||
self._send_key(key)
|
||||
break
|
||||
except (
|
||||
ConnectionClosed,
|
||||
BrokenPipeError,
|
||||
WebSocketException,
|
||||
):
|
||||
# BrokenPipe can occur when the commands is sent to fast
|
||||
# WebSocketException can occur when timed out
|
||||
self._remote = None
|
||||
except (UnhandledResponse, AccessDenied):
|
||||
# We got a response so it's on.
|
||||
LOGGER.debug("Failed sending command %s", key, exc_info=True)
|
||||
except OSError:
|
||||
# Different reasons, e.g. hostname not resolveable
|
||||
pass
|
||||
|
||||
@abstractmethod
|
||||
def _send_key(self, key):
|
||||
"""Send the key."""
|
||||
|
||||
@abstractmethod
|
||||
def _get_remote(self):
|
||||
"""Get Remote object."""
|
||||
|
||||
def close_remote(self):
|
||||
"""Close remote object."""
|
||||
try:
|
||||
if self._remote is not None:
|
||||
# Close the current remote connection
|
||||
self._remote.close()
|
||||
self._remote = None
|
||||
except OSError:
|
||||
LOGGER.debug("Could not establish connection")
|
||||
|
||||
def _notify_callback(self):
|
||||
"""Notify access denied callback."""
|
||||
if self._callback:
|
||||
self._callback()
|
||||
|
||||
|
||||
class SamsungTVLegacyBridge(SamsungTVBridge):
|
||||
"""The Bridge for Legacy TVs."""
|
||||
|
||||
def __init__(self, method, host, port):
|
||||
"""Initialize Bridge."""
|
||||
super().__init__(method, host, None)
|
||||
self.config = {
|
||||
CONF_NAME: VALUE_CONF_NAME,
|
||||
CONF_ID: VALUE_CONF_ID,
|
||||
CONF_DESCRIPTION: VALUE_CONF_NAME,
|
||||
CONF_METHOD: method,
|
||||
CONF_HOST: host,
|
||||
CONF_TIMEOUT: 1,
|
||||
}
|
||||
|
||||
def try_connect(self):
|
||||
"""Try to connect to the Legacy TV."""
|
||||
config = {
|
||||
CONF_NAME: VALUE_CONF_NAME,
|
||||
CONF_DESCRIPTION: VALUE_CONF_NAME,
|
||||
CONF_ID: VALUE_CONF_ID,
|
||||
CONF_HOST: self.host,
|
||||
CONF_METHOD: self.method,
|
||||
CONF_PORT: None,
|
||||
# We need this high timeout because waiting for auth popup is just an open socket
|
||||
CONF_TIMEOUT: 31,
|
||||
}
|
||||
try:
|
||||
LOGGER.debug("Try config: %s", config)
|
||||
with Remote(config.copy()):
|
||||
LOGGER.debug("Working config: %s", config)
|
||||
return RESULT_SUCCESS
|
||||
except AccessDenied:
|
||||
LOGGER.debug("Working but denied config: %s", config)
|
||||
return RESULT_AUTH_MISSING
|
||||
except UnhandledResponse:
|
||||
LOGGER.debug("Working but unsupported config: %s", config)
|
||||
return RESULT_NOT_SUPPORTED
|
||||
except OSError as err:
|
||||
LOGGER.debug("Failing config: %s, error: %s", config, err)
|
||||
return RESULT_NOT_SUCCESSFUL
|
||||
|
||||
def _get_remote(self):
|
||||
"""Create or return a remote control instance."""
|
||||
if self._remote is None:
|
||||
# We need to create a new instance to reconnect.
|
||||
try:
|
||||
LOGGER.debug("Create SamsungRemote")
|
||||
self._remote = Remote(self.config.copy())
|
||||
# This is only happening when the auth was switched to DENY
|
||||
# A removed auth will lead to socket timeout because waiting for auth popup is just an open socket
|
||||
except AccessDenied:
|
||||
self._notify_callback()
|
||||
raise
|
||||
return self._remote
|
||||
|
||||
def _send_key(self, key):
|
||||
"""Send the key using legacy protocol."""
|
||||
self._get_remote().control(key)
|
||||
|
||||
|
||||
class SamsungTVWSBridge(SamsungTVBridge):
|
||||
"""The Bridge for WebSocket TVs."""
|
||||
|
||||
def __init__(self, method, host, port, token=None):
|
||||
"""Initialize Bridge."""
|
||||
super().__init__(method, host, port)
|
||||
self.token = token
|
||||
|
||||
def try_connect(self):
|
||||
"""Try to connect to the Websocket TV."""
|
||||
for self.port in (8001, 8002):
|
||||
config = {
|
||||
CONF_NAME: VALUE_CONF_NAME,
|
||||
CONF_HOST: self.host,
|
||||
CONF_METHOD: self.method,
|
||||
CONF_PORT: self.port,
|
||||
# We need this high timeout because waiting for auth popup is just an open socket
|
||||
CONF_TIMEOUT: 31,
|
||||
}
|
||||
|
||||
try:
|
||||
LOGGER.debug("Try config: %s", config)
|
||||
with SamsungTVWS(
|
||||
host=self.host,
|
||||
port=self.port,
|
||||
token=self.token,
|
||||
timeout=config[CONF_TIMEOUT],
|
||||
name=config[CONF_NAME],
|
||||
) as remote:
|
||||
remote.open()
|
||||
self.token = remote.token
|
||||
if self.token:
|
||||
config[CONF_TOKEN] = "*****"
|
||||
LOGGER.debug("Working config: %s", config)
|
||||
return RESULT_SUCCESS
|
||||
except WebSocketException:
|
||||
LOGGER.debug("Working but unsupported config: %s", config)
|
||||
return RESULT_NOT_SUPPORTED
|
||||
except (OSError, ConnectionFailure) as err:
|
||||
LOGGER.debug("Failing config: %s, error: %s", config, err)
|
||||
|
||||
return RESULT_NOT_SUCCESSFUL
|
||||
|
||||
def _send_key(self, key):
|
||||
"""Send the key using websocket protocol."""
|
||||
if key == "KEY_POWEROFF":
|
||||
key = "KEY_POWER"
|
||||
self._get_remote().send_key(key)
|
||||
|
||||
def _get_remote(self):
|
||||
"""Create or return a remote control instance."""
|
||||
if self._remote is None:
|
||||
# We need to create a new instance to reconnect.
|
||||
try:
|
||||
LOGGER.debug("Create SamsungTVWS")
|
||||
self._remote = SamsungTVWS(
|
||||
host=self.host,
|
||||
port=self.port,
|
||||
token=self.token,
|
||||
timeout=1,
|
||||
name=VALUE_CONF_NAME,
|
||||
)
|
||||
self._remote.open()
|
||||
# This is only happening when the auth was switched to DENY
|
||||
# A removed auth will lead to socket timeout because waiting for auth popup is just an open socket
|
||||
except ConnectionFailure:
|
||||
self._notify_callback()
|
||||
raise
|
||||
return self._remote
|
||||
@@ -2,10 +2,7 @@
|
||||
import socket
|
||||
from urllib.parse import urlparse
|
||||
|
||||
from samsungctl import Remote
|
||||
from samsungctl.exceptions import AccessDenied, UnhandledResponse
|
||||
import voluptuous as vol
|
||||
from websocket import WebSocketException
|
||||
|
||||
from homeassistant import config_entries
|
||||
from homeassistant.components.ssdp import (
|
||||
@@ -21,23 +18,25 @@ from homeassistant.const import (
|
||||
CONF_METHOD,
|
||||
CONF_NAME,
|
||||
CONF_PORT,
|
||||
CONF_TOKEN,
|
||||
)
|
||||
|
||||
# pylint:disable=unused-import
|
||||
from .const import CONF_MANUFACTURER, CONF_MODEL, DOMAIN, LOGGER
|
||||
from .bridge import SamsungTVBridge
|
||||
from .const import (
|
||||
CONF_MANUFACTURER,
|
||||
CONF_MODEL,
|
||||
DOMAIN,
|
||||
LOGGER,
|
||||
METHOD_LEGACY,
|
||||
METHOD_WEBSOCKET,
|
||||
RESULT_AUTH_MISSING,
|
||||
RESULT_NOT_SUCCESSFUL,
|
||||
RESULT_SUCCESS,
|
||||
)
|
||||
|
||||
DATA_SCHEMA = vol.Schema({vol.Required(CONF_HOST): str, vol.Required(CONF_NAME): str})
|
||||
|
||||
RESULT_AUTH_MISSING = "auth_missing"
|
||||
RESULT_SUCCESS = "success"
|
||||
RESULT_NOT_SUCCESSFUL = "not_successful"
|
||||
RESULT_NOT_SUPPORTED = "not_supported"
|
||||
|
||||
SUPPORTED_METHODS = (
|
||||
{"method": "websocket", "timeout": 1},
|
||||
# We need this high timeout because waiting for auth popup is just an open socket
|
||||
{"method": "legacy", "timeout": 31},
|
||||
)
|
||||
SUPPORTED_METHODS = [METHOD_LEGACY, METHOD_WEBSOCKET]
|
||||
|
||||
|
||||
def _get_ip(host):
|
||||
@@ -59,61 +58,39 @@ class SamsungTVConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
|
||||
self._host = None
|
||||
self._ip = None
|
||||
self._manufacturer = None
|
||||
self._method = None
|
||||
self._model = None
|
||||
self._name = None
|
||||
self._port = None
|
||||
self._title = None
|
||||
self._id = None
|
||||
self._bridge = None
|
||||
|
||||
def _get_entry(self):
|
||||
return self.async_create_entry(
|
||||
title=self._title,
|
||||
data={
|
||||
CONF_HOST: self._host,
|
||||
CONF_ID: self._id,
|
||||
CONF_IP_ADDRESS: self._ip,
|
||||
CONF_MANUFACTURER: self._manufacturer,
|
||||
CONF_METHOD: self._method,
|
||||
CONF_MODEL: self._model,
|
||||
CONF_NAME: self._name,
|
||||
CONF_PORT: self._port,
|
||||
},
|
||||
)
|
||||
data = {
|
||||
CONF_HOST: self._host,
|
||||
CONF_ID: self._id,
|
||||
CONF_IP_ADDRESS: self._ip,
|
||||
CONF_MANUFACTURER: self._manufacturer,
|
||||
CONF_METHOD: self._bridge.method,
|
||||
CONF_MODEL: self._model,
|
||||
CONF_NAME: self._name,
|
||||
CONF_PORT: self._bridge.port,
|
||||
}
|
||||
if self._bridge.token:
|
||||
data[CONF_TOKEN] = self._bridge.token
|
||||
return self.async_create_entry(title=self._title, data=data,)
|
||||
|
||||
def _try_connect(self):
|
||||
"""Try to connect and check auth."""
|
||||
for cfg in SUPPORTED_METHODS:
|
||||
config = {
|
||||
"name": "HomeAssistant",
|
||||
"description": "HomeAssistant",
|
||||
"id": "ha.component.samsung",
|
||||
"host": self._host,
|
||||
"port": self._port,
|
||||
}
|
||||
config.update(cfg)
|
||||
try:
|
||||
LOGGER.debug("Try config: %s", config)
|
||||
with Remote(config.copy()):
|
||||
LOGGER.debug("Working config: %s", config)
|
||||
self._method = cfg["method"]
|
||||
return RESULT_SUCCESS
|
||||
except AccessDenied:
|
||||
LOGGER.debug("Working but denied config: %s", config)
|
||||
return RESULT_AUTH_MISSING
|
||||
except (UnhandledResponse, WebSocketException):
|
||||
LOGGER.debug("Working but unsupported config: %s", config)
|
||||
return RESULT_NOT_SUPPORTED
|
||||
except OSError as err:
|
||||
LOGGER.debug("Failing config: %s, error: %s", config, err)
|
||||
|
||||
for method in SUPPORTED_METHODS:
|
||||
self._bridge = SamsungTVBridge.get_bridge(method, self._host)
|
||||
result = self._bridge.try_connect()
|
||||
if result != RESULT_NOT_SUCCESSFUL:
|
||||
return result
|
||||
LOGGER.debug("No working config found")
|
||||
return RESULT_NOT_SUCCESSFUL
|
||||
|
||||
async def async_step_import(self, user_input=None):
|
||||
"""Handle configuration by yaml file."""
|
||||
self._port = user_input.get(CONF_PORT)
|
||||
|
||||
return await self.async_step_user(user_input)
|
||||
|
||||
async def async_step_user(self, user_input=None):
|
||||
@@ -191,7 +168,6 @@ class SamsungTVConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
|
||||
self._manufacturer = user_input.get(CONF_MANUFACTURER)
|
||||
self._model = user_input.get(CONF_MODEL)
|
||||
self._name = user_input.get(CONF_NAME)
|
||||
self._port = user_input.get(CONF_PORT)
|
||||
self._title = self._model or self._name
|
||||
|
||||
await self.async_set_unique_id(self._ip)
|
||||
|
||||
@@ -6,6 +6,18 @@ DOMAIN = "samsungtv"
|
||||
|
||||
DEFAULT_NAME = "Samsung TV"
|
||||
|
||||
VALUE_CONF_NAME = "HomeAssistant"
|
||||
VALUE_CONF_ID = "ha.component.samsung"
|
||||
|
||||
CONF_DESCRIPTION = "description"
|
||||
CONF_MANUFACTURER = "manufacturer"
|
||||
CONF_MODEL = "model"
|
||||
CONF_ON_ACTION = "turn_on_action"
|
||||
|
||||
RESULT_AUTH_MISSING = "auth_missing"
|
||||
RESULT_SUCCESS = "success"
|
||||
RESULT_NOT_SUCCESSFUL = "not_successful"
|
||||
RESULT_NOT_SUPPORTED = "not_supported"
|
||||
|
||||
METHOD_LEGACY = "legacy"
|
||||
METHOD_WEBSOCKET = "websocket"
|
||||
@@ -3,7 +3,8 @@
|
||||
"name": "Samsung Smart TV",
|
||||
"documentation": "https://www.home-assistant.io/integrations/samsungtv",
|
||||
"requirements": [
|
||||
"samsungctl[websocket]==0.7.1"
|
||||
"samsungctl[websocket]==0.7.1",
|
||||
"samsungtvws[websocket]==1.4.0"
|
||||
],
|
||||
"ssdp": [
|
||||
{
|
||||
@@ -15,4 +16,4 @@
|
||||
"@escoand"
|
||||
],
|
||||
"config_flow": true
|
||||
}
|
||||
}
|
||||
@@ -2,9 +2,7 @@
|
||||
import asyncio
|
||||
from datetime import timedelta
|
||||
|
||||
from samsungctl import Remote as SamsungRemote, exceptions as samsung_exceptions
|
||||
import voluptuous as vol
|
||||
from websocket import WebSocketException
|
||||
|
||||
from homeassistant.components.media_player import DEVICE_CLASS_TV, MediaPlayerDevice
|
||||
from homeassistant.components.media_player.const import (
|
||||
@@ -27,6 +25,7 @@ from homeassistant.const import (
|
||||
CONF_METHOD,
|
||||
CONF_NAME,
|
||||
CONF_PORT,
|
||||
CONF_TOKEN,
|
||||
STATE_OFF,
|
||||
STATE_ON,
|
||||
)
|
||||
@@ -34,6 +33,7 @@ import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.helpers.script import Script
|
||||
from homeassistant.util import dt as dt_util
|
||||
|
||||
from .bridge import SamsungTVBridge
|
||||
from .const import CONF_MANUFACTURER, CONF_MODEL, CONF_ON_ACTION, DOMAIN, LOGGER
|
||||
|
||||
KEY_PRESS_TIMEOUT = 1.2
|
||||
@@ -90,91 +90,40 @@ class SamsungTVDevice(MediaPlayerDevice):
|
||||
# Assume that the TV is in Play mode
|
||||
self._playing = True
|
||||
self._state = None
|
||||
self._remote = None
|
||||
# Mark the end of a shutdown command (need to wait 15 seconds before
|
||||
# sending the next command to avoid turning the TV back ON).
|
||||
self._end_of_power_off = None
|
||||
# Generate a configuration for the Samsung library
|
||||
self._config = {
|
||||
"name": "HomeAssistant",
|
||||
"description": "HomeAssistant",
|
||||
"id": "ha.component.samsung",
|
||||
"method": config_entry.data[CONF_METHOD],
|
||||
"port": config_entry.data.get(CONF_PORT),
|
||||
"host": config_entry.data[CONF_HOST],
|
||||
"timeout": 1,
|
||||
}
|
||||
# Initialize bridge
|
||||
self._bridge = SamsungTVBridge.get_bridge(
|
||||
config_entry.data[CONF_METHOD],
|
||||
config_entry.data[CONF_HOST],
|
||||
config_entry.data[CONF_PORT],
|
||||
config_entry.data.get(CONF_TOKEN),
|
||||
)
|
||||
self._bridge.register_reauth_callback(self.access_denied)
|
||||
|
||||
def access_denied(self):
|
||||
"""Access denied callbck."""
|
||||
LOGGER.debug("Access denied in getting remote object")
|
||||
self.hass.add_job(
|
||||
self.hass.config_entries.flow.async_init(
|
||||
DOMAIN, context={"source": "reauth"}, data=self._config_entry.data,
|
||||
)
|
||||
)
|
||||
|
||||
def update(self):
|
||||
"""Update state of device."""
|
||||
if self._power_off_in_progress():
|
||||
self._state = STATE_OFF
|
||||
else:
|
||||
if self._remote is not None:
|
||||
# Close the current remote connection
|
||||
self._remote.close()
|
||||
self._remote = None
|
||||
|
||||
try:
|
||||
self.get_remote()
|
||||
if self._remote:
|
||||
self._state = STATE_ON
|
||||
except (
|
||||
samsung_exceptions.UnhandledResponse,
|
||||
samsung_exceptions.AccessDenied,
|
||||
):
|
||||
# We got a response so it's working.
|
||||
self._state = STATE_ON
|
||||
except (OSError, WebSocketException):
|
||||
# Different reasons, e.g. hostname not resolveable
|
||||
self._state = STATE_OFF
|
||||
|
||||
def get_remote(self):
|
||||
"""Create or return a remote control instance."""
|
||||
if self._remote is None:
|
||||
# We need to create a new instance to reconnect.
|
||||
try:
|
||||
self._remote = SamsungRemote(self._config.copy())
|
||||
# This is only happening when the auth was switched to DENY
|
||||
# A removed auth will lead to socket timeout because waiting for auth popup is just an open socket
|
||||
except samsung_exceptions.AccessDenied:
|
||||
self.hass.async_create_task(
|
||||
self.hass.config_entries.flow.async_init(
|
||||
DOMAIN,
|
||||
context={"source": "reauth"},
|
||||
data=self._config_entry.data,
|
||||
)
|
||||
)
|
||||
raise
|
||||
|
||||
return self._remote
|
||||
self._state = STATE_ON if self._bridge.is_on() else STATE_OFF
|
||||
|
||||
def send_key(self, key):
|
||||
"""Send a key to the tv and handles exceptions."""
|
||||
if self._power_off_in_progress() and key not in ("KEY_POWER", "KEY_POWEROFF"):
|
||||
if self._power_off_in_progress() and key != "KEY_POWEROFF":
|
||||
LOGGER.info("TV is powering off, not sending command: %s", key)
|
||||
return
|
||||
try:
|
||||
# recreate connection if connection was dead
|
||||
retry_count = 1
|
||||
for _ in range(retry_count + 1):
|
||||
try:
|
||||
self.get_remote().control(key)
|
||||
break
|
||||
except (
|
||||
samsung_exceptions.ConnectionClosed,
|
||||
BrokenPipeError,
|
||||
WebSocketException,
|
||||
):
|
||||
# BrokenPipe can occur when the commands is sent to fast
|
||||
# WebSocketException can occur when timed out
|
||||
self._remote = None
|
||||
except (samsung_exceptions.UnhandledResponse, samsung_exceptions.AccessDenied):
|
||||
# We got a response so it's on.
|
||||
LOGGER.debug("Failed sending command %s", key, exc_info=True)
|
||||
except OSError:
|
||||
# Different reasons, e.g. hostname not resolveable
|
||||
pass
|
||||
self._bridge.send_key(key)
|
||||
|
||||
def _power_off_in_progress(self):
|
||||
return (
|
||||
@@ -233,16 +182,9 @@ class SamsungTVDevice(MediaPlayerDevice):
|
||||
"""Turn off media player."""
|
||||
self._end_of_power_off = dt_util.utcnow() + timedelta(seconds=15)
|
||||
|
||||
if self._config["method"] == "websocket":
|
||||
self.send_key("KEY_POWER")
|
||||
else:
|
||||
self.send_key("KEY_POWEROFF")
|
||||
self.send_key("KEY_POWEROFF")
|
||||
# Force closing of remote session to provide instant UI feedback
|
||||
try:
|
||||
self.get_remote().close()
|
||||
self._remote = None
|
||||
except OSError:
|
||||
LOGGER.debug("Could not establish connection.")
|
||||
self._bridge.close_remote()
|
||||
|
||||
def volume_up(self):
|
||||
"""Volume up the media player."""
|
||||
|
||||
Reference in new issue
Block a user