diff --git a/Koneko_聆澜_GIT音源_v0.0.3_QZv2.js b/Koneko_聆澜_GIT音源_v0.0.3_QZv2.js index a14d476..2cfa116 100644 --- a/Koneko_聆澜_GIT音源_v0.0.3_QZv2.js +++ b/Koneko_聆澜_GIT音源_v0.0.3_QZv2.js @@ -83,23 +83,24 @@ function fetchAllGitMusic() { } function formatGitItem(item) { - var types = []; - var _types = {}; + var qualities = {}; var fmt = (item.format || '').toLowerCase(); - if (fmt === 'flac') { types.push({ type: 'flac', size: item.filesize || '' }); _types.flac = { size: item.filesize || '' }; } - else if (fmt === 'mp3') { types.push({ type: '320k', size: item.filesize || '' }); _types['320k'] = { size: item.filesize || '' }; } - else { types.push({ type: '128k', size: item.filesize || '' }); _types['128k'] = { size: item.filesize || '' }; } + if (fmt === 'flac' && item.filesize) qualities.lossless = String(item.filesize); + else if (fmt === 'mp3' && item.filesize) qualities.exhigh = String(item.filesize); + else if (item.filesize) qualities.standard = String(item.filesize); + var picUrl = item.img || ''; return { - artists: item.artist || '未知歌手', + id: item.relative_path || '', name: item.title || item.filename || '', + artists: item.artist || '未知歌手', + source: 'git', + pic: picUrl, + mPic: picUrl, + sPic: picUrl, albumName: item.album || '未知专辑', albumId: '', - id: item.relative_path || '', - source: 'git', interval: '', - img: item.img || '', - lrc: item.lyrics || null, - types: types, _types: _types, typeUrl: {}, + qualities: qualities, _gitcodeData: item }; } @@ -152,13 +153,13 @@ function getUrl(songInfo, type) { // ===== 封面图 ===== function getPic(songInfo) { - if (songInfo.img) return Promise.resolve(songInfo.img); + if (songInfo.pic) return Promise.resolve(songInfo.pic); return Promise.resolve(''); } // ===== 歌词 ===== function getLyric(songInfo) { - if (songInfo.lrc) return Promise.resolve(songInfo.lrc); + if (songInfo._gitcodeData && songInfo._gitcodeData.lyrics) return Promise.resolve(songInfo._gitcodeData.lyrics); return Promise.resolve(''); } diff --git a/Koneko_聆澜_QQ音乐_v0.0.3_QZv2.js b/Koneko_聆澜_QQ音乐_v0.0.3_QZv2.js index 7ff2048..3d36797 100644 --- a/Koneko_聆澜_QQ音乐_v0.0.3_QZv2.js +++ b/Koneko_聆澜_QQ音乐_v0.0.3_QZv2.js @@ -126,13 +126,11 @@ function handleSearchResult(rawList) { for (var i = 0; i < rawList.length; i++) { var item = rawList[i]; if (!item.file || !item.file.media_mid) continue; - var types = []; - var _types = {}; - var file = item.file; - if (file.size_128mp3 !== 0) { types.push({ type: '128k', size: '' }); _types['128k'] = { size: '' }; } - if (file.size_320mp3 !== 0) { types.push({ type: '320k', size: '' }); _types['320k'] = { size: '' }; } - if (file.size_flac !== 0) { types.push({ type: 'flac', size: '' }); _types.flac = { size: '' }; } - if (file.size_hires !== 0) { types.push({ type: 'hires', size: '' }); _types.hires = { size: '' }; } + var qualities = {}; + if (item.file.size_128mp3) qualities.standard = String(item.file.size_128mp3); + if (item.file.size_320mp3) qualities.exhigh = String(item.file.size_320mp3); + if (item.file.size_flac) qualities.lossless = String(item.file.size_flac); + if (item.file.size_hires) qualities.hires = String(item.file.size_hires); var albumId = ''; var albumName = ''; if (item.album) { albumName = item.album.name; albumId = item.album.mid; } @@ -142,18 +140,19 @@ function handleSearchResult(rawList) { for (var j = 0; j < item.singer.length; j++) ns.push(item.singer[j].name); singerName = ns.join('、'); } + var picUrl = albumId ? 'https://y.gtimg.cn/music/photo_new/T002R500x500M000' + albumId + '.jpg' : (item.singer && item.singer.length ? 'https://y.gtimg.cn/music/photo_new/T001R500x500M000' + item.singer[0].mid + '.jpg' : ''); list.push({ - artists: singerName, + id: item.mid, name: item.name + (item.title_extra || ''), + artists: singerName, + source: 'tx', + pic: picUrl, + mPic: picUrl, + sPic: picUrl, albumName: albumName, albumId: albumId, - source: 'tx', interval: formatPlayTime(item.interval), - id: item.mid, - songId: item.id, - img: albumId ? 'https://y.gtimg.cn/music/photo_new/T002R500x500M000' + albumId + '.jpg' : (item.singer && item.singer.length ? 'https://y.gtimg.cn/music/photo_new/T001R500x500M000' + item.singer[0].mid + '.jpg' : ''), - lrc: null, - types: types, _types: _types, typeUrl: {} + qualities: qualities }); } return list; @@ -190,7 +189,7 @@ function getUrl(songInfo, type) { // ===== 封面图 ===== function getPic(songInfo) { - if (songInfo.img) return Promise.resolve(songInfo.img); + if (songInfo.pic) return Promise.resolve(songInfo.pic); var albumId = songInfo.albumId || ''; if (albumId) return Promise.resolve('https://y.gtimg.cn/music/photo_new/T002R500x500M000' + albumId + '.jpg'); return Promise.resolve(''); @@ -223,13 +222,19 @@ function musicDetail(songmid) { var albumId = t.album ? t.album.mid : ''; var singerName = ''; if (t.singer && t.singer.length) { var ns = []; for (var j = 0; j < t.singer.length; j++) ns.push(t.singer[j].name); singerName = ns.join('、'); } + var picUrl = albumId ? 'https://y.gtimg.cn/music/photo_new/T002R500x500M000' + albumId + '.jpg' : ''; return { - artists: singerName, name: t.name, - albumName: t.album ? t.album.name : '', albumId: albumId, - source: 'tx', interval: formatPlayTime(t.interval), - id: t.mid, songId: t.id, - img: albumId ? 'https://y.gtimg.cn/music/photo_new/T002R500x500M000' + albumId + '.jpg' : '', - lrc: null, types: [], _types: {}, typeUrl: {} + id: t.mid, + name: t.name, + artists: singerName, + source: 'tx', + pic: picUrl, + mPic: picUrl, + sPic: picUrl, + albumName: t.album ? t.album.name : '', + albumId: albumId, + interval: formatPlayTime(t.interval), + qualities: {} }; } return null; diff --git a/Koneko_聆澜_咪咕音乐_v0.0.3_QZv2.js b/Koneko_聆澜_咪咕音乐_v0.0.3_QZv2.js index 84e2a42..833f640 100644 --- a/Koneko_聆澜_咪咕音乐_v0.0.3_QZv2.js +++ b/Koneko_聆澜_咪咕音乐_v0.0.3_QZv2.js @@ -77,30 +77,29 @@ function handleSearchResult(rawList) { var list = []; for (var i = 0; i < rawList.length; i++) { var item = rawList[i]; - var types = []; - var _types = {}; - types.push({ type: '128k', size: '' }); _types['128k'] = { size: '' }; + var qualities = {}; if (item.newRateFormats) { for (var j = 0; j < item.newRateFormats.length; j++) { var fmt = item.newRateFormats[j]; - if (fmt.formatType === 'SQ') { types.push({ type: 'flac', size: '' }); _types.flac = { size: '' }; } - if (fmt.formatType === 'HQ') { types.push({ type: '320k', size: '' }); _types['320k'] = { size: '' }; } + if (fmt.formatType === 'SQ' && fmt.size) qualities.lossless = String(fmt.size); + if (fmt.formatType === 'HQ' && fmt.size) qualities.exhigh = String(fmt.size); + if (fmt.formatType === 'LQ' && fmt.size) qualities.standard = String(fmt.size); } } - var img = item.img || (item.albumImgs && item.albumImgs.length ? item.albumImgs[0].img : ''); - if (img && img.startsWith('/')) img = 'https://d.musicapp.migu.cn' + img; + var picUrl = item.img || (item.albumImgs && item.albumImgs.length ? item.albumImgs[0].img : ''); + if (picUrl && picUrl.startsWith('/')) picUrl = 'https://d.musicapp.migu.cn' + picUrl; list.push({ - artists: item.artist || item.singerName || '', + id: item.copyrightId || item.id || '', name: item.title || item.songName || '', + artists: item.artist || item.singerName || '', + source: 'mg', + pic: picUrl, + mPic: picUrl, + sPic: picUrl, albumName: item.album || item.albumName || '', albumId: item.albumId || '', - source: 'mg', interval: item.length ? item.length.replace(/.*(\d\d:\d\d)$/, '$1') : '', - id: item.copyrightId || item.id || '', - songId: item.copyrightId || item.id || '', - img: img, - lrc: null, - types: types, _types: _types, typeUrl: {} + qualities: qualities }); } return list; @@ -134,7 +133,7 @@ function getUrl(songInfo, type) { // ===== 封面图 ===== function getPic(songInfo) { - if (songInfo.img) return Promise.resolve(songInfo.img); + if (songInfo.pic) return Promise.resolve(songInfo.pic); return Promise.resolve(''); } diff --git a/Koneko_聆澜_网易云音乐_v0.0.3_QZv2.js b/Koneko_聆澜_网易云音乐_v0.0.3_QZv2.js index fdbe1e1..fe7d93c 100644 --- a/Koneko_聆澜_网易云音乐_v0.0.3_QZv2.js +++ b/Koneko_聆澜_网易云音乐_v0.0.3_QZv2.js @@ -148,26 +148,25 @@ function handleSearchResult(rawList) { var item = rawList[i]; if (!item.baseInfo || !item.baseInfo.simpleSongData) continue; var s = item.baseInfo.simpleSongData; - var types = []; - var _types = {}; - if (s.h && s.h.br >= 320000) { types.push({ type: '320k', size: '' }); _types['320k'] = { size: '' }; } - else if (s.m && s.m.br >= 192000) { types.push({ type: '192k', size: '' }); _types['192k'] = { size: '' }; } - else if (s.l) { types.push({ type: '128k', size: '' }); _types['128k'] = { size: '' }; } - if (s.sq) { types.push({ type: 'flac', size: '' }); _types.flac = { size: '' }; } - if (s.hr) { types.push({ type: 'hires', size: '' }); _types.hires = { size: '' }; } + var qualities = {}; + if (s.l && s.l.size) qualities.standard = String(s.l.size); + if (s.m && s.m.size) qualities.standard = String(s.m.size); + if (s.h && s.h.size) qualities.exhigh = String(s.h.size); + if (s.sq && s.sq.size) qualities.lossless = String(s.sq.size); + if (s.hr && s.hr.size) qualities.hires = String(s.hr.size); + var picUrl = s.al && s.al.picUrl ? s.al.picUrl : ''; list.push({ - artists: formatSingerName(s.ar, 'name'), + id: s.id, name: s.name, + artists: formatSingerName(s.ar, 'name'), + source: 'wy', + pic: picUrl, + mPic: picUrl, + sPic: picUrl, albumName: s.al && s.al.name ? s.al.name : '', albumId: s.al && s.al.id ? s.al.id : '', - source: 'wy', interval: formatPlayTime((s.dt || 0) / 1000), - id: s.id, - img: s.al && s.al.picUrl ? s.al.picUrl : '', - lrc: null, - types: types, - _types: _types, - typeUrl: {} + qualities: qualities }); } return list; @@ -211,7 +210,7 @@ function getUrl(songInfo, type) { // ===== 封面图 ===== function getPic(songInfo) { - if (songInfo.img) return Promise.resolve(songInfo.img); + if (songInfo.pic) return Promise.resolve(songInfo.pic); return requestUrl('https://music.163.com/weapi/v3/song/detail', 'POST', { 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36', 'Referer': 'https://music.163.com/song?id=' + songInfo.id, @@ -247,19 +246,19 @@ function musicDetail(songmid) { .then(function(res) { if (res.body && res.body.songs && res.body.songs.length) { var s = res.body.songs[0]; + var picUrl = s.al && s.al.picUrl ? s.al.picUrl : ''; return { - artists: formatSingerName(s.ar, 'name'), + id: s.id, name: s.name, + artists: formatSingerName(s.ar, 'name'), + source: 'wy', + pic: picUrl, + mPic: picUrl, + sPic: picUrl, albumName: s.al && s.al.name ? s.al.name : '', albumId: s.al && s.al.id ? s.al.id : '', - source: 'wy', interval: formatPlayTime((s.dt || 0) / 1000), - id: s.id, - img: s.al && s.al.picUrl ? s.al.picUrl : '', - lrc: null, - types: [], - _types: {}, - typeUrl: {} + qualities: {} }; } return null; diff --git a/Koneko_聆澜_酷我音乐_v0.0.3_QZv2.js b/Koneko_聆澜_酷我音乐_v0.0.3_QZv2.js index ff26547..47401f3 100644 --- a/Koneko_聆澜_酷我音乐_v0.0.3_QZv2.js +++ b/Koneko_聆澜_酷我音乐_v0.0.3_QZv2.js @@ -73,22 +73,23 @@ function handleSearchResult(rawList) { var list = []; for (var i = 0; i < rawList.length; i++) { var item = rawList[i]; - var types = []; - var _types = {}; - types.push({ type: '128k', size: '' }); _types['128k'] = { size: '' }; - types.push({ type: '320k', size: '' }); _types['320k'] = { size: '' }; + var qualities = {}; + if (item.filesize) qualities.standard = String(item.filesize); + if (item.sqfilesize) qualities.exhigh = String(item.sqfilesize); + if (item.flacfilesize) qualities.lossless = String(item.flacfilesize); + var picUrl = item.pic || ''; list.push({ - artists: item.artist || '', + id: item.id || item.rid || '', name: item.name || '', + artists: item.artist || '', + source: 'kw', + pic: picUrl, + mPic: picUrl, + sPic: picUrl, albumName: item.album || '', albumId: item.albumid || '', - source: 'kw', interval: item.duration ? formatPlayTime(item.duration) : '', - id: item.id || item.rid || '', - songId: item.id || item.rid || '', - img: item.pic || '', - lrc: null, - types: types, _types: _types, typeUrl: {} + qualities: qualities }); } return list; @@ -122,7 +123,7 @@ function getUrl(songInfo, type) { // ===== 封面图 ===== function getPic(songInfo) { - if (songInfo.img) return Promise.resolve(songInfo.img); + if (songInfo.pic) return Promise.resolve(songInfo.pic); return Promise.resolve(''); } diff --git a/Koneko_聆澜_酷狗音乐_v0.0.3_QZv2.js b/Koneko_聆澜_酷狗音乐_v0.0.3_QZv2.js index 00eae63..9d130ba 100644 --- a/Koneko_聆澜_酷狗音乐_v0.0.3_QZv2.js +++ b/Koneko_聆澜_酷狗音乐_v0.0.3_QZv2.js @@ -73,22 +73,23 @@ function handleSearchResult(rawList) { var list = []; for (var i = 0; i < rawList.length; i++) { var item = rawList[i]; - var types = []; - var _types = {}; - types.push({ type: '128k', size: '' }); _types['128k'] = { size: '' }; - types.push({ type: '320k', size: '' }); _types['320k'] = { size: '' }; + var qualities = {}; + if (item.filesize) qualities.standard = String(item.filesize); + if (item.sqfilesize) qualities.exhigh = String(item.sqfilesize); + if (item.flacfilesize) qualities.lossless = String(item.flacfilesize); + var picUrl = item.img || ''; list.push({ - artists: item.singername || '', + id: item.hash || item.audio_id || '', name: item.songname || '', + artists: item.singername || '', + source: 'kg', + pic: picUrl, + mPic: picUrl, + sPic: picUrl, albumName: item.album_name || '', albumId: item.album_id || '', - source: 'kg', interval: item.duration ? formatPlayTime(item.duration) : '', - id: item.hash || item.audio_id || '', - songId: item.hash || item.audio_id || '', - img: item.img || '', - lrc: null, - types: types, _types: _types, typeUrl: {} + qualities: qualities }); } return list; @@ -122,7 +123,7 @@ function getUrl(songInfo, type) { // ===== 封面图 ===== function getPic(songInfo) { - if (songInfo.img) return Promise.resolve(songInfo.img); + if (songInfo.pic) return Promise.resolve(songInfo.pic); return Promise.resolve(''); }