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

Revert "Support selecting http vs https protocols for qvrpro (#38951)" (#39385)

Browse Source 
This reverts commit 526c418e1e060120c16e75ab3d3d7c3cad7eb33f.
This commit is contained in:
Franck Nijhof 2020-08-30 00:45:54 +02:00 committed by GitHub
parent 79252c06b2
commit 800cf6c8c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
homeassistant/components/qvr_pro/__init__.py
View File

@ -8,13 +8,7 @@ from requests.exceptions import ConnectionError as RequestsConnectionError
import voluptuous as vol import voluptuous as vol
from homeassistant.components.camera import DOMAIN as CAMERA_DOMAIN from homeassistant.components.camera import DOMAIN as CAMERA_DOMAIN
from homeassistant.const import ( from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME
CONF_HOST,
CONF_PASSWORD,
CONF_PORT,
CONF_PROTOCOL,
CONF_USERNAME,
)
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.discovery import load_platform from homeassistant.helpers.discovery import load_platform
@ -26,7 +20,6 @@ from .const import (
) )
DEFAULT_PORT = 8080 DEFAULT_PORT = 8080
DEFAULT_PROTOCOL = "http"
SERVICE_CHANNEL_GUID = "guid" SERVICE_CHANNEL_GUID = "guid"
@ -40,9 +33,6 @@ CONFIG_SCHEMA = vol.Schema(
vol.Required(CONF_USERNAME): cv.string, vol.Required(CONF_USERNAME): cv.string,
vol.Required(CONF_PASSWORD): cv.string, vol.Required(CONF_PASSWORD): cv.string,
vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port, vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
vol.Optional(CONF_PROTOCOL, default=DEFAULT_PROTOCOL): vol.All(
cv.string, vol.In(["http", "https"])
),
vol.Optional(CONF_EXCLUDE_CHANNELS, default=[]): vol.All( vol.Optional(CONF_EXCLUDE_CHANNELS, default=[]): vol.All(
cv.ensure_list_csv, [cv.positive_int] cv.ensure_list_csv, [cv.positive_int]
), ),
@ -64,11 +54,10 @@ def setup(hass, config):
password = conf[CONF_PASSWORD] password = conf[CONF_PASSWORD]
host = conf[CONF_HOST] host = conf[CONF_HOST]
port = conf[CONF_PORT] port = conf[CONF_PORT]
protocol = conf[CONF_PROTOCOL]
excluded_channels = conf[CONF_EXCLUDE_CHANNELS] excluded_channels = conf[CONF_EXCLUDE_CHANNELS]
try: try:
qvrpro = Client(user, password, host, protocol=protocol, port=port) qvrpro = Client(user, password, host, port=port)
channel_resp = qvrpro.get_channel_list() channel_resp = qvrpro.get_channel_list()