新增:封面嵌入、歌词下载;修复Bug

This commit is contained in:
lyswhut
2019-09-05 01:41:36 +08:00
parent 8a6ee68e58
commit 809be41e64
21 changed files with 193 additions and 21 deletions
+25 -2
View File
@@ -3,6 +3,7 @@ import { shell, remote, clipboard } from 'electron'
import path from 'path'
import os from 'os'
import crypto from 'crypto'
import { rendererSend } from '../../common/icp'
/**
* 获取两个数之间的随机整数,大于等于min,小于max
@@ -162,7 +163,7 @@ export const isChildren = (parent, children) => {
* @param {*} setting
*/
export const updateSetting = setting => {
const defaultVersion = '1.0.5'
const defaultVersion = '1.0.6'
const defaultSetting = {
version: defaultVersion,
player: {
@@ -178,6 +179,8 @@ export const updateSetting = setting => {
savePath: path.join(os.homedir(), 'Desktop'),
fileName: '歌名 - 歌手',
maxDownloadNum: 3,
isDownloadLrc: false,
isEmbedPic: true,
},
leaderboard: {
source: 'kw',
@@ -187,7 +190,7 @@ export const updateSetting = setting => {
source: 'kg',
sortId: '5',
tagInfo: {
name: '全部',
name: '默认',
id: null,
},
},
@@ -242,3 +245,23 @@ export const toMD5 = str => crypto.createHash('md5').update(str).digest('hex')
* @param {*} str
*/
export const clipboardWriteText = str => clipboard.writeText(str)
/**
* 设置音频 meta 信息
* @param {*} filePath
* @param {*} meta
*/
export const setMeta = (filePath, meta) => {
rendererSend('setMusicMeta', { filePath, meta })
}
/**
* 保存歌词文件
* @param {*} filePath
* @param {*} lrc
*/
export const saveLrc = (filePath, lrc) => {
fs.writeFile(filePath, lrc, 'utf8', err => {
if (err) console.log(err)
})
}
+1 -1
View File
@@ -89,7 +89,7 @@ export default {
},
getListUrl(sortType, tagName, page) {
return this.createUrl({
channelname: tagName || '全部',
channelname: tagName || '默认',
from: 'qianqianmini',
offset: (page - 1) * this.limit_list,
order_type: sortType,
+1 -1
View File
@@ -231,7 +231,7 @@ export default {
return info
})
)
if (!tagId && page === 1) tasks.push(this.getSongListRecommend()) // 如果是所有类别,则顺便获取推荐列表
if (!tagId && page === 1 && sortId === this.sortList[0].id) tasks.push(this.getSongListRecommend()) // 如果是所有类别,则顺便获取推荐列表
return Promise.all(tasks).then(([list, info, recommendList]) => {
if (recommendList) list.unshift(...recommendList)
return {
-2
View File
@@ -23,7 +23,6 @@ export default {
tagsUrl: 'http://wapi.kuwo.cn/api/pc/classify/playlist/getTagList?cmd=rcm_keyword_playlist&user=0&prod=kwplayer_pc_9.0.5.0&vipver=9.0.5.0&source=kwplayer_pc_9.0.5.0&loginUid=0&loginSid=0&appUid=76039576',
hotTagUrl: 'http://wapi.kuwo.cn/api/pc/classify/playlist/getRcmTagList?loginUid=0&loginSid=0&appUid=76039576',
getListUrl({ sortId, id, type, page }) {
console.log(id, type)
if (!id) return `http://wapi.kuwo.cn/api/pc/classify/playlist/getRcmPlayList?loginUid=0&loginSid=0&appUid=76039576&&pn=${page}&rn=${this.limit_list}&order=${sortId}`
switch (type) {
case '10000': return `http://wapi.kuwo.cn/api/pc/classify/playlist/getTagPlayList?loginUid=0&loginSid=0&appUid=76039576&pn=${page}&id=${id}&rn=${this.limit_list}`
@@ -145,7 +144,6 @@ export default {
desc: item.desc,
})))
})
console.log(list)
return list
},
+1
View File
@@ -15,4 +15,5 @@ export const getMusicType = (info, type) => {
for (const type of rangeType) {
if (info._types[type]) return type
}
return '128k'
}
+1 -1
View File
@@ -41,8 +41,8 @@ const buildHttpPromose = (url, options) => {
const obj = {
promise: p,
cancelHttp() {
console.log('cancel')
if (!requestObj) return
console.log('cancel')
cancelHttp(requestObj)
cancelFn(new Error(requestMsg.cancelRequest))
requestObj = null