From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Thu, 13 Feb 2025 20:26:43 +0000 (+0100)
Subject: Fix: several small fixes and tweaks
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=2d5a4e4b766dcc6ad1bfb71fe950d9e1f1a22a03;p=music-assistant-server.git

Fix: several small fixes and tweaks
---

diff --git a/music_assistant/controllers/music.py b/music_assistant/controllers/music.py
index 50cef528..b94e8977 100644
--- a/music_assistant/controllers/music.py
+++ b/music_assistant/controllers/music.py
@@ -555,6 +555,7 @@ class MusicController(CoreController):
             provider_instance_id_or_domain=provider_instance_id_or_domain,
         )
 
+    @api_command("music/get_library_item")
     async def get_library_item_by_prov_id(
         self,
         media_type: MediaType,
diff --git a/music_assistant/controllers/player_queues.py b/music_assistant/controllers/player_queues.py
index 6fed50e0..0c7b4f10 100644
--- a/music_assistant/controllers/player_queues.py
+++ b/music_assistant/controllers/player_queues.py
@@ -58,7 +58,7 @@ from music_assistant.constants import CONF_CROSSFADE, CONF_FLOW_MODE, MASS_LOGO_
 from music_assistant.helpers.api import api_command
 from music_assistant.helpers.audio import get_stream_details, get_stream_dsp_details
 from music_assistant.helpers.throttle_retry import BYPASS_THROTTLER
-from music_assistant.helpers.util import get_changed_keys
+from music_assistant.helpers.util import get_changed_keys, percentage
 from music_assistant.models.core_controller import CoreController
 
 if TYPE_CHECKING:
@@ -1839,45 +1839,59 @@ class PlayerQueuesController(CoreController):
         cur_item_id = new_state["current_item_id"]
         if prev_item_id is None and cur_item_id is None:
             return
+
         if prev_item_id is not None and prev_item_id != cur_item_id:
             # we have a new item, so we need report the previous one
+            is_current_item = False
             item_to_report = prev_state["current_item"]
             seconds_played = int(prev_state["elapsed_time"])
         else:
             # report on current item
+            is_current_item = True
             item_to_report = self.get_item(queue.queue_id, cur_item_id) or new_state["current_item"]
             if not item_to_report:
                 return  # guard against invalid items
             seconds_played = int(new_state["elapsed_time"])
-            if seconds_played < 10:
-                # ignore items that have been played less than 10 seconds
-                return
 
         if not item_to_report.media_item:
             # only report on media items
             return
 
         if item_to_report.streamdetails and item_to_report.streamdetails.duration:
-            duration = item_to_report.streamdetails.duration
+            duration = int(item_to_report.streamdetails.duration)
         else:
-            duration = item_to_report.duration or 3600
+            duration = int(item_to_report.duration or 3 * 3600)
+
+        if seconds_played < 5:
+            # ignore items that have been played less than 5 seconds
+            # this also filters out a bounce effect where the previous item
+            # gets reported with 0 elapsed seconds after a new item starts playing
+            return
 
         # determine if item is fully played
         # for podcasts and audiobooks we account for the last 60 seconds
-        if item_to_report.queue_item_id == prev_item_id and item_to_report.media_type in (
+        percentage_played = percentage(seconds_played, duration)
+        if not is_current_item and item_to_report.media_type in (
             MediaType.AUDIOBOOK,
             MediaType.PODCAST_EPISODE,
         ):
-            fully_played = seconds_played >= (duration or 3 * 3600) - 60
+            fully_played = seconds_played >= duration - 60
+        elif not is_current_item:
+            # 90% of the track must be played to be considered fully played
+            fully_played = percentage_played >= 90
         else:
-            fully_played = seconds_played >= (duration or 3600) - 10
+            fully_played = seconds_played >= duration - 10
 
         self.logger.debug(
-            "PlayerQueue %s playing/played item %s - fully_played: %s - progress: %s",
+            "%s %s '%s' (%s) - Fully played: %s - Progress: %s (%s/%ss)",
             queue.display_name,
+            "is playing" if (is_current_item and queue.state == PlayerState.PLAYING) else "played",
+            item_to_report.name,
             item_to_report.uri,
             fully_played,
+            f"{percentage_played}%",
             seconds_played,
+            duration,
         )
         # add entry to playlog - this also handles resume of podcasts/audiobooks
         self.mass.create_task(
diff --git a/music_assistant/helpers/util.py b/music_assistant/helpers/util.py
index 7e791de4..f0667020 100644
--- a/music_assistant/helpers/util.py
+++ b/music_assistant/helpers/util.py
@@ -535,6 +535,11 @@ def merge_lists(base: list[Any], new: list[Any]) -> list[Any]:
     return [x for x in base if x not in new] + list(new)
 
 
+def percentage(part: float, whole: float) -> int:
+    """Calculate percentage."""
+    return int(100 * float(part) / float(whole))
+
+
 class TaskManager:
     """
     Helper class to run many tasks at once.
diff --git a/music_assistant/providers/hass_players/__init__.py b/music_assistant/providers/hass_players/__init__.py
index 8c8a4652..bc439e5e 100644
--- a/music_assistant/providers/hass_players/__init__.py
+++ b/music_assistant/providers/hass_players/__init__.py
@@ -272,6 +272,7 @@ class HomeAssistantPlayers(PlayerProvider):
         if player := self.mass.players.get(player_id):
             player.elapsed_time = 0
             player.elapsed_time_last_updated = time.time()
+            player.current_media = media
 
     async def play_announcement(
         self, player_id: str, announcement: PlayerMedia, volume_level: int | None = None