fix(music): complete subscription lifecycle

app/modules/plex/__init__.py

@@ -3,6 +3,7 @@ from typing import Optional, Tuple, Union, Any, List, Generator, Dict
 from app import schemas
 from app.core.context import MediaInfo
 from app.core.event import eventmanager
+from app.helper.mediaserver import MusicMediaServerHelper
 from app.log import logger
 from app.modules import _ModuleBase, _MediaServerBase
 from app.modules.plex.plex import Plex
@@ -162,17 +163,14 @@ class PlexModule(_ModuleBase, _MediaServerBase[Plex]):
             if not s:
                 continue
             if mediainfo.type == MediaType.MUSIC:
-                matches = s.get_music(
-                    title=getattr(mediainfo, "title", None),
-                    artist=getattr(mediainfo, "artist", None),
-                    album=getattr(mediainfo, "album", None),
-                )
-                if matches:
+                matches = s.get_music(**MusicMediaServerHelper.search_params(mediainfo))
+                match = MusicMediaServerHelper.find_match(mediainfo, matches)
+                if match:
                     return schemas.ExistMediaInfo(
                         type=MediaType.MUSIC,
                         server_type="plex",
                         server=name,
-                        itemid=matches[0].item_id,
+                        itemid=match.item_id,
                     )
                 continue
             if mediainfo.type == MediaType.MOVIE:

app/modules/plex/plex.py

@@ -255,7 +255,7 @@ class Plex:
         """按歌曲、艺术家或专辑名称查询 Plex 音乐条目。"""
         if not self._plex:
             return []
-        query = " ".join(filter(None, [title, artist, album])).strip()
+        query = album or title or artist
         if not query:
             return []
         results: List[schemas.MediaServerItem] = []
@@ -264,15 +264,27 @@ class Plex:
                 if library.type not in ("artist", "music"):
                     continue
                 for item in library.search(title=query):
+                    item_type = getattr(item, "type", None)
+                    if item_type == "track":
+                        item_artist = getattr(item, "grandparentTitle", None)
+                        item_album = getattr(item, "parentTitle", None)
+                    else:
+                        item_artist = getattr(item, "parentTitle", None)
+                        item_album = getattr(item, "title", None) if item_type == "album" else None
                     results.append(schemas.MediaServerItem(
                         server="plex",
                         library=library.key,
                         item_id=getattr(item, "ratingKey", None) or getattr(item, "key", None),
-                        item_type=MediaType.MUSIC.value,
+                        item_type=item_type or MediaType.MUSIC.value,
                         title=getattr(item, "title", None),
                         original_title=getattr(item, "title", None),
                         year=getattr(item, "year", None),
                         path=getattr(item, "file", None),
+                        note={
+                            "artist": item_artist,
+                            "album": item_album,
+                            "song_count": getattr(item, "leafCount", None),
+                        },
                     ))
         except Exception as e:
             logger.debug(f"查询Plex音乐出错：{e}")