update searching

itisbean · Mar 1, 2021 · 77958f3 · 77958f3
1 parent 98e4b55
commit 77958f3
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -181,3 +181,26 @@ $api->getBestSeller();
  */
 $api->getYoRank();
 ```
+
+### Search Lyrics
+
+```php
+/**
+ * 搜索歌詞
+ * @param string $text
+ * @return array
+ */
+$api->searchLyrics('跑车开走');
+```
+
+
+### Search Songs
+
+```php
+/**
+ * 搜索歌曲
+ * @param string $name
+ * @return array
+ */
+$api->searchSong('东京人寿');
+```
diff --git a/src/Api.php b/src/Api.php
@@ -25,24 +25,15 @@ public function __construct()
      */
     public function searchSinger($name)
     {
-        $data = $this->_keywordSearch($name);
+        $data = $this->keywordSearch($name);
         if ($data === false) {
             return $this->_error();
         }
         if (empty($data['zhida']['zhida_singer'])) {
             return $this->_success();
         }
         $singer = $data['zhida']['zhida_singer'];
-        return $this->_success([
-            'singerID' => $singer['singerID'],
-            'singerMID' => $singer['singerMID'],
-            'singerName' => $singer['singerName'],
-            'singerName_hilight' => $singer['singername_hilight'],
-            'singerPic' => $singer['singerPic'],
-            'songNum' => $singer['songNum'],
-            'albumNum' => $singer['albumNum'],
-            'mvNum' => $singer['mvNum']
-        ]);
+        return $this->_success($singer);
     }
 
 
@@ -86,7 +77,7 @@ private function _keywordSearchBak($keyword)
      * @param string $keyword
      * @return array|bool
      */
-    private function _keywordSearch($keyword, $type = '')
+    private function keywordSearch($keyword, $type = '')
     {
         $url = 'https://c.y.qq.com/soso/fcgi-bin/client_search_cp';
         $param = [
@@ -99,8 +90,20 @@ private function _keywordSearch($keyword, $type = '')
             'platform' => 'yqq.json',
             'needNewCode' => 0,
         ];
-        if ($type && $type == 'lyric') {
-            $param['t'] = 7;
+        switch ($type) {
+            case 'lyric':
+                $param['t'] = 7;
+                break;
+            case 'album':
+                $param['t'] = 8;
+                break;
+            case 'song':
+                $param['t'] = 0;
+                break;
+            case 'mv':
+                $param['t'] = 12;
+            default:
+                break;
         }
         return $this->_get('url', $url, $param);
     }
@@ -613,7 +616,7 @@ public function getBullet()
      */
     public function searchLyrics($text)
     {
-        $data = $this->_keywordSearch($text, 'lyric');
+        $data = $this->keywordSearch($text, 'lyric');
         if ($data === false) {
             return $this->_error();
         }
@@ -623,4 +626,22 @@ public function searchLyrics($text)
         $data = $data['lyric']['list'];
         return $this->_success($data);
     }
+
+    /**
+     * 搜索歌曲
+     * @param string $name
+     * @return array
+     */
+    public function searchSong($name)
+    {
+        $data = $this->keywordSearch($name, 'song');
+        if ($data === false) {
+            return $this->_error();
+        }
+        if (empty($data['song']['list'])) {
+            return $this->_success();
+        }
+        $data = $data['song']['list'];
+        return $this->_success($data);
+    }
 }