diff --git a/package-lock.json b/package-lock.json index 9b2afb80..53fda2ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "lx-music-desktop", - "version": "2.9.0-beta.3", + "version": "2.9.0-beta.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "lx-music-desktop", - "version": "2.9.0-beta.3", + "version": "2.9.0-beta.4", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { @@ -15,14 +15,14 @@ "bufferutil": "^4.0.8", "comlink": "~4.3.1", "crypto-js": "^4.2.0", - "electron-log": "^5.1.6", + "electron-log": "^5.1.7", "font-list": "^1.5.1", "iconv-lite": "^0.6.3", "image-size": "^1.1.0", "jschardet": "^3.1.3", "long": "^5.2.3", "message2call": "^0.1.3", - "music-metadata": "^9.0.3", + "music-metadata": "^10.0.0", "needle": "github:lyswhut/needle#93299ac841b7e9a9f82ca7279b88aaaeda404060", "node-id3": "^0.2.6", "sortablejs": "^1.15.2", @@ -47,7 +47,7 @@ "@types/tunnel": "^0.0.7", "@types/ws": "8.5.4", "@volar/vue-language-plugin-pug": "^1.6.5", - "@vue/language-plugin-pug": "^2.0.26", + "@vue/language-plugin-pug": "^2.0.28", "babel-loader": "^9.1.3", "browserslist": "^4.23.2", "chalk": "^4.1.2", @@ -62,7 +62,7 @@ "electron-builder": "^24.13.3", "electron-debug": "^3.2.0", "electron-devtools-installer": "github:lyswhut/electron-devtools-installer#64596d615c1fc891eefd8aef1dfcb2c87aaadf03", - "electron-to-chromium": "^1.4.832", + "electron-to-chromium": "^1.5.0", "electron-updater": "^6.2.1", "eslint": "^8.57.0", "eslint-config-standard": "^17.1.0", @@ -91,7 +91,7 @@ "terser-webpack-plugin": "^5.3.10", "tree-kill": "^1.2.2", "ts-loader": "^9.5.1", - "typescript": "^5.5.3", + "typescript": "^5.5.4", "vue-eslint-parser": "^9.4.3", "vue-loader": "^17.4.2", "vue-template-compiler": "^2.7.16", @@ -3541,19 +3541,19 @@ "integrity": "sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA==" }, "node_modules/@vue/language-plugin-pug": { - "version": "2.0.26", - "resolved": "https://registry.npmjs.org/@vue/language-plugin-pug/-/language-plugin-pug-2.0.26.tgz", - "integrity": "sha512-+D6E5U3nAPpmAb58LT0Qa2rtB+IuyIBIDxnI05cziuwiGjlNGadzXgZb8/oOxpgXeTXB9Qg05c1yABf/VpmEyg==", + "version": "2.0.28", + "resolved": "https://registry.npmjs.org/@vue/language-plugin-pug/-/language-plugin-pug-2.0.28.tgz", + "integrity": "sha512-m6IFIv7VyPxnYYO/mQ9EWm5xwEpb80qfwOXpsNm1u4/irny659ayuIjf+IC5M8kGOo+Wt4gQqDMMtYuBDg4QAA==", "dev": true, "dependencies": { - "@volar/source-map": "~2.4.0-alpha.15", - "volar-service-pug": "volar-2.4" + "@volar/source-map": "~2.4.0-alpha.18", + "volar-service-pug": "0.0.59" } }, "node_modules/@vue/language-plugin-pug/node_modules/@volar/source-map": { - "version": "2.4.0-alpha.15", - "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.0-alpha.15.tgz", - "integrity": "sha512-8Htngw5TmBY4L3ClDqBGyfLhsB8EmoEXUH1xydyEtEoK0O6NX5ur4Jw8jgvscTlwzizyl/wsN1vn0cQXVbbXYg==", + "version": "2.4.0-alpha.18", + "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.0-alpha.18.tgz", + "integrity": "sha512-MTeCV9MUwwsH0sNFiZwKtFrrVZUK6p8ioZs3xFzHc2cvDXHWlYN3bChdQtwKX+FY2HG6H3CfAu1pKijolzIQ8g==", "dev": true }, "node_modules/@vue/reactivity": { @@ -7052,9 +7052,9 @@ } }, "node_modules/electron-log": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.1.6.tgz", - "integrity": "sha512-o7+gNnlth67wexW7ym4niGAghXE5GZ7J1bhdNBSnqGeiMQwJ0Mhr7/HtDw2m/2thCngaOsvfjU5FDZs81TCcXw==", + "version": "5.1.7", + "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.1.7.tgz", + "integrity": "sha512-/PjrS9zGkrZCDTHt6IgNE3FeciBbi4wd7U76NG9jAoNXF99E9IJdvBkqvaUJ1NjLojYDKs0kTvn9YhKy1/Zi+Q==", "engines": { "node": ">= 14" } @@ -7110,9 +7110,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.832", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.832.tgz", - "integrity": "sha512-cTen3SB0H2SGU7x467NRe1eVcQgcuS6jckKfWJHia2eo0cHIGOqHoAxevIYZD4eRHcWjkvFzo93bi3vJ9W+1lA==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.0.tgz", + "integrity": "sha512-Vb3xHHYnLseK8vlMJQKJYXJ++t4u1/qJ3vykuVrVjvdiOEhYyT1AuP4x03G8EnPmYvYOhe9T+dADTmthjRQMkA==", "dev": true }, "node_modules/electron-updater": { @@ -11460,9 +11460,9 @@ } }, "node_modules/music-metadata": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/music-metadata/-/music-metadata-9.0.3.tgz", - "integrity": "sha512-AiBqSKiAl/vb4j/fPpwk4hmUix9iGEGmW4tgJa4Wb5WwBeZfERICp2y1LuyM9Ve7jXVhbDWMwZsl6KED8bLFxA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/music-metadata/-/music-metadata-10.0.0.tgz", + "integrity": "sha512-/JJ9nubnGdZY/teJR4KgPsDCMd4DejnGTvRRWGmyfTly8aGHqmpFa5q3j/xV5I/vE+n1aXA8Q/JqCq7J79vJFg==", "funding": [ { "type": "github", @@ -16428,9 +16428,9 @@ } }, "node_modules/typescript": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz", - "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "devOptional": true, "bin": { "tsc": "bin/tsc", @@ -16833,45 +16833,45 @@ } }, "node_modules/volar-service-pug": { - "version": "0.0.56", - "resolved": "https://registry.npmjs.org/volar-service-pug/-/volar-service-pug-0.0.56.tgz", - "integrity": "sha512-NaobSQiuAFBTzBE7YHAyHyCZXqVNFFbXvuXTtXsJP6LR1lvBWg7IUgg45kzV1OS146qq2cmY3lryhlNRHwCmmg==", + "version": "0.0.59", + "resolved": "https://registry.npmjs.org/volar-service-pug/-/volar-service-pug-0.0.59.tgz", + "integrity": "sha512-kmch7yoqeGNlJuDzpw/YL2b89ilzBmWDd0lJbpG412/RXc3PJVA4usUK+SQHdVoF+qi5IcZL6IDxlvRiIrDgWg==", "dev": true, "dependencies": { - "@volar/language-service": "~2.4.0-alpha.1", + "@volar/language-service": "~2.4.0-alpha.12", "muggle-string": "^0.4.1", "pug-lexer": "^5.0.1", "pug-parser": "^6.0.0", - "volar-service-html": "0.0.56", + "volar-service-html": "0.0.59", "vscode-html-languageservice": "^5.3.0", "vscode-languageserver-textdocument": "^1.0.11" } }, "node_modules/volar-service-pug/node_modules/@volar/language-core": { - "version": "2.4.0-alpha.15", - "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.0-alpha.15.tgz", - "integrity": "sha512-mt8z4Fm2WxfQYoQHPcKVjLQV6PgPqyKLbkCVY2cr5RSaamqCHjhKEpsFX66aL4D/7oYguuaUw9Bx03Vt0TpIIA==", + "version": "2.4.0-alpha.18", + "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.0-alpha.18.tgz", + "integrity": "sha512-JAYeJvYQQROmVRtSBIczaPjP3DX4QW1fOqW1Ebs0d3Y3EwSNRglz03dSv0Dm61dzd0Yx3WgTW3hndDnTQqgmyg==", "dev": true, "dependencies": { - "@volar/source-map": "2.4.0-alpha.15" + "@volar/source-map": "2.4.0-alpha.18" } }, "node_modules/volar-service-pug/node_modules/@volar/language-service": { - "version": "2.4.0-alpha.15", - "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.0-alpha.15.tgz", - "integrity": "sha512-H5T5JvvqvWhG0PvvKPTM0nczTbTKQ+U87a8r0eahlH/ySi2HvIHO/7PiNKLxKqLNsiT8SX4U3QcGC8ZaNcC07g==", + "version": "2.4.0-alpha.18", + "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.0-alpha.18.tgz", + "integrity": "sha512-EuetrtbEtudi9buinWAG5U3Jam5dY27zXd/7GYnx542kBwanWOBM8i4DAQd0z7M11fOxXgybxPA933uaSyaOog==", "dev": true, "dependencies": { - "@volar/language-core": "2.4.0-alpha.15", + "@volar/language-core": "2.4.0-alpha.18", "vscode-languageserver-protocol": "^3.17.5", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" } }, "node_modules/volar-service-pug/node_modules/@volar/source-map": { - "version": "2.4.0-alpha.15", - "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.0-alpha.15.tgz", - "integrity": "sha512-8Htngw5TmBY4L3ClDqBGyfLhsB8EmoEXUH1xydyEtEoK0O6NX5ur4Jw8jgvscTlwzizyl/wsN1vn0cQXVbbXYg==", + "version": "2.4.0-alpha.18", + "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.0-alpha.18.tgz", + "integrity": "sha512-MTeCV9MUwwsH0sNFiZwKtFrrVZUK6p8ioZs3xFzHc2cvDXHWlYN3bChdQtwKX+FY2HG6H3CfAu1pKijolzIQ8g==", "dev": true }, "node_modules/volar-service-pug/node_modules/muggle-string": { @@ -16881,9 +16881,9 @@ "dev": true }, "node_modules/volar-service-pug/node_modules/volar-service-html": { - "version": "0.0.56", - "resolved": "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.56.tgz", - "integrity": "sha512-OwDRiASNqFxAFdO55CZ0/XKnPt7WGw8CoaM/g6QzExikPZ92ySbK/kvh1zi6WR3w+hP6C4BNeVITzOk9tjgNGw==", + "version": "0.0.59", + "resolved": "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.59.tgz", + "integrity": "sha512-hEXOsYpILDlITZxnqRLV9OepVWD63GZBsyjMxszwdzlxvGZjzbGcBBinJGGJRwFIV8djdJwnt91bkdg1V5tj6Q==", "dev": true, "dependencies": { "vscode-html-languageservice": "^5.3.0", @@ -16891,7 +16891,7 @@ "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.4.0-alpha.1" + "@volar/language-service": "~2.4.0-alpha.12" }, "peerDependenciesMeta": { "@volar/language-service": { diff --git a/package.json b/package.json index 3eeaa3ae..18ada799 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lx-music-desktop", - "version": "2.9.0-beta.3", + "version": "2.9.0-beta.4", "description": "一个免费的音乐查找助手", "main": "./dist/main.js", "productName": "lx-music-desktop", @@ -122,7 +122,7 @@ "@types/tunnel": "^0.0.7", "@types/ws": "8.5.4", "@volar/vue-language-plugin-pug": "^1.6.5", - "@vue/language-plugin-pug": "^2.0.26", + "@vue/language-plugin-pug": "^2.0.28", "babel-loader": "^9.1.3", "browserslist": "^4.23.2", "chalk": "^4.1.2", @@ -137,7 +137,7 @@ "electron-builder": "^24.13.3", "electron-debug": "^3.2.0", "electron-devtools-installer": "github:lyswhut/electron-devtools-installer#64596d615c1fc891eefd8aef1dfcb2c87aaadf03", - "electron-to-chromium": "^1.4.832", + "electron-to-chromium": "^1.5.0", "electron-updater": "^6.2.1", "eslint": "^8.57.0", "eslint-config-standard": "^17.1.0", @@ -166,7 +166,7 @@ "terser-webpack-plugin": "^5.3.10", "tree-kill": "^1.2.2", "ts-loader": "^9.5.1", - "typescript": "^5.5.3", + "typescript": "^5.5.4", "vue-eslint-parser": "^9.4.3", "vue-loader": "^17.4.2", "vue-template-compiler": "^2.7.16", @@ -182,14 +182,14 @@ "bufferutil": "^4.0.8", "comlink": "~4.3.1", "crypto-js": "^4.2.0", - "electron-log": "^5.1.6", + "electron-log": "^5.1.7", "font-list": "^1.5.1", "iconv-lite": "^0.6.3", "image-size": "^1.1.0", "jschardet": "^3.1.3", "long": "^5.2.3", "message2call": "^0.1.3", - "music-metadata": "^9.0.3", + "music-metadata": "^10.0.0", "needle": "github:lyswhut/needle#93299ac841b7e9a9f82ca7279b88aaaeda404060", "node-id3": "^0.2.6", "sortablejs": "^1.15.2", diff --git a/src/renderer/utils/music.ts b/src/renderer/utils/music.ts index 2e3a53c5..1a4f4234 100644 --- a/src/renderer/utils/music.ts +++ b/src/renderer/utils/music.ts @@ -182,8 +182,8 @@ export const getLocalMusicFileLyric = async(path: string): Promise 10) { - return metadata.common.lyrics[0] + if (metadata.common.lyrics?.[0]?.text && metadata.common.lyrics[0].text.length > 10) { + return metadata.common.lyrics[0].text } // console.log(metadata) for (const info of Object.values(metadata.native)) {