Skip to content

Subsonic: Use loudness tags when present #2580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
+37 −8
Open

Subsonic: Use loudness tags when present #2580

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 37 additions & 8 deletions music_assistant/providers/opensubsonic/sonic_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
from libopensonic.media import AlbumID3 as SonicAlbum
from libopensonic.media import ArtistID3 as SonicArtist
from libopensonic.media import Bookmark as SonicBookmark
from libopensonic.media import Child as SonicSong
from libopensonic.media import Child as SonicItem
from libopensonic.media import OpenSubsonicExtension, PodcastChannel
from libopensonic.media import Playlist as SonicPlaylist
from libopensonic.media import PodcastEpisode as SonicEpisode
Expand Down Expand Up @@ -174,6 +174,17 @@ async def _run_async(
) -> RetType:
return await asyncio.to_thread(call, *args, **kwargs)

def _set_loudness(self, item: SonicItem) -> None:
if item.replay_gain and item.replay_gain.track_gain and item.replay_gain.album_gain:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

album gain is an optional tag and will most likely not be set for a lot of tracks. Maybe make it a bit more loose and pass also if only the track _gain is present.

self.mass.create_task(
self.mass.music.set_loudness(
item.id,
self.instance_id,
item.replay_gain.track_gain,
item.replay_gain.album_gain,
)
)

async def resolve_image(self, path: str) -> bytes | Any:
"""Return the image."""
self.logger.debug("Requesting cover art for '%s'", path)
Expand Down Expand Up @@ -219,7 +230,10 @@ async def search(
al = []

if answer.song:
tr = [parse_track(self.logger, self.instance_id, entry) for entry in answer.song]
tr = []
for entry in answer.song:
self._set_loudness(entry)
tr.append(parse_track(self.logger, self.instance_id, entry))
else:
tr = []

Expand Down Expand Up @@ -306,6 +320,7 @@ async def get_library_tracks(self) -> AsyncGenerator[Track, None]:
aid = entry.album_id if entry.album_id else entry.parent
if aid is not None and (album is None or album.item_id != aid):
album = await self.get_album(prov_album_id=aid)
self._set_loudness(entry)
yield parse_track(self.logger, self.instance_id, entry, album=album)
offset += count
results = await self._run_async(
Expand Down Expand Up @@ -338,6 +353,7 @@ async def get_album_tracks(self, prov_album_id: str) -> list[Track]:
tracks = []
if sonic_album.song:
for sonic_song in sonic_album.song:
self._set_loudness(sonic_song)
tracks.append(parse_track(self.logger, self.instance_id, sonic_song))
return tracks

Expand Down Expand Up @@ -384,7 +400,7 @@ async def get_artist(self, prov_artist_id: str) -> Artist:
async def get_track(self, prov_track_id: str) -> Track:
"""Return the specified track."""
try:
sonic_song: SonicSong = await self._run_async(self.conn.get_song, prov_track_id)
sonic_song: SonicItem = await self._run_async(self.conn.get_song, prov_track_id)
except (ParameterError, DataNotFoundError) as e:
msg = f"Item {prov_track_id} not found"
raise MediaNotFoundError(msg) from e
Expand All @@ -394,6 +410,7 @@ async def get_track(self, prov_track_id: str) -> Track:
self.logger.warning("Unable to find album id for track %s", sonic_song.id)
else:
album = await self.get_album(prov_album_id=aid)
self._set_loudness(sonic_song)
return parse_track(self.logger, self.instance_id, sonic_song, album=album)

async def get_artist_albums(self, prov_artist_id: str) -> list[Album]:
Expand Down Expand Up @@ -447,6 +464,7 @@ async def get_podcast_episodes(
return

for episode in channel.episode:
self._set_loudness(episode)
yield parse_epsiode(self.instance_id, episode, channel)

async def get_podcast(self, prov_podcast_id: str) -> Podcast:
Expand Down Expand Up @@ -493,6 +511,7 @@ async def get_playlist_tracks(self, prov_playlist_id: str, page: int = 0) -> lis
self.logger.warning("Unable to find album for track %s", sonic_song.id)
if aid is not None and (not album or album.item_id != aid):
album = await self.get_album(prov_album_id=aid)
self._set_loudness(sonic_song)
track = parse_track(self.logger, self.instance_id, sonic_song, album=album)
track.position = index
result.append(track)
Expand All @@ -509,13 +528,17 @@ async def get_artist_toptracks(self, prov_artist_id: str) -> list[Track]:
except DataNotFoundError as e:
msg = f"Artist {prov_artist_id} not found"
raise MediaNotFoundError(msg) from e
songs: list[SonicSong] = await self._run_async(self.conn.get_top_songs, sonic_artist.name)
return [parse_track(self.logger, self.instance_id, entry) for entry in songs]
songs: list[SonicItem] = await self._run_async(self.conn.get_top_songs, sonic_artist.name)
tracks = []
for entry in songs:
self._set_loudness(entry)
tracks.append(parse_track(self.logger, self.instance_id, entry))
return tracks

async def get_similar_tracks(self, prov_track_id: str, limit: int = 25) -> list[Track]:
"""Get tracks similar to selected track."""
try:
songs: list[SonicSong] = await self._run_async(
songs: list[SonicItem] = await self._run_async(
self.conn.get_similar_songs, iid=prov_track_id, count=limit
)
except DataNotFoundError as e:
Expand All @@ -524,7 +547,11 @@ async def get_similar_tracks(self, prov_track_id: str, limit: int = 25) -> list[
# exception means we didn't find anything similar.
self.logger.info(e)
return []
return [parse_track(self.logger, self.instance_id, entry) for entry in songs]
tracks = []
for entry in songs:
self._set_loudness(entry)
tracks.append(parse_track(self.logger, self.instance_id, entry))
return tracks

async def create_playlist(self, name: str) -> Playlist:
"""Create a new empty playlist on the server."""
Expand Down Expand Up @@ -570,7 +597,7 @@ async def remove_playlist_tracks(

async def get_stream_details(self, item_id: str, media_type: MediaType) -> StreamDetails:
"""Get the details needed to process a specified track."""
item: SonicSong | SonicEpisode
item: SonicItem | SonicEpisode
if media_type == MediaType.TRACK:
try:
item = await self._run_async(self.conn.get_song, item_id)
Expand Down Expand Up @@ -785,6 +812,7 @@ async def _podcast_recommendations(self) -> RecommendationFolder:
)
for ep in sonic_episodes:
if channel_info := await self._get_podcast_channel_async(ep.channel_id):
self._set_loudness(ep)
podcasts.items.append(parse_epsiode(self.instance_id, ep, channel_info))
return podcasts

Expand All @@ -801,6 +829,7 @@ async def _favorites_recommendation(self) -> RecommendationFolder:
faves.items.append(parse_artist(self.instance_id, sonic_artist))
if starred.song:
for sonic_song in starred.song[: self._reco_limit]:
self._set_loudness(sonic_song)
faves.items.append(parse_track(self.logger, self.instance_id, sonic_song))
return faves

Expand Down
Loading