sudoxreboot/fin-assistant
1
0
Fork 0
mirror of https://github.com/sudoxnym/fin-assistant.git synced 2026-04-14 19:46:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restore Jellyfin config flow handler and support older entry helpers

Browse source
This commit is contained in:
sudoxnym 2025-09-15 00:04:29 -06:00
parent 62db27d35b
commit 179d0ed206
4 changed files with 58 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
custom_components/jellyfin/__init__.py
View file

@ -194,9 +194,14 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry):
for platform in PLATFORMS: for platform in PLATFORMS:
hass.data[DOMAIN][config.get(CONF_URL)][platform] = {} hass.data[DOMAIN][config.get(CONF_URL)][platform] = {}
hass.data[DOMAIN][config.get(CONF_URL)][platform]["entities"] = [] hass.data[DOMAIN][config.get(CONF_URL)][platform]["entities"] = []
hass.async_create_task(
hass.config_entries.async_forward_entry_setup(config_entry, platform) if hasattr(hass.config_entries, "async_forward_entry_setups"):
) await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
else:
for platform in PLATFORMS:
hass.async_create_task(
hass.config_entries.async_forward_entry_setup(config_entry, platform)
)
async_dispatcher_send(hass, SIGNAL_STATE_UPDATED) async_dispatcher_send(hass, SIGNAL_STATE_UPDATED)
@ -211,14 +216,16 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry):
async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry): async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry):
_LOGGER.info("Unloading jellyfin") _LOGGER.info("Unloading jellyfin")
unload_ok = all( if hasattr(hass.config_entries, "async_unload_platforms"):
await asyncio.gather( unload_ok = await hass.config_entries.async_unload_platforms(
*[ config_entry, PLATFORMS
hass.config_entries.async_forward_entry_unload(config_entry, component)
for component in PLATFORMS
]
) )
) else:
unload_ok = True
for platform in PLATFORMS:
unload_ok = unload_ok and await hass.config_entries.async_forward_entry_unload(
config_entry, platform
)
_jelly: JellyfinClientManager = hass.data[DOMAIN][config_entry.data.get(CONF_URL)]["manager"] _jelly: JellyfinClientManager = hass.data[DOMAIN][config_entry.data.get(CONF_URL)]["manager"]
await _jelly.stop() await _jelly.stop()

3
custom_components/jellyfin/config_flow.py
View file

@ -7,7 +7,7 @@ import voluptuous as vol
from homeassistant import config_entries, exceptions from homeassistant import config_entries, exceptions
from homeassistant.core import callback from homeassistant.core import callback
from homeassistant.const import ( # pylint: disable=import-error from homeassistant.const import ( # pylint: disable=import-error
CONF_URL, CONF_URL,
CONF_VERIFY_SSL, CONF_VERIFY_SSL,
CONF_USERNAME, CONF_USERNAME,
@ -47,6 +47,7 @@ class JellyfinFlowHandler(config_entries.ConfigFlow):
self._url = None self._url = None
self._ssl = DEFAULT_SSL self._ssl = DEFAULT_SSL
self._verify_ssl = DEFAULT_VERIFY_SSL self._verify_ssl = DEFAULT_VERIFY_SSL
self._is_import = False
async def async_step_import(self, user_input=None): async def async_step_import(self, user_input=None):
"""Handle configuration by yaml file.""" """Handle configuration by yaml file."""

15
custom_components/jellyfin/media_player.py
View file

@ -4,10 +4,7 @@ from typing import Mapping, MutableMapping, Optional, Sequence, Iterable, List,
from homeassistant.components.media_player import PLATFORM_SCHEMA, MediaPlayerEntity from homeassistant.components.media_player import PLATFORM_SCHEMA, MediaPlayerEntity
from homeassistant.components.media_player.const import ( from homeassistant.components.media_player.const import (
MEDIA_TYPE_CHANNEL, MediaType,
MEDIA_TYPE_MOVIE,
MEDIA_TYPE_MUSIC,
MEDIA_TYPE_TVSHOW,
SUPPORT_PLAY_MEDIA, SUPPORT_PLAY_MEDIA,
SUPPORT_NEXT_TRACK, SUPPORT_NEXT_TRACK,
SUPPORT_PAUSE, SUPPORT_PAUSE,
@ -230,19 +227,19 @@ class JellyfinMediaPlayer(MediaPlayerEntity):
"""Content type of current playing media.""" """Content type of current playing media."""
media_type = self.device.media_type media_type = self.device.media_type
if media_type == "Episode": if media_type == "Episode":
return MEDIA_TYPE_TVSHOW return MediaType.TVSHOW
if media_type == "Movie": if media_type == "Movie":
return MEDIA_TYPE_MOVIE return MediaType.MOVIE
if media_type == "Trailer": if media_type == "Trailer":
return MEDIA_TYPE_TRAILER return MEDIA_TYPE_TRAILER
if media_type == "Music": if media_type == "Music":
return MEDIA_TYPE_MUSIC return MediaType.MUSIC
if media_type == "Video": if media_type == "Video":
return MEDIA_TYPE_GENERIC_VIDEO return MEDIA_TYPE_GENERIC_VIDEO
if media_type == "Audio": if media_type == "Audio":
return MEDIA_TYPE_MUSIC return MediaType.MUSIC
if media_type == "TvChannel": if media_type == "TvChannel":
return MEDIA_TYPE_CHANNEL return MediaType.CHANNEL
return None return None
@property @property

74
custom_components/jellyfin/media_source.py
View file

@ -19,6 +19,7 @@ from homeassistant.const import ( # pylint: disable=import-error
CONF_URL, CONF_URL,
) )
from homeassistant.components.media_player.const import ( from homeassistant.components.media_player.const import (
MediaType,
MEDIA_CLASS_ALBUM, MEDIA_CLASS_ALBUM,
MEDIA_CLASS_ARTIST, MEDIA_CLASS_ARTIST,
MEDIA_CLASS_CHANNEL, MEDIA_CLASS_CHANNEL,
@ -30,15 +31,6 @@ from homeassistant.components.media_player.const import (
MEDIA_CLASS_SEASON, MEDIA_CLASS_SEASON,
MEDIA_CLASS_TRACK, MEDIA_CLASS_TRACK,
MEDIA_CLASS_TV_SHOW, MEDIA_CLASS_TV_SHOW,
MEDIA_TYPE_ALBUM,
MEDIA_TYPE_ARTIST,
MEDIA_TYPE_CHANNEL,
MEDIA_TYPE_EPISODE,
MEDIA_TYPE_MOVIE,
MEDIA_TYPE_PLAYLIST,
MEDIA_TYPE_SEASON,
MEDIA_TYPE_TRACK,
MEDIA_TYPE_TVSHOW,
) )
from . import JellyfinClientManager, JellyfinDevice, autolog from . import JellyfinClientManager, JellyfinDevice, autolog
@ -49,29 +41,29 @@ from .const import (
) )
PLAYABLE_MEDIA_TYPES = [ PLAYABLE_MEDIA_TYPES = [
MEDIA_TYPE_ALBUM, MediaType.ALBUM,
MEDIA_TYPE_ARTIST, MediaType.ARTIST,
MEDIA_TYPE_TRACK, MediaType.TRACK,
] ]
CONTAINER_TYPES_SPECIFIC_MEDIA_CLASS = { CONTAINER_TYPES_SPECIFIC_MEDIA_CLASS = {
MEDIA_TYPE_ALBUM: MEDIA_CLASS_ALBUM, MediaType.ALBUM: MEDIA_CLASS_ALBUM,
MEDIA_TYPE_ARTIST: MEDIA_CLASS_ARTIST, MediaType.ARTIST: MEDIA_CLASS_ARTIST,
MEDIA_TYPE_PLAYLIST: MEDIA_CLASS_PLAYLIST, MediaType.PLAYLIST: MEDIA_CLASS_PLAYLIST,
MEDIA_TYPE_SEASON: MEDIA_CLASS_SEASON, MediaType.SEASON: MEDIA_CLASS_SEASON,
MEDIA_TYPE_TVSHOW: MEDIA_CLASS_TV_SHOW, MediaType.TVSHOW: MEDIA_CLASS_TV_SHOW,
} }
CHILD_TYPE_MEDIA_CLASS = { CHILD_TYPE_MEDIA_CLASS = {
MEDIA_TYPE_SEASON: MEDIA_CLASS_SEASON, MediaType.SEASON: MEDIA_CLASS_SEASON,
MEDIA_TYPE_ALBUM: MEDIA_CLASS_ALBUM, MediaType.ALBUM: MEDIA_CLASS_ALBUM,
MEDIA_TYPE_ARTIST: MEDIA_CLASS_ARTIST, MediaType.ARTIST: MEDIA_CLASS_ARTIST,
MEDIA_TYPE_MOVIE: MEDIA_CLASS_MOVIE, MediaType.MOVIE: MEDIA_CLASS_MOVIE,
MEDIA_TYPE_PLAYLIST: MEDIA_CLASS_PLAYLIST, MediaType.PLAYLIST: MEDIA_CLASS_PLAYLIST,
MEDIA_TYPE_TRACK: MEDIA_CLASS_TRACK, MediaType.TRACK: MEDIA_CLASS_TRACK,
MEDIA_TYPE_TVSHOW: MEDIA_CLASS_TV_SHOW, MediaType.TVSHOW: MEDIA_CLASS_TV_SHOW,
MEDIA_TYPE_CHANNEL: MEDIA_CLASS_CHANNEL, MediaType.CHANNEL: MEDIA_CLASS_CHANNEL,
MEDIA_TYPE_EPISODE: MEDIA_CLASS_EPISODE, MediaType.EPISODE: MEDIA_CLASS_EPISODE,
} }
IDENTIFIER_SPLIT = "~~" IDENTIFIER_SPLIT = "~~"
@ -140,30 +132,30 @@ def async_parse_identifier(
def Type2Mediatype(type): def Type2Mediatype(type):
switcher = { switcher = {
"Movie": MEDIA_TYPE_MOVIE, "Movie": MediaType.MOVIE,
"Series": MEDIA_TYPE_TVSHOW, "Series": MediaType.TVSHOW,
"Season": MEDIA_TYPE_SEASON, "Season": MediaType.SEASON,
"Episode": MEDIA_TYPE_EPISODE, "Episode": MediaType.EPISODE,
"Music": MEDIA_TYPE_ALBUM, "Music": MediaType.ALBUM,
"Audio": MEDIA_TYPE_TRACK, "Audio": MediaType.TRACK,
"BoxSet": MEDIA_CLASS_DIRECTORY, "BoxSet": MEDIA_CLASS_DIRECTORY,
"Folder": MEDIA_CLASS_DIRECTORY, "Folder": MEDIA_CLASS_DIRECTORY,
"CollectionFolder": MEDIA_CLASS_DIRECTORY, "CollectionFolder": MEDIA_CLASS_DIRECTORY,
"Playlist": MEDIA_CLASS_DIRECTORY, "Playlist": MEDIA_CLASS_DIRECTORY,
"PlaylistsFolder": MEDIA_CLASS_DIRECTORY, "PlaylistsFolder": MEDIA_CLASS_DIRECTORY,
"ManualPlaylistsFolder": MEDIA_CLASS_DIRECTORY, "ManualPlaylistsFolder": MEDIA_CLASS_DIRECTORY,
"MusicArtist": MEDIA_TYPE_ARTIST, "MusicArtist": MediaType.ARTIST,
"MusicAlbum": MEDIA_TYPE_ALBUM, "MusicAlbum": MediaType.ALBUM,
} }
return switcher[type] return switcher[type]
def Type2Mimetype(type): def Type2Mimetype(type):
switcher = { switcher = {
"Movie": "video/mp4", "Movie": "video/mp4",
"Series": MEDIA_TYPE_TVSHOW, "Series": MediaType.TVSHOW,
"Season": MEDIA_TYPE_SEASON, "Season": MediaType.SEASON,
"Episode": "video/mp4", "Episode": "video/mp4",
"Music": MEDIA_TYPE_ALBUM, "Music": MediaType.ALBUM,
"Audio": "audio/mp3", "Audio": "audio/mp3",
"BoxSet": MEDIA_CLASS_DIRECTORY, "BoxSet": MEDIA_CLASS_DIRECTORY,
"Folder": MEDIA_CLASS_DIRECTORY, "Folder": MEDIA_CLASS_DIRECTORY,
@ -171,8 +163,8 @@ def Type2Mimetype(type):
"Playlist": MEDIA_CLASS_DIRECTORY, "Playlist": MEDIA_CLASS_DIRECTORY,
"PlaylistsFolder": MEDIA_CLASS_DIRECTORY, "PlaylistsFolder": MEDIA_CLASS_DIRECTORY,
"ManualPlaylistsFolder": MEDIA_CLASS_DIRECTORY, "ManualPlaylistsFolder": MEDIA_CLASS_DIRECTORY,
"MusicArtist": MEDIA_TYPE_ARTIST, "MusicArtist": MediaType.ARTIST,
"MusicAlbum": MEDIA_TYPE_ALBUM, "MusicAlbum": MediaType.ALBUM,
} }
return switcher[type] return switcher[type]
@ -247,7 +239,7 @@ async def async_library_items(jelly_cm: JellyfinClientManager,
can_expand=True, can_expand=True,
children=[], children=[],
) )
elif media_content_type in [MEDIA_CLASS_DIRECTORY, MEDIA_TYPE_ARTIST, MEDIA_TYPE_ALBUM, MEDIA_TYPE_PLAYLIST, MEDIA_TYPE_TVSHOW, MEDIA_TYPE_SEASON]: elif media_content_type in [MEDIA_CLASS_DIRECTORY, MediaType.ARTIST, MediaType.ALBUM, MediaType.PLAYLIST, MediaType.TVSHOW, MediaType.SEASON]:
query = { query = {
"ParentId": media_content_id, "ParentId": media_content_id,
"sortBy": "SortName", "sortBy": "SortName",
@ -285,7 +277,7 @@ async def async_library_items(jelly_cm: JellyfinClientManager,
items = await jelly_cm.get_items(query) items = await jelly_cm.get_items(query)
for item in items: for item in items:
if media_content_type in [None, "library", MEDIA_CLASS_DIRECTORY, MEDIA_TYPE_ARTIST, MEDIA_TYPE_ALBUM, MEDIA_TYPE_PLAYLIST, MEDIA_TYPE_TVSHOW, MEDIA_TYPE_SEASON]: if media_content_type in [None, "library", MEDIA_CLASS_DIRECTORY, MediaType.ARTIST, MediaType.ALBUM, MediaType.PLAYLIST, MediaType.TVSHOW, MediaType.SEASON]:
if item["IsFolder"]: if item["IsFolder"]:
library_info.children_media_class = MEDIA_CLASS_DIRECTORY library_info.children_media_class = MEDIA_CLASS_DIRECTORY
library_info.children.append(BrowseMediaSource( library_info.children.append(BrowseMediaSource(