From 713c5d98afb05d52506df04098e267c51cfe7c58 Mon Sep 17 00:00:00 2001
From: Harold <8866033@gmail.com>
Date: Sat, 25 Apr 2026 09:01:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20add=20AAZ=E9=9F=B3=E4=B9=90=20detail=20?=
 =?UTF-8?q?parsing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 py/AAZ音乐.py            | 93 ++++++++++++++++++++++++++++++++++++++++
 py/tests/test_AAZ音乐.py | 56 ++++++++++++++++++++++++
 2 files changed, 149 insertions(+)

diff --git a/py/AAZ音乐.py b/py/AAZ音乐.py
index 78c3826..1d21689 100644
--- a/py/AAZ音乐.py
+++ b/py/AAZ音乐.py
@@ -139,6 +139,61 @@ class Spider(BaseSpider):
             )
         return items
 
+    def _decode_vod_id(self, vod_id):
+        raw = str(vod_id or "").strip()
+        if ":" not in raw:
+            return "", ""
+        prefix, value = raw.split(":", 1)
+        if prefix == "song":
+            return prefix, "/m/%s.html" % value
+        if prefix == "singer":
+            return prefix, "/s/%s" % value
+        if prefix == "playlist":
+            return prefix, "/p/%s" % value
+        if prefix == "album":
+            return prefix, "/a/%s" % value
+        if prefix == "mv":
+            return prefix, "/v/%s" % value
+        return "", ""
+
+    def _parse_song_detail(self, html, song_id):
+        title_match = re.search(
+            r'<div class="djname"><h1>(.*?)<a href="javascript:location\.reload\(\)"',
+            str(html or ""),
+            re.S,
+        )
+        title = self._clean_text(re.sub(r"<[^>]+>", " ", title_match.group(1))) if title_match else song_id
+        singer_match = re.search(r'<div class="name"><a href="/s/[^"]+"[^>]*>([^<]+)</a></div>', str(html or ""))
+        album_match = re.search(r'所属专辑：<a href="/a/[^"]+"[^>]*>([^<]+)</a>', str(html or ""))
+        cover_match = re.search(r'<img class="rotate" id="mcover" src="([^"]+)"', str(html or ""))
+        duration_match = re.search(r"歌曲时长：([^<]+)</div>", str(html or ""))
+        content_match = re.search(r'<meta name="description" content="([^"]+)"', str(html or ""))
+        return {
+            "song_name": title,
+            "singer": self._clean_text(singer_match.group(1)) if singer_match else "",
+            "album": self._clean_text(album_match.group(1)) if album_match else "",
+            "cover": self._build_url(cover_match.group(1)) if cover_match else "",
+            "duration": self._clean_text(duration_match.group(1)) if duration_match else "",
+            "content": self._clean_text(content_match.group(1)) if content_match else "",
+        }
+
+    def _parse_folder_tracks(self, html):
+        root = self._load_html(html)
+        rows = []
+        seen = set()
+        for node in root.xpath("//li"):
+            href = "".join(node.xpath(".//div[contains(@class,'name')]//a[1]/@href")).strip()
+            song_id = self._extract_song_id(href)
+            if not song_id or song_id in seen:
+                continue
+            seen.add(song_id)
+            rows.append(
+                self._clean_text("".join(node.xpath(".//div[contains(@class,'name')]//a[1]/@title")))
+                + "$song:"
+                + song_id
+            )
+        return rows
+
     def homeContent(self, filter):
         items = self._parse_song_cards(self._fetch_html(self.category_paths["new"]))
         return {"class": list(self.classes), "list": items}
@@ -169,3 +224,41 @@ class Spider(BaseSpider):
         html = self._fetch_html("/so/%s.html" % quote(keyword))
         items = self._parse_search_cards(html)
         return {"page": int(pg), "limit": len(items), "total": len(items), "list": items}
+
+    def detailContent(self, array):
+        vod_id = str((array or [""])[0] or "").strip()
+        kind, path = self._decode_vod_id(vod_id)
+        if not kind:
+            return {"list": []}
+        html = self._fetch_html(path)
+        if kind == "song":
+            info = self._parse_song_detail(html, vod_id.split(":", 1)[1])
+            remarks = " | ".join([item for item in [info["singer"], info["album"], info["duration"]] if item])
+            return {
+                "list": [
+                    {
+                        "vod_id": vod_id,
+                        "vod_name": info["song_name"],
+                        "vod_pic": info["cover"],
+                        "vod_remarks": remarks,
+                        "vod_content": info["content"],
+                        "vod_play_from": "AAZ音乐",
+                        "vod_play_url": "播放$" + vod_id,
+                    }
+                ]
+            }
+        root = self._load_html(html)
+        tracks = self._parse_folder_tracks(html)
+        return {
+            "list": [
+                {
+                    "vod_id": vod_id,
+                    "vod_name": self._clean_text("".join(root.xpath("//div[contains(@class,'title')]//h1[1]//text()"))),
+                    "vod_pic": self._build_url("".join(root.xpath("//div[contains(@class,'pic')]//img[1]/@src"))),
+                    "vod_remarks": "",
+                    "vod_content": self._clean_text("".join(root.xpath("//div[contains(@class,'info')][1]//text()"))),
+                    "vod_play_from": "AAZ音乐",
+                    "vod_play_url": "#".join(tracks),
+                }
+            ]
+        }
diff --git a/py/tests/test_AAZ音乐.py b/py/tests/test_AAZ音乐.py
index 5d988e1..2aa2913 100644
--- a/py/tests/test_AAZ音乐.py
+++ b/py/tests/test_AAZ音乐.py
@@ -72,6 +72,31 @@ SEARCH_HTML = """
 </body></html>
 """
 
+SONG_DETAIL_HTML = """
+<html>
+  <head><meta name="description" content="夜曲歌曲简介"></head>
+  <body>
+    <div class="djname"><h1>夜曲<a href="javascript:location.reload()">刷新</a></h1></div>
+    <div class="name"><a href="/s/jay">周杰伦</a></div>
+    所属专辑：<a href="/a/fantasy">范特西</a>
+    <img class="rotate" id="mcover" src="/img/song_detail.jpg">
+    <div>歌曲时长：03:45</div>
+  </body>
+</html>
+"""
+
+FOLDER_DETAIL_HTML = """
+<html><body>
+  <div class="title"><h1>周董精选</h1></div>
+  <div class="pic"><img src="/img/folder_detail.jpg"></div>
+  <div class="info">经典歌曲合集</div>
+  <ul>
+    <li><div class="name"><a href="/m/3001.html" title="安静">安静</a></div></li>
+    <li><div class="name"><a href="/m/3002.html" title="晴天">晴天</a></div></li>
+  </ul>
+</body></html>
+"""
+
 
 class TestAAZMusicSpider(unittest.TestCase):
     def setUp(self):
@@ -135,6 +160,37 @@ class TestAAZMusicSpider(unittest.TestCase):
             {"page": 1, "limit": 0, "total": 0, "list": []},
         )
 
+    @patch.object(Spider, "fetch")
+    def test_detail_content_builds_song_metadata_and_single_play_url(self, mock_fetch):
+        mock_fetch.return_value = SimpleNamespace(status_code=200, text=SONG_DETAIL_HTML)
+        vod = self.spider.detailContent(["song:2001"])["list"][0]
+        self.assertEqual(vod["vod_name"], "夜曲")
+        self.assertEqual(vod["vod_pic"], "https://www.aaz.cx/img/song_detail.jpg")
+        self.assertEqual(vod["vod_remarks"], "周杰伦 | 范特西 | 03:45")
+        self.assertEqual(vod["vod_play_from"], "AAZ音乐")
+        self.assertEqual(vod["vod_play_url"], "播放$song:2001")
+
+    @patch.object(Spider, "fetch")
+    def test_detail_content_builds_folder_track_list_for_singer_playlist_album_and_mv(self, mock_fetch):
+        mock_fetch.side_effect = [
+            SimpleNamespace(status_code=200, text=FOLDER_DETAIL_HTML),
+            SimpleNamespace(status_code=200, text=FOLDER_DETAIL_HTML),
+            SimpleNamespace(status_code=200, text=FOLDER_DETAIL_HTML),
+            SimpleNamespace(status_code=200, text=FOLDER_DETAIL_HTML),
+        ]
+        singer_vod = self.spider.detailContent(["singer:jay"])["list"][0]
+        playlist_vod = self.spider.detailContent(["playlist:jaybest"])["list"][0]
+        album_vod = self.spider.detailContent(["album:fantasy"])["list"][0]
+        mv_vod = self.spider.detailContent(["mv:nocturnemv"])["list"][0]
+        expected = "安静$song:3001#晴天$song:3002"
+        self.assertEqual(singer_vod["vod_play_url"], expected)
+        self.assertEqual(playlist_vod["vod_play_url"], expected)
+        self.assertEqual(album_vod["vod_play_url"], expected)
+        self.assertEqual(mv_vod["vod_play_url"], expected)
+
+    def test_detail_content_returns_empty_list_for_invalid_vod_id(self):
+        self.assertEqual(self.spider.detailContent(["bad"])["list"], [])
+
 
 if __name__ == "__main__":
     unittest.main()