From 79713d637a11cd02572b9cec940925283f04f274 Mon Sep 17 00:00:00 2001
From: uvjustin <46082645+uvjustin@users.noreply.github.com>
Date: Wed, 28 Sep 2022 19:46:27 -0700
Subject: [PATCH] Use Owntone name for forked-daapd (#79214)
Co-authored-by: Paulus Schoutsen <balloob@gmail.com>
---
homeassistant/components/forked_daapd/const.py | 2 +-
.../components/forked_daapd/manifest.json | 2 +-
homeassistant/components/forked_daapd/strings.json | 14 +++++++-------
homeassistant/generated/integrations.json | 2 +-
tests/components/forked_daapd/test_browse_media.py | 2 +-
tests/components/forked_daapd/test_media_player.py | 9 ++++-----
6 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/homeassistant/components/forked_daapd/const.py b/homeassistant/components/forked_daapd/const.py
index 60e31bc707d..f74fe0b049d 100644
--- a/homeassistant/components/forked_daapd/const.py
+++ b/homeassistant/components/forked_daapd/const.py
@@ -30,7 +30,7 @@ DEFAULT_TTS_PAUSE_TIME = 1.2
DEFAULT_TTS_VOLUME = 0.8
DEFAULT_UNMUTE_VOLUME = 0.6
DOMAIN = "forked_daapd" # key for hass.data
-FD_NAME = "forked-daapd"
+FD_NAME = "Owntone"
HASS_DATA_REMOVE_LISTENERS_KEY = "REMOVE_LISTENERS"
HASS_DATA_UPDATER_KEY = "UPDATER"
KNOWN_PIPES = {"librespot-java"}
diff --git a/homeassistant/components/forked_daapd/manifest.json b/homeassistant/components/forked_daapd/manifest.json
index 14d2132a165..8cd2822156f 100644
--- a/homeassistant/components/forked_daapd/manifest.json
+++ b/homeassistant/components/forked_daapd/manifest.json
@@ -1,6 +1,6 @@
{
"domain": "forked_daapd",
- "name": "forked-daapd",
+ "name": "Owntone",
"documentation": "https://www.home-assistant.io/integrations/forked_daapd",
"codeowners": ["@uvjustin"],
"requirements": ["pyforked-daapd==0.1.11", "pylibrespot-java==0.1.0"],
diff --git a/homeassistant/components/forked_daapd/strings.json b/homeassistant/components/forked_daapd/strings.json
index 671538210ff..76a03abeb4b 100644
--- a/homeassistant/components/forked_daapd/strings.json
+++ b/homeassistant/components/forked_daapd/strings.json
@@ -3,7 +3,7 @@
"flow_title": "{name} ({host})",
"step": {
"user": {
- "title": "Set up forked-daapd device",
+ "title": "Set up Owntone device",
"data": {
"name": "Friendly name",
"host": "[%key:common::config_flow::data::host%]",
@@ -13,23 +13,23 @@
}
},
"error": {
- "forbidden": "Unable to connect. Please check your forked-daapd network permissions.",
- "websocket_not_enabled": "forked-daapd server websocket not enabled.",
+ "forbidden": "Unable to connect. Please check your Owntone network permissions.",
+ "websocket_not_enabled": "Owntone server websocket not enabled.",
"wrong_host_or_port": "Unable to connect. Please check host and port.",
"wrong_password": "Incorrect password.",
- "wrong_server_type": "The forked-daapd integration requires a forked-daapd server with version >= 27.0.",
+ "wrong_server_type": "The Owntone integration requires an Owntone server with version >= 27.0.",
"unknown_error": "[%key:common::config_flow::error::unknown%]"
},
"abort": {
"already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
- "not_forked_daapd": "Device is not a forked-daapd server."
+ "not_forked_daapd": "Device is not an Owntone server."
}
},
"options": {
"step": {
"init": {
- "title": "Configure forked-daapd options",
- "description": "Set various options for the forked-daapd integration.",
+ "title": "Configure Owntone options",
+ "description": "Set various options for the Owntone integration.",
"data": {
"librespot_java_port": "Port for librespot-java pipe control (if used)",
"max_playlists": "Max number of playlists used as sources",
diff --git a/homeassistant/generated/integrations.json b/homeassistant/generated/integrations.json
index 3e056276c16..8943f00be34 100644
--- a/homeassistant/generated/integrations.json
+++ b/homeassistant/generated/integrations.json
@@ -1411,7 +1411,7 @@
"forked_daapd": {
"config_flow": true,
"iot_class": "local_push",
- "name": "forked-daapd"
+ "name": "Owntone"
},
"fortios": {
"config_flow": false,
diff --git a/tests/components/forked_daapd/test_browse_media.py b/tests/components/forked_daapd/test_browse_media.py
index bedb541b803..23fc9fcf6eb 100644
--- a/tests/components/forked_daapd/test_browse_media.py
+++ b/tests/components/forked_daapd/test_browse_media.py
@@ -12,7 +12,7 @@ from homeassistant.components.spotify.const import (
from homeassistant.components.websocket_api.const import TYPE_RESULT
from homeassistant.setup import async_setup_component
-TEST_MASTER_ENTITY_NAME = "media_player.forked_daapd_server"
+TEST_MASTER_ENTITY_NAME = "media_player.owntone_server"
async def test_async_browse_media(hass, hass_ws_client, config_entry):
diff --git a/tests/components/forked_daapd/test_media_player.py b/tests/components/forked_daapd/test_media_player.py
index 589f176db14..ae5e29bee47 100644
--- a/tests/components/forked_daapd/test_media_player.py
+++ b/tests/components/forked_daapd/test_media_player.py
@@ -66,10 +66,9 @@ from homeassistant.const import (
from tests.common import async_mock_signal
-TEST_MASTER_ENTITY_NAME = "media_player.forked_daapd_server"
+TEST_MASTER_ENTITY_NAME = "media_player.owntone_server"
TEST_ZONE_ENTITY_NAMES = [
- "media_player.forked_daapd_output_" + x
- for x in ("kitchen", "computer", "daapd_fifo")
+ "media_player.owntone_output_" + x for x in ("kitchen", "computer", "daapd_fifo")
]
OPTIONS_DATA = {
@@ -354,7 +353,7 @@ def test_master_state(hass, mock_api_object):
"""Test master state attributes."""
state = hass.states.get(TEST_MASTER_ENTITY_NAME)
assert state.state == STATE_PAUSED
- assert state.attributes[ATTR_FRIENDLY_NAME] == "forked-daapd server"
+ assert state.attributes[ATTR_FRIENDLY_NAME] == "Owntone server"
assert state.attributes[ATTR_SUPPORTED_FEATURES] == SUPPORTED_FEATURES
assert not state.attributes[ATTR_MEDIA_VOLUME_MUTED]
assert state.attributes[ATTR_MEDIA_VOLUME_LEVEL] == 0.2
@@ -413,7 +412,7 @@ async def test_zone(hass, mock_api_object):
"""Test zone attributes and methods."""
zone_entity_name = TEST_ZONE_ENTITY_NAMES[0]
state = hass.states.get(zone_entity_name)
- assert state.attributes[ATTR_FRIENDLY_NAME] == "forked-daapd output (kitchen)"
+ assert state.attributes[ATTR_FRIENDLY_NAME] == "Owntone output (kitchen)"
assert state.attributes[ATTR_SUPPORTED_FEATURES] == SUPPORTED_FEATURES_ZONE
assert state.state == STATE_ON
assert state.attributes[ATTR_MEDIA_VOLUME_LEVEL] == 0.5
--
GitLab