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

Remove redundant CONF_PATH from sabnzbd config flow (#85214)

Browse Source 
remove redundant CONF_PATH from sabnzbd config flow
This commit is contained in:
Shai Ungar 2023-01-06 01:53:30 +02:00 committed by GitHub
parent 21fbe07218
commit f61d605d6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/sabnzbd/__init__.py
View File

@ -12,7 +12,6 @@ from homeassistant.const import (
CONF_API_KEY, CONF_API_KEY,
CONF_HOST, CONF_HOST,
CONF_NAME, CONF_NAME,
CONF_PATH,
CONF_PORT, CONF_PORT,
CONF_SENSORS, CONF_SENSORS,
CONF_SSL, CONF_SSL,
@ -80,7 +79,6 @@ CONFIG_SCHEMA = vol.Schema(
{ {
vol.Required(CONF_API_KEY): str, vol.Required(CONF_API_KEY): str,
vol.Optional(CONF_NAME, default=DEFAULT_NAME): str, vol.Optional(CONF_NAME, default=DEFAULT_NAME): str,
vol.Optional(CONF_PATH): str,
vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string, vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port, vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
vol.Optional(CONF_SENSORS): vol.All( vol.Optional(CONF_SENSORS): vol.All(

2
homeassistant/components/sabnzbd/config_flow.py
View File

@ -11,7 +11,6 @@ from homeassistant.const import (
CONF_API_KEY, CONF_API_KEY,
CONF_HOST, CONF_HOST,
CONF_NAME, CONF_NAME,
CONF_PATH,
CONF_PORT, CONF_PORT,
CONF_SSL, CONF_SSL,
CONF_URL, CONF_URL,
@ -28,7 +27,6 @@ USER_SCHEMA = vol.Schema(
vol.Required(CONF_API_KEY): str, vol.Required(CONF_API_KEY): str,
vol.Optional(CONF_NAME, default=DEFAULT_NAME): str, vol.Optional(CONF_NAME, default=DEFAULT_NAME): str,
vol.Required(CONF_URL): str, vol.Required(CONF_URL): str,
vol.Optional(CONF_PATH): str,
} }
) )

4
homeassistant/components/sabnzbd/sab.py
View File

@ -1,21 +1,19 @@
"""Support for the Sabnzbd service.""" """Support for the Sabnzbd service."""
from pysabnzbd import SabnzbdApi, SabnzbdApiException from pysabnzbd import SabnzbdApi, SabnzbdApiException
from homeassistant.const import CONF_API_KEY, CONF_PATH, CONF_URL from homeassistant.const import CONF_API_KEY, CONF_URL
from homeassistant.core import _LOGGER, HomeAssistant from homeassistant.core import _LOGGER, HomeAssistant
from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.aiohttp_client import async_get_clientsession
async def get_client(hass: HomeAssistant, data): async def get_client(hass: HomeAssistant, data):
"""Get Sabnzbd client.""" """Get Sabnzbd client."""
web_root = data.get(CONF_PATH)
api_key = data[CONF_API_KEY] api_key = data[CONF_API_KEY]
url = data[CONF_URL] url = data[CONF_URL]
sab_api = SabnzbdApi( sab_api = SabnzbdApi(
url, url,
api_key, api_key,
web_root=web_root,
session=async_get_clientsession(hass, False), session=async_get_clientsession(hass, False),
) )
try: try:

3
homeassistant/components/sabnzbd/strings.json
View File

@ -5,8 +5,7 @@
"data": { "data": {
"api_key": "[%key:common::config_flow::data::api_key%]", "api_key": "[%key:common::config_flow::data::api_key%]",
"name": "[%key:common::config_flow::data::name%]", "name": "[%key:common::config_flow::data::name%]",
"url": "[%key:common::config_flow::data::url%]", "url": "[%key:common::config_flow::data::url%]"
"path": "[%key:common::config_flow::data::path%]"
} }
} }
}, },

5
tests/components/sabnzbd/test_config_flow.py
View File

@ -10,7 +10,6 @@ from homeassistant.const import (
CONF_API_KEY, CONF_API_KEY,
CONF_HOST, CONF_HOST,
CONF_NAME, CONF_NAME,
CONF_PATH,
CONF_PORT, CONF_PORT,
CONF_SSL, CONF_SSL,
CONF_URL, CONF_URL,
@ -21,7 +20,6 @@ VALID_CONFIG = {
CONF_NAME: "Sabnzbd", CONF_NAME: "Sabnzbd",
CONF_API_KEY: "edc3eee7330e4fdda04489e3fbc283d0", CONF_API_KEY: "edc3eee7330e4fdda04489e3fbc283d0",
CONF_URL: "http://localhost:8080", CONF_URL: "http://localhost:8080",
CONF_PATH: "",
} }
VALID_CONFIG_OLD = { VALID_CONFIG_OLD = {
@ -29,7 +27,6 @@ VALID_CONFIG_OLD = {
CONF_API_KEY: "edc3eee7330e4fdda04489e3fbc283d0", CONF_API_KEY: "edc3eee7330e4fdda04489e3fbc283d0",
CONF_HOST: "localhost", CONF_HOST: "localhost",
CONF_PORT: 8080, CONF_PORT: 8080,
CONF_PATH: "",
CONF_SSL: False, CONF_SSL: False,
} }
@ -60,7 +57,6 @@ async def test_create_entry(hass):
assert result2["data"] == { assert result2["data"] == {
CONF_API_KEY: "edc3eee7330e4fdda04489e3fbc283d0", CONF_API_KEY: "edc3eee7330e4fdda04489e3fbc283d0",
CONF_NAME: "Sabnzbd", CONF_NAME: "Sabnzbd",
CONF_PATH: "",
CONF_URL: "http://localhost:8080", CONF_URL: "http://localhost:8080",
} }
assert len(mock_setup_entry.mock_calls) == 1 assert len(mock_setup_entry.mock_calls) == 1
@ -99,5 +95,4 @@ async def test_import_flow(hass) -> None:
assert result["data"][CONF_API_KEY] == "edc3eee7330e4fdda04489e3fbc283d0" assert result["data"][CONF_API_KEY] == "edc3eee7330e4fdda04489e3fbc283d0"
assert result["data"][CONF_HOST] == "localhost" assert result["data"][CONF_HOST] == "localhost"
assert result["data"][CONF_PORT] == 8080 assert result["data"][CONF_PORT] == 8080
assert result["data"][CONF_PATH] == ""
assert result["data"][CONF_SSL] is False assert result["data"][CONF_SSL] is False