Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mirrored_repos
HomeAssistant
Core
Commits
3d64cf73
Unverified
Commit
3d64cf73
authored
2 years ago
by
uvjustin
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix basic browse_media support in forked-daapd (#77595)
parent
f9a3757d
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
homeassistant/components/forked_daapd/const.py
+11
-0
11 additions, 0 deletions
homeassistant/components/forked_daapd/const.py
homeassistant/components/forked_daapd/media_player.py
+16
-9
16 additions, 9 deletions
homeassistant/components/forked_daapd/media_player.py
with
27 additions
and
9 deletions
homeassistant/components/forked_daapd/const.py
+
11
−
0
View file @
3d64cf73
"""
Const for forked-daapd.
"""
"""
Const for forked-daapd.
"""
from
homeassistant.components.media_player
import
MediaPlayerEntityFeature
from
homeassistant.components.media_player
import
MediaPlayerEntityFeature
CAN_PLAY_TYPE
=
{
"
audio/mp4
"
,
"
audio/aac
"
,
"
audio/mpeg
"
,
"
audio/flac
"
,
"
audio/ogg
"
,
"
audio/x-ms-wma
"
,
"
audio/aiff
"
,
"
audio/wav
"
,
}
CALLBACK_TIMEOUT
=
8
# max time between command and callback from forked-daapd server
CALLBACK_TIMEOUT
=
8
# max time between command and callback from forked-daapd server
CONF_LIBRESPOT_JAVA_PORT
=
"
librespot_java_port
"
CONF_LIBRESPOT_JAVA_PORT
=
"
librespot_java_port
"
CONF_MAX_PLAYLISTS
=
"
max_playlists
"
CONF_MAX_PLAYLISTS
=
"
max_playlists
"
...
...
This diff is collapsed.
Click to expand it.
homeassistant/components/forked_daapd/media_player.py
+
16
−
9
View file @
3d64cf73
"""
This library brings support for forked_daapd to Home Assistant.
"""
"""
This library brings support for forked_daapd to Home Assistant.
"""
from
__future__
import
annotations
import
asyncio
import
asyncio
from
collections
import
defaultdict
from
collections
import
defaultdict
import
logging
import
logging
...
@@ -8,7 +10,7 @@ from pyforked_daapd import ForkedDaapdAPI
...
@@ -8,7 +10,7 @@ from pyforked_daapd import ForkedDaapdAPI
from
pylibrespot_java
import
LibrespotJavaAPI
from
pylibrespot_java
import
LibrespotJavaAPI
from
homeassistant.components
import
media_source
from
homeassistant.components
import
media_source
from
homeassistant.components.media_player
import
MediaPlayerEntity
from
homeassistant.components.media_player
import
BrowseMedia
,
MediaPlayerEntity
from
homeassistant.components.media_player.browse_media
import
(
from
homeassistant.components.media_player.browse_media
import
(
async_process_play_media_url
,
async_process_play_media_url
,
)
)
...
@@ -35,6 +37,7 @@ from homeassistant.util.dt import utcnow
...
@@ -35,6 +37,7 @@ from homeassistant.util.dt import utcnow
from
.const
import
(
from
.const
import
(
CALLBACK_TIMEOUT
,
CALLBACK_TIMEOUT
,
CAN_PLAY_TYPE
,
CONF_LIBRESPOT_JAVA_PORT
,
CONF_LIBRESPOT_JAVA_PORT
,
CONF_MAX_PLAYLISTS
,
CONF_MAX_PLAYLISTS
,
CONF_TTS_PAUSE_TIME
,
CONF_TTS_PAUSE_TIME
,
...
@@ -769,6 +772,18 @@ class ForkedDaapdMaster(MediaPlayerEntity):
...
@@ -769,6 +772,18 @@ class ForkedDaapdMaster(MediaPlayerEntity):
)()
)()
_LOGGER
.
warning
(
"
No pipe control available for %s
"
,
pipe_name
)
_LOGGER
.
warning
(
"
No pipe control available for %s
"
,
pipe_name
)
async
def
async_browse_media
(
self
,
media_content_type
:
str
|
None
=
None
,
media_content_id
:
str
|
None
=
None
,
)
->
BrowseMedia
:
"""
Implement the websocket media browsing helper.
"""
return
await
media_source
.
async_browse_media
(
self
.
hass
,
media_content_id
,
content_filter
=
lambda
bm
:
bm
.
media_content_type
in
CAN_PLAY_TYPE
,
)
class
ForkedDaapdUpdater
:
class
ForkedDaapdUpdater
:
"""
Manage updates for the forked-daapd device.
"""
"""
Manage updates for the forked-daapd device.
"""
...
@@ -885,11 +900,3 @@ class ForkedDaapdUpdater:
...
@@ -885,11 +900,3 @@ class ForkedDaapdUpdater:
self
.
_api
,
self
.
_api
,
outputs_to_add
,
outputs_to_add
,
)
)
async
def
async_browse_media
(
self
,
media_content_type
=
None
,
media_content_id
=
None
):
"""
Implement the websocket media browsing helper.
"""
return
await
media_source
.
async_browse_media
(
self
.
hass
,
media_content_id
,
content_filter
=
lambda
item
:
item
.
media_content_type
.
startswith
(
"
audio/
"
),
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment