📖 add albumName in format, close #24

This commit is contained in:
METO
2017-06-25 13:49:22 +08:00
parent 1d44f78fee
commit c656b188a5
7 changed files with 11 additions and 4 deletions

View File

@@ -17,7 +17,7 @@
>
<testsuites>
<testsuite name="Meting Test Suite">
<directory suffix="Test.php">./test</directory>
<directory suffix="Test.php">./tests</directory>
</testsuite>
</testsuites>
<filter>

View File

@@ -3,7 +3,7 @@
* Meting music framework
* https://i-meto.com
* https://github.com/metowolf/Meting
* Version 1.3.5.2
* Version 1.3.6
*
* Copyright 2017, METO Sheel <i@i-meto.com>
* Released under the MIT license
@@ -842,6 +842,8 @@ class Meting
'br' => -1,
);
}
$url['url']=str_replace('http://m8','http://m7',$url['url']);
$url['url']=str_replace('http://m7','https://m7',$url['url']);
return json_encode($url);
}
private function tencent_url($result)
@@ -869,7 +871,7 @@ class Meting
foreach ($type as $key=>$vo) {
if ($data['data'][0]['file'][$key]&&$vo[0]<=$this->_TEMP['br']) {
$url=array(
'url' => 'http://dl.stream.qqmusic.qq.com/'.$vo[1].$data['data'][0]['file']['media_mid'].'.'.$vo[2].'?vkey='.$KEY.'&guid='.$GUID.'&uid=0&fromtag=30',
'url' => 'https://dl.stream.qqmusic.qq.com/'.$vo[1].$data['data'][0]['file']['media_mid'].'.'.$vo[2].'?vkey='.$KEY.'&guid='.$GUID.'&uid=0&fromtag=30',
'br' => $vo[0],
);
break;
@@ -910,7 +912,7 @@ class Meting
}
$urlt=str_replace('^', '0', urldecode($urlt));
$url=array(
'url' => urldecode($urlt),
'url' => str_replace('http://','https://',urldecode($urlt)),
'br' => 320,
);
} else {
@@ -1069,6 +1071,7 @@ class Meting
'id' => $data['id'],
'name' => $data['name'],
'artist' => array(),
'album' => $data['al']['name'],
'pic_id' => isset($data['al']['pic_str'])?$data['al']['pic_str']:$data['al']['pic'],
'url_id' => $data['id'],
'lyric_id' => $data['id'],
@@ -1092,6 +1095,7 @@ class Meting
'id' => $data['songmid'],
'name' => $data['songname'],
'artist' => array(),
'album' => isset($data['albumname'])?$data['albumname']:$data['album']['name'],
'pic_id' => $data['albummid'],
'url_id' => $data['songmid'],
'lyric_id' => $data['songmid'],
@@ -1108,6 +1112,7 @@ class Meting
'id' => $data['song_id'],
'name' => $data['song_name'],
'artist' => explode(';', isset($data['singers'])?$data['singers']:$data['artist_name']),
'album' => $data['album_name'],
'pic_id' => $data['song_id'],
'url_id' => $data['song_id'],
'lyric_id' => $data['song_id'],
@@ -1121,6 +1126,7 @@ class Meting
'id' => $data['hash'],
'name' => isset($data['filename'])?$data['filename']:$data['fileName'],
'artist' => array(),
'album' => isset($data['album_name'])?$data['album_name']:'',
'url_id' => $data['hash'],
'pic_id' => $data['hash'],
'lyric_id' => $data['hash'],
@@ -1136,6 +1142,7 @@ class Meting
'id' => $data['song_id'],
'name' => $data['title'],
'artist' => explode(',', $data['author']),
'album' => $data['album_title'],
'pic_id' => $data['song_id'],
'url_id' => $data['song_id'],
'lyric_id' => $data['song_id'],