diff --git a/.eslintrc b/.eslintrc index c4483315..be478c5c 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,9 +1,15 @@ { - "extends": "standard", + "extends": [ + "plugin:vue/vue3-recommended", + "standard" + ], "plugins": [ "html" ], - "parser": "babel-eslint", + "parser": "vue-eslint-parser", + "parserOptions": { + "parser": "babel-eslint" + }, "rules": { "no-new": "off", "camelcase": "off", @@ -18,7 +24,8 @@ "standard/no-callback-literal": "off", "prefer-const": "off", "no-labels": "off", - "node/no-callback-literal": "off" + "node/no-callback-literal": "off", + "vue/multi-word-component-names": "off" }, "settings": { "html/html-extensions": [".html", ".vue"] diff --git a/CHANGELOG.md b/CHANGELOG.md index 1307a1da..7545885a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,12 +21,6 @@ Change log format is based on [Keep a Changelog](http://keepachangelog.com/). - 降级electron到v13.4.0（这修复了windows 7下播放歌曲时软件会崩溃的问题） -## [1.15.3](https://github.com/lyswhut/lx-music-desktop/compare/v1.15.1...v1.15.3) - 2021-11-09 - -### 其他 - -- 降级electron到v13.4.0（这修复了windows 7下播放歌曲时软件会崩溃的问题） - ## [1.15.1](https://github.com/lyswhut/lx-music-desktop/compare/v1.15.0...v1.15.1) - 2021-11-09 ### 优化 diff --git a/package-lock.json b/package-lock.json index d969cfca..e1c4605b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8041,6 +8041,44 @@ "integrity": "sha1-DDvzpn6FP4u7xYD7SUX78W9Bt8U=", "dev": true }, + "eslint-plugin-vue": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.1.1.tgz", + "integrity": "sha512-rx64IrlhdfPya6u2V5ukOGiLCTgaCBdMSpczLVqyo8A0l+Vbo+lzvIfEUfAQ2auj+MF6y0TwxLorzdCIzHunnw==", + "dev": true, + "requires": { + "eslint-utils": "^3.0.0", + "natural-compare": "^1.4.0", + "semver": "^7.3.5", + "vue-eslint-parser": "^8.0.1" + }, + "dependencies": { + "eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^2.0.0" + } + }, + "eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true + }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + } + } + }, "eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -15131,6 +15169,74 @@ "@vue/shared": "3.2.23" } }, + "vue-eslint-parser": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.0.1.tgz", + "integrity": "sha512-lhWjDXJhe3UZw2uu3ztX51SJAPGPey1Tff2RK3TyZURwbuI4vximQLzz4nQfCv8CZq4xx7uIiogHMMoSJPr33A==", + "dev": true, + "requires": { + "debug": "^4.3.2", + "eslint-scope": "^6.0.0", + "eslint-visitor-keys": "^3.0.0", + "espree": "^9.0.0", + "esquery": "^1.4.0", + "lodash": "^4.17.21", + "semver": "^7.3.5" + }, + "dependencies": { + "acorn": { + "version": "8.6.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz", + "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==", + "dev": true + }, + "debug": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "eslint-scope": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-6.0.0.tgz", + "integrity": "sha512-uRDL9MWmQCkaFus8RF5K9/L/2fn+80yoW3jkD53l4shjCh26fCtvJGasxjUqP5OT87SYTxCVA3BwTUzuELx9kA==", + "dev": true, + "requires": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + } + }, + "eslint-visitor-keys": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", + "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", + "dev": true + }, + "espree": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.1.0.tgz", + "integrity": "sha512-ZgYLvCS1wxOczBYGcQT9DDWgicXwJ4dbocr9uYN+/eresBAUuBu+O4WzB21ufQ/JqQT8gyp7hJ3z8SHii32mTQ==", + "dev": true, + "requires": { + "acorn": "^8.6.0", + "acorn-jsx": "^5.3.1", + "eslint-visitor-keys": "^3.1.0" + } + }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + } + } + }, "vue-i18n": { "version": "9.2.0-beta.22", "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.2.0-beta.22.tgz", diff --git a/package.json b/package.json index 5153b619..4ee56f2a 100644 --- a/package.json +++ b/package.json @@ -200,6 +200,7 @@ "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^5.2.0", "eslint-plugin-standard": "^4.1.0", + "eslint-plugin-vue": "^8.1.1", "eslint-webpack-plugin": "^3.1.1", "file-loader": "^6.2.0", "friendly-errors-webpack-plugin": "^1.7.0", diff --git a/src/renderer/components/core/Aside/Nav.vue b/src/renderer/components/core/Aside/NavBar.vue similarity index 100% rename from src/renderer/components/core/Aside/Nav.vue rename to src/renderer/components/core/Aside/NavBar.vue diff --git a/src/renderer/components/core/Aside/index.vue b/src/renderer/components/core/Aside/index.vue index 89c1b896..f2af582a 100644 --- a/src/renderer/components/core/Aside/index.vue +++ b/src/renderer/components/core/Aside/index.vue @@ -2,7 +2,7 @@
L X
-
@@ -10,10 +10,10 @@ import { mapGetters } from 'vuex' import ControlBtns from './ControlBtns' -import Nav from './Nav' +import NavBar from './NavBar' export default { - components: { ControlBtns, Nav }, + components: { ControlBtns, NavBar }, computed: { ...mapGetters(['setting']), }, diff --git a/src/renderer/components/core/PlayDetail/Lyric.vue b/src/renderer/components/core/PlayDetail/LyricPlayer.vue similarity index 100% rename from src/renderer/components/core/PlayDetail/Lyric.vue rename to src/renderer/components/core/PlayDetail/LyricPlayer.vue diff --git a/src/renderer/components/core/PlayDetail/index.vue b/src/renderer/components/core/PlayDetail/index.vue index fd17f161..7dfca309 100644 --- a/src/renderer/components/core/PlayDetail/index.vue +++ b/src/renderer/components/core/PlayDetail/index.vue @@ -28,7 +28,7 @@ transition(enter-active-class="animated lightSpeedIn" leave-active-class="animat p(v-if="musicInfo.album") {{$t('player__music_album')}}{{musicInfo.album}} transition(enter-active-class="animated fadeIn" leave-active-class="animated fadeOut") - Lyric(v-if="visibleLrc") + LyricPlayer(v-if="visibleLrc") core-music-comment(:class="$style.comment" :musicInfo="musicInfoItem" :show="isShowPlayComment" @close="hideComment") play-bar @@ -46,12 +46,12 @@ import { musicInfoItem, musicInfo, } from '@renderer/core/share/player' -import Lyric from './Lyric' +import LyricPlayer from './LyricPlayer' import PlayBar from './PlayBar' export default { components: { - Lyric, + LyricPlayer, PlayBar, }, setup() { diff --git a/src/renderer/core/useApp/useDataInit.js b/src/renderer/core/useApp/useDataInit.js index 8929d61a..c21e4b27 100644 --- a/src/renderer/core/useApp/useDataInit.js +++ b/src/renderer/core/useApp/useDataInit.js @@ -97,22 +97,9 @@ const usePlayInfoInit = () => { return downloadList => { return getPlayInfo().then(info => { window.restorePlayInfo = null - if (!info) return - if (info.index < 0) return - if (info.listId) { - if (info.listId == 'download') { - const list = downloadList - // console.log(list) - if (!list || !list[info.index]) return - info.list = list - } else { - const list = getList(info.listId) - // console.log(list) - if (!list[info.index]) return - info.list = list - } - } - if (!info.list || !info.list[info.index]) return + if (!info?.listId || info.index < 0) return + const list = getList(info.listId) + if (!list || !list[info.index]) return window.restorePlayInfo = info setPlayList({ listId: info.listId, diff --git a/src/renderer/core/useApp/usePlayer/usePlayer.js b/src/renderer/core/useApp/usePlayer/usePlayer.js index e23bd0ce..d0e71468 100644 --- a/src/renderer/core/useApp/usePlayer/usePlayer.js +++ b/src/renderer/core/useApp/usePlayer/usePlayer.js @@ -182,7 +182,7 @@ export default ({ setting }) => { }, }) - setImg(playMusicInfo) + setImg({ musicInfo: musicInfoItem.value, listId: playMusicInfo.listId }) setLrc(musicInfoItem.value) if (setting.value.player.togglePlayMethod == 'random') setPlayedList({ ...playMusicInfo }) } diff --git a/src/renderer/plugins/Dialog/Dialog.vue b/src/renderer/plugins/Dialog/Dialog.vue index 310fc03f..833047e3 100644 --- a/src/renderer/plugins/Dialog/Dialog.vue +++ b/src/renderer/plugins/Dialog/Dialog.vue @@ -39,7 +39,7 @@ export default { return this.confirmButtonText || this.$t('confirm_button_text') }, }, - beforeDestroy() { + beforeUnmount() { const el = this.$el el.parentNode.removeChild(el) }, diff --git a/src/renderer/plugins/lyric/index.js b/src/renderer/plugins/lyric/index.js deleted file mode 100644 index ec6de577..00000000 --- a/src/renderer/plugins/lyric/index.js +++ /dev/null @@ -1,24 +0,0 @@ -import { onBeforeUnmount, ref, computed, useI18n, watch, useCommit } from '@renderer/utils/vueTools' -import { formatPlayTime2 } from '@renderer/utils' - -import { setLoopPlay } from '../player' - -export default ({ setting }) => { - const { t } = useI18n() - - const toggleDesktopLyricBtnTitle = computed(() => { - return `${ - setting.value.desktopLyric.enable - ? t('desktop_lyric__off') - : t('desktop_lyric__on') - }（${ - setting.value.desktopLyric.isLock - ? t('desktop_lyric__unlock') - : t('desktop_lyric__lock') - }）` - }) - - return { - toggleDesktopLyricBtnTitle, - } -} diff --git a/src/renderer/plugins/lyric/useLyric.js b/src/renderer/plugins/lyric/useLyric.js deleted file mode 100644 index 81067b4f..00000000 --- a/src/renderer/plugins/lyric/useLyric.js +++ /dev/null @@ -1,48 +0,0 @@ -import { useRefGetter, reactive, computed, watch, useCommit } from '@renderer/utils/vueTools' -import Lyric from '@renderer/utils/lyric-font-player' -import { getCurrentTime } from '@renderer/plugins/player' -import { setDesktopLyricInfo } from '@renderer/utils/tools' - -// let lrc = window.lrc - -export default ({ setting, musicInfo, isPlay, listId, setStatusText }) => { - const lyric = reactive({ - lines: [], - text: '', - line: 0, - }) - - const lrc = window.lrc = new Lyric({ - lineClassName: 'lrc-content', - fontClassName: 'font', - shadowContent: false, - activeLineClassName: 'active', - onPlay: (line, text) => { - lyric.text = text - lyric.line = line - setStatusText(text) - // console.log(line, text) - }, - onSetLyric: lines => { // listening lyrics seting event - // console.log(lines) // lines is array of all lyric text - lyric.lines = lines - lyric.line = 0 - }, - // offset: 80, - }) - - - const setLyric = () => { - lrc.setLyric( - setting.value.player.isPlayLxlrc && musicInfo.value.lxlrc ? musicInfo.vlaue.lxlrc : musicInfo.vlaue.lrc, - setting.value.player.isShowLyricTranslation && musicInfo.value.tlrc ? musicInfo.value.tlrc : '', - ) - if (isPlay.value && (musicInfo.value.url || listId.value == 'download')) { - const time = getCurrentTime() * 1000 - setDesktopLyricInfo('play', time) - lrc.play(time) - } - } - watch(setting.value.player.isShowLyricTranslation, setLyric) - watch(setting.value.player.isPlayLxlrc, setLyric) -} diff --git a/src/renderer/store/modules/list.js b/src/renderer/store/modules/list.js index 29630bff..8e2cdc01 100644 --- a/src/renderer/store/modules/list.js +++ b/src/renderer/store/modules/list.js @@ -391,8 +391,8 @@ const mutations = { window.eventHub.emit(eventListNames.listChange, [id]) }, clearCache() { - const [listIds, lists] = Object.entries(allList) - for (const { list } of lists) { + const lists = Object.values(allList) + for (const list of lists) { for (const item of list) { if (item.otherSource) item.otherSource = null if (item.typeUrl['128k']) delete item.typeUrl['128k'] @@ -408,7 +408,7 @@ const mutations = { } clearMusicUrl() clearLyric() - window.eventHub.emit(eventListNames.listChange, listIds) + window.eventHub.emit(eventListNames.listChange, Object.keys(allList)) }, setOtherSource(state, { musicInfo, otherSource }) { musicInfo.otherSource = otherSource diff --git a/src/renderer/views/Download.vue b/src/renderer/views/Download.vue index 19b75c9c..ed4e45a4 100644 --- a/src/renderer/views/Download.vue +++ b/src/renderer/views/Download.vue @@ -192,7 +192,7 @@ export default { created() { this.listenEvent() }, - beforeDestroy() { + beforeUnmount() { this.unlistenEvent() }, methods: { diff --git a/src/renderer/views/Search.vue b/src/renderer/views/Search.vue index 2089fe54..0ed2d18b 100644 --- a/src/renderer/views/Search.vue +++ b/src/renderer/views/Search.vue @@ -120,7 +120,7 @@ export default { created() { this.listenEvent() }, - beforeDestroy() { + beforeUnmount() { this.unlistenEvent() }, mounted() { diff --git a/src/renderer/views/list/List.vue b/src/renderer/views/list/List.vue index 878dab28..5f2a5c52 100644 --- a/src/renderer/views/list/List.vue +++ b/src/renderer/views/list/List.vue @@ -1,6 +1,6 @@