github
/
lx-music-desktop
mirror of https://github.com/lyswhut/lx-music-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

更新依赖

pull/389/head
lyswhut 2020-11-10 10:59:45 +08:00
parent b820adf0bf
commit 4cdd2110a6
9 changed files with 71 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
package-lock.json generated
View File

@ -4703,9 +4703,9 @@
"dev": true
},
"boolean": {
"version": "3.0.1",
"resolved": "https://registry.npm.taobao.org/boolean/download/boolean-3.0.1.tgz",
"integrity": "sha1-NezytKLuGRsLRJhvFOtfBSpcu08=",
"version": "3.0.2",
"resolved": "https://registry.npm.taobao.org/boolean/download/boolean-3.0.2.tgz",
"integrity": "sha1-3xuqGLaisOcIQEdeHZPsj+dbJXA=",
"dev": true,
"optional": true
},
@ -5950,9 +5950,9 @@
"dev": true
},
"copy-webpack-plugin": {
"version": "6.2.1",
"resolved": "https://registry.npm.taobao.org/copy-webpack-plugin/download/copy-webpack-plugin-6.2.1.tgz",
"integrity": "sha1-gBXk1cXmN6t7Ocdtqp4Dx6S/GuU=",
"version": "6.3.0",
"resolved": "https://registry.npm.taobao.org/copy-webpack-plugin/download/copy-webpack-plugin-6.3.0.tgz?cache=0&sync_timestamp=1604418450281&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcopy-webpack-plugin%2Fdownload%2Fcopy-webpack-plugin-6.3.0.tgz",
"integrity": "sha1-kYILY7vefXNgmsy4bat+c4aGP28=",
"dev": true,
"requires": {
"cacache": "^15.0.5",
@ -6117,9 +6117,9 @@
}
},
"core-js": {
"version": "3.6.5",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
"version": "3.7.0",
"resolved": "https://registry.npm.taobao.org/core-js/download/core-js-3.7.0.tgz?cache=0&sync_timestamp=1604675498528&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-3.7.0.tgz",
"integrity": "sha1-sKdhoCSIV3r7+XF55Ggb9JVoUg8=",
"dev": true
},
"core-js-compat": {
@ -7081,9 +7081,9 @@
}
},
"electron": {
"version": "9.3.3",
"resolved": "https://registry.npm.taobao.org/electron/download/electron-9.3.3.tgz",
"integrity": "sha1-maZhnV32j5dpel0dgu86imP83zY=",
"version": "9.3.4",
"resolved": "https://registry.npm.taobao.org/electron/download/electron-9.3.4.tgz?cache=0&sync_timestamp=1604968518869&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron%2Fdownload%2Felectron-9.3.4.tgz",
"integrity": "sha1-1i3Z+KvJPACYeHFN6eYNsDA2GgU=",
"dev": true,
"requires": {
"@electron/get": "^1.0.1",
@ -7092,9 +7092,9 @@
},
"dependencies": {
"@types/node": {
"version": "12.19.2",
"resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-12.19.2.tgz",
"integrity": "sha1-lWXtXHK6lgOPw63WQ+3V54IFmOc=",
"version": "12.19.4",
"resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-12.19.4.tgz?cache=0&sync_timestamp=1604951079891&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-12.19.4.tgz",
"integrity": "sha1-zfu2LibHQ17ZqrnJQTk8w1mOm0Y=",
"dev": true
}
}
@ -7205,9 +7205,9 @@
}
},
"electron-log": {
"version": "4.2.4",
"resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.2.4.tgz",
"integrity": "sha512-CXbDU+Iwi+TjKzugKZmTRIORIPe3uQRqgChUl19fkW/reFUn5WP7dt+cNGT3bkLV8xfPilpkPFv33HgtmLLewQ=="
"version": "4.3.0",
"resolved": "https://registry.npm.taobao.org/electron-log/download/electron-log-4.3.0.tgz?cache=0&sync_timestamp=1604284727663&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-log%2Fdownload%2Felectron-log-4.3.0.tgz",
"integrity": "sha1-boQaXJrzTtPKg+WopBVv3Dm+1GQ="
},
"electron-publish": {
"version": "22.9.1",
@ -7521,9 +7521,9 @@
"dev": true
},
"eslint": {
"version": "7.12.1",
"resolved": "https://registry.npm.taobao.org/eslint/download/eslint-7.12.1.tgz?cache=0&sync_timestamp=1603768145986&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint%2Fdownload%2Feslint-7.12.1.tgz",
"integrity": "sha1-vZqB+memz9UWVs24iBLOSczsWAE=",
"version": "7.13.0",
"resolved": "https://registry.npm.taobao.org/eslint/download/eslint-7.13.0.tgz",
"integrity": "sha1-fxgBJsDc3vMnv7VLIR14At7MCNo=",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
@ -7632,8 +7632,8 @@
},
"eslint-config-standard": {
"version": "14.1.1",
"resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-14.1.1.tgz",
"integrity": "sha512-Z9B+VR+JIXRxz21udPTL9HpFMyoMUEeX1G251EQ6e05WD9aPVtVBn09XUmZ259wCMlCDmYDSZG62Hhm+ZTJcUg==",
"resolved": "https://registry.npm.taobao.org/eslint-config-standard/download/eslint-config-standard-14.1.1.tgz?cache=0&sync_timestamp=1604090914442&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-config-standard%2Fdownload%2Feslint-config-standard-14.1.1.tgz",
"integrity": "sha1-gwqOROeu995nRkl5rQa0BgJsVuo=",
"dev": true
},
"eslint-formatter-friendly": {
@ -11428,18 +11428,24 @@
}
},
"markdown-it": {
"version": "11.0.1",
"resolved": "https://registry.npm.taobao.org/markdown-it/download/markdown-it-11.0.1.tgz?cache=0&sync_timestamp=1600069708850&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmarkdown-it%2Fdownload%2Fmarkdown-it-11.0.1.tgz",
"integrity": "sha1-tU8V7Cohk++mbdoetBc7rqCJk9Y=",
"version": "12.0.2",
"resolved": "https://registry.npm.taobao.org/markdown-it/download/markdown-it-12.0.2.tgz?cache=0&sync_timestamp=1603472606302&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmarkdown-it%2Fdownload%2Fmarkdown-it-12.0.2.tgz",
"integrity": "sha1-RAG+ro34qiIh/GVlpxiOYKBu8O0=",
"dev": true,
"requires": {
"argparse": "^1.0.7",
"argparse": "^2.0.1",
"entities": "~2.0.0",
"linkify-it": "^3.0.1",
"mdurl": "^1.0.1",
"uc.micro": "^1.0.5"
},
"dependencies": {
"argparse": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/argparse/download/argparse-2.0.1.tgz",
"integrity": "sha1-JG9Q88p4oyQPbJl+ipvR6sSeSzg=",
"dev": true
},
"entities": {
"version": "2.0.3",
"resolved": "https://registry.npm.taobao.org/entities/download/entities-2.0.3.tgz",
@ -16726,9 +16732,9 @@
"integrity": "sha1-ud0Jihfh9a25G9+WEfA4UxDafLE="
},
"vue-loader": {
"version": "15.9.4",
"resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-15.9.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-15.9.4.tgz",
"integrity": "sha1-wuzvihoIAqx2xtaGZBtd3lIq4mc=",
"version": "15.9.5",
"resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-15.9.5.tgz?cache=0&sync_timestamp=1604764636407&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-15.9.5.tgz",
"integrity": "sha1-epYNxCCjQ53qrN2gOP3Nv3xDJwY=",
"dev": true,
"requires": {
"@vue/component-compiler-utils": "^3.1.0",
@ -16739,9 +16745,9 @@
}
},
"vue-router": {
"version": "3.4.8",
"resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.8.tgz?cache=0&sync_timestamp=1603710629657&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.8.tgz",
"integrity": "sha1-LAYmHTXYB1iTRwNS1C1wtih7gZQ="
"version": "3.4.9",
"resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.9.tgz?cache=0&sync_timestamp=1604611494091&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.9.tgz",
"integrity": "sha1-wBb0IDCuKTLxTkdIs5odmg4lDmY="
},
"vue-style-loader": {
"version": "4.1.2",

16
package.json
View File

@ -171,16 +171,16 @@
"cfonts": "^2.8.6",
"chalk": "^4.1.0",
"changelog-parser": "^2.8.0",
"copy-webpack-plugin": "^6.2.1",
"core-js": "^3.6.5",
"copy-webpack-plugin": "^6.3.0",
"core-js": "^3.7.0",
"cross-env": "^7.0.2",
"css-loader": "^4.3.0",
"del": "^6.0.0",
"electron": "^9.3.3",
"electron": "^9.3.4",
"electron-builder": "^22.9.1",
"electron-debug": "^3.1.0",
"electron-devtools-installer": "^3.1.1",
"eslint": "^7.12.1",
"eslint": "^7.13.0",
"eslint-config-standard": "^14.1.1",
"eslint-formatter-friendly": "^7.0.0",
"eslint-loader": "^4.0.2",
@ -194,7 +194,7 @@
"html-webpack-plugin": "^4.5.0",
"less": "^3.12.2",
"less-loader": "^7.0.2",
"markdown-it": "^11.0.1",
"markdown-it": "^12.0.2",
"mini-css-extract-plugin": "^0.12.0",
"optimize-css-assets-webpack-plugin": "^5.0.4",
"postcss-loader": "^4.0.4",
@ -209,7 +209,7 @@
"stylus-loader": "^4.2.0",
"terser-webpack-plugin": "^4.2.3",
"url-loader": "^4.1.1",
"vue-loader": "^15.9.4",
"vue-loader": "^15.9.5",
"vue-template-compiler": "^2.6.12",
"webpack": "^4.44.2",
"webpack-cli": "^3.3.12",
@ -220,7 +220,7 @@
"dependencies": {
"crypto-js": "^4.0.0",
"dnscache": "^1.0.2",
"electron-log": "^4.2.4",
"electron-log": "^4.3.0",
"electron-store": "^6.0.1",
"electron-updater": "^4.3.5",
"iconv-lite": "^0.6.2",
@ -232,7 +232,7 @@
"request": "^2.88.2",
"vue": "^2.6.12",
"vue-i18n": "^8.22.1",
"vue-router": "^3.4.8",
"vue-router": "^3.4.9",
"vuex": "^3.5.1",
"vuex-router-sync": "^5.0.0"
}

2
src/main/index.js
View File

@ -82,7 +82,7 @@ if (isDev) {
winURL = 'http://localhost:9080'
} else {
global.__static = path.join(__dirname, '/static')
winURL = `file://${__dirname}/index.html`
winURL = `file://${path.join(__dirname, 'index.html')}`
}
function createWindow() {

8
src/main/modules/hotKey/utils.js
View File

@ -23,9 +23,11 @@ exports.registerHotkey = ({ key, info }) => {
}
}
global.appHotKey.state[key].info = info
let status = global.appHotKey.state[key].status = globalShortcut.isRegistered(transKey) ? false : globalShortcut.register(transKey, () => {
handleKeyDown(key)
})
let status = global.appHotKey.state[key].status = globalShortcut.isRegistered(transKey)
? false
: globalShortcut.register(transKey, () => {
handleKeyDown(key)
})
return status
}

3
src/main/modules/winLyric/index.js
View File

@ -1,3 +1,4 @@
const path = require('path')
const { BrowserWindow } = require('electron')
const { winLyric: WIN_LYRIC_EVENT_NAME } = require('../../events/_name')
const { debounce } = require('../../../common/utils')
@ -13,7 +14,7 @@ global.lx_event.winLyric.on(WIN_LYRIC_EVENT_NAME.close, () => {
closeWindow()
})
let winURL = global.isDev ? 'http://localhost:9081/lyric.html' : `file://${__dirname}/lyric.html`
let winURL = global.isDev ? 'http://localhost:9081/lyric.html' : `file://${path.join(__dirname, 'lyric.html')}`
const setLyricsConfig = debounce(config => {
// if (x != null) bounds.x = x

12
src/renderer/store/modules/download.js
View File

@ -377,11 +377,13 @@ const actions = {
},
}
commit('setStatusText', { downloadInfo, text: '获取URL中...' })
let p = options.url ? Promise.resolve() : getUrl(downloadInfo).then(result => {
commit('updateUrl', { downloadInfo, url: result.url })
if (!result.url) return Promise.reject(new Error('获取URL失败'))
options.url = result.url
})
let p = options.url
? Promise.resolve()
: getUrl(downloadInfo).then(result => {
commit('updateUrl', { downloadInfo, url: result.url })
if (!result.url) return Promise.reject(new Error('获取URL失败'))
options.url = result.url
})
p.then(() => {
tryNum[downloadInfo.key] = 0
dls[downloadInfo.key] = download(options)

10
src/renderer/store/modules/songList.js
View File

@ -85,10 +85,12 @@ const actions = {
let source = rootState.setting.songList.source
const loadData = (id, page) => {
let key = `sdetail__${source}__${id}__${page}`
return cache.has(key) ? Promise.resolve(cache.get(key)) : music[source].songList.getListDetail(id, page).then(result => {
cache.set(key, result)
return result
})
return cache.has(key)
? Promise.resolve(cache.get(key))
: music[source].songList.getListDetail(id, page).then(result => {
cache.set(key, result)
return result
})
}
return loadData(id, 1).then(result => {
if (result.total <= result.limit) return result.list

2
src/renderer/utils/index.js
View File

@ -132,7 +132,7 @@ const handleScroll = (element, to, duration = 300, fn = () => {}) => {
* @param {*} fn 滚动完成后的回调
* @param {*} delay 延迟执行时间
*/
export const scrollTo = (element, to, duration = 300, fn = () => {}, delay) => {
export const scrollTo = (element, to, duration = 300, fn = () => {}, delay = 0) => {
let cancelFn
let timeout
if (delay) {

3
src/renderer/views/Search.vue
View File

@ -382,7 +382,8 @@ export default {
return this.searchSourceId == 'all'
? list.filter(s => this.assertApiSupport(s.source))
: this.assertApiSupport(this.searchSourceId)
? [...list] : []
? [...list]
: []
},
handleListAddModalClose() {
this.isShowListAdd = false