From 45d7a12d0df9a154b0994023662b3d6603268b26 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Mon, 5 Jul 2021 10:08:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../renderer-lyric/webpack.config.base.js | 2 +- build-config/renderer/webpack.config.base.js | 2 +- package-lock.json | 108 +++++++++--------- package.json | 18 +-- src/renderer/utils/index.js | 2 +- src/renderer/utils/music/bd/leaderboard.js | 2 +- src/renderer/utils/music/bd/musicSearch.js | 2 +- src/renderer/utils/music/kg/musicSearch.js | 2 +- src/renderer/utils/music/kw/musicSearch.js | 2 +- src/renderer/utils/music/mg/leaderboard.js | 2 +- src/renderer/utils/music/mg/leaderboard2.js | 2 +- src/renderer/utils/music/mg/musicSearch.js | 2 +- src/renderer/utils/music/tx/musicSearch.js | 2 +- src/renderer/utils/music/tx/songList.js | 7 +- 14 files changed, 77 insertions(+), 78 deletions(-) diff --git a/build-config/renderer-lyric/webpack.config.base.js b/build-config/renderer-lyric/webpack.config.base.js index 60f03eba..dd9ba8ea 100644 --- a/build-config/renderer-lyric/webpack.config.base.js +++ b/build-config/renderer-lyric/webpack.config.base.js @@ -18,7 +18,7 @@ module.exports = { filename: '[name].js', libraryTarget: 'commonjs2', path: path.join(__dirname, '../../dist/electron'), - publicPath: './', + publicPath: 'auto', }, resolve: { alias: { diff --git a/build-config/renderer/webpack.config.base.js b/build-config/renderer/webpack.config.base.js index 09d0e1e5..5d330a53 100644 --- a/build-config/renderer/webpack.config.base.js +++ b/build-config/renderer/webpack.config.base.js @@ -18,7 +18,7 @@ module.exports = { filename: '[name].js', libraryTarget: 'commonjs2', path: path.join(__dirname, '../../dist/electron'), - publicPath: './', + publicPath: 'auto', }, resolve: { alias: { diff --git a/package-lock.json b/package-lock.json index 9d2dc390..2420db6d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2953,6 +2953,23 @@ } } }, + "@humanwhocodes/config-array": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", + "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", + "dev": true, + "requires": { + "@humanwhocodes/object-schema": "^1.2.0", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + } + }, + "@humanwhocodes/object-schema": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz", + "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", + "dev": true + }, "@malept/cross-spawn-promise": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz", @@ -6849,9 +6866,9 @@ } }, "electron": { - "version": "13.1.4", - "resolved": "https://registry.npmjs.org/electron/-/electron-13.1.4.tgz", - "integrity": "sha512-4qhRZbRvGqHmMWsCG/kRVF4X8VIq9Nujgm+gXZLBSpiR6uUtMHy7ViBTQZl1PGf6O9Ppxhpr9Yz+k6Um9WoP3Q==", + "version": "13.1.5", + "resolved": "https://registry.npmjs.org/electron/-/electron-13.1.5.tgz", + "integrity": "sha512-ZoMCcPQNs/zO/Zdb5hq5H+rwRaKrdI3/sfXEwBVMx7f5jwa9jPQB3dZ2+7t59uD9VcFAWsH/pozr8nPPlv0tyw==", "dev": true, "requires": { "@electron/get": "^1.0.1", @@ -7094,9 +7111,9 @@ } }, "electron-to-chromium": { - "version": "1.3.732", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.732.tgz", - "integrity": "sha512-qKD5Pbq+QMk4nea4lMuncUMhpEiQwaJyCW7MrvissnRcBDENhVfDmAqQYRQ3X525oTzhar9Zh1cK0L2d1UKYcw==", + "version": "1.3.766", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.766.tgz", + "integrity": "sha512-u2quJ862q9reRKh/je3GXis3w38+RoXH1J9N3XjtsS6NzmUAosNsyZgUVFZPN/ZlJ3v6T0rTyZR3q/J5c6Sy5w==", "dev": true }, "electron-updater": { @@ -7362,13 +7379,14 @@ "dev": true }, "eslint": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.29.0.tgz", - "integrity": "sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA==", + "version": "7.30.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.30.0.tgz", + "integrity": "sha512-VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg==", "dev": true, "requires": { "@babel/code-frame": "7.12.11", "@eslint/eslintrc": "^0.4.2", + "@humanwhocodes/config-array": "^0.5.0", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -8674,9 +8692,9 @@ } }, "flatted": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz", - "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.0.tgz", + "integrity": "sha512-XprP7lDrVT+kE2c2YlfiV+IfS9zxukiIOvNamPNsImNhXadSsQEbosItdL9bUQlCZXR13SvPk20BjWSWLA7m4A==", "dev": true }, "follow-redirects": { @@ -9996,11 +10014,6 @@ } } }, - "js-htmlencode": { - "version": "0.3.0", - "resolved": "https://registry.npm.taobao.org/js-htmlencode/download/js-htmlencode-0.3.0.tgz", - "integrity": "sha1-sc4pPflOlviooIsfM2j5d70lVzE=" - }, "js-stringify": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz", @@ -10248,9 +10261,9 @@ } }, "less-loader": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-10.0.0.tgz", - "integrity": "sha512-JjioAkw9qyavL0BzMPUOHJa0a20fh+ipq/MNZH4OkU8qERsCMeZIWRE0FDBIx2O+cFguvY01vHh/lmBA9LyWDg==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-10.0.1.tgz", + "integrity": "sha512-Crln//HpW9M5CbtdfWm3IO66Cvx1WhZQvNybXgfB2dD/6Sav9ppw+IWqs/FQKPBFO4B6X0X28Z0WNznshgwUzA==", "dev": true, "requires": { "klona": "^2.0.4" @@ -10679,14 +10692,12 @@ "dev": true }, "mini-css-extract-plugin": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz", - "integrity": "sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.0.0.tgz", + "integrity": "sha512-LzJaninAMkfVAUDldZ4lUidAeS8GD0w8tSUbZLscYXWmdTOjYuEoiIhwKvwHX6+42D2cRAl35pA9DHtvAv71JQ==", "dev": true, "requires": { - "loader-utils": "^2.0.0", - "schema-utils": "^3.0.0", - "webpack-sources": "^1.1.0" + "schema-utils": "^3.0.0" }, "dependencies": { "ajv": { @@ -10707,17 +10718,6 @@ "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", "dev": true }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, "schema-utils": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz", @@ -10854,9 +10854,9 @@ "dev": true }, "needle": { - "version": "2.6.0", - "resolved": "https://registry.npm.taobao.org/needle/download/needle-2.6.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fneedle%2Fdownload%2Fneedle-2.6.0.tgz", - "integrity": "sha1-JNu1XyUJ4jJLSpnWH0E5ggE8zb4=", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.7.0.tgz", + "integrity": "sha512-b4f4JgOl7GZVM1p+xuWBAsHwflng1s2yOu9lOThKAzULRW7eqSFYfN4gbuUFOMuE0hVAPWJnSz/90LMOlEGErw==", "requires": { "debug": "^3.2.6", "iconv-lite": "^0.4.4", @@ -10865,16 +10865,16 @@ "dependencies": { "debug": { "version": "3.2.7", - "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.2.7.tgz?cache=0&sync_timestamp=1607566533140&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-3.2.7.tgz", - "integrity": "sha1-clgLfpFF+zm2Z2+cXl+xALk0F5o=", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "requires": { "ms": "^2.1.1" } }, "iconv-lite": { "version": "0.4.24", - "resolved": "https://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.24.tgz?cache=0&sync_timestamp=1594184250387&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ficonv-lite%2Fdownload%2Ficonv-lite-0.4.24.tgz", - "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "requires": { "safer-buffer": ">= 2.1.2 < 3" } @@ -11613,9 +11613,9 @@ "dev": true }, "postcss-loader": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.1.0.tgz", - "integrity": "sha512-yA/cXBfACkthZNA2hQxOnaReVfQ6uLmvbEDQzNafpbK40URZJvP/28dL1DG174Gvz3ptkkHbbwDBCh+gXR94CA==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.1.1.tgz", + "integrity": "sha512-lBmJMvRh1D40dqpWKr9Rpygwxn8M74U9uaCSeYGNKLGInbk9mXBt1ultHf2dH9Ghk6Ue4UXlXWwGMH9QdUJ5ug==", "dev": true, "requires": { "cosmiconfig": "^7.0.0", @@ -13918,9 +13918,9 @@ }, "dependencies": { "ajv": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz", - "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==", + "version": "8.6.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.1.tgz", + "integrity": "sha512-42VLtQUOLefAvKFAQIxIZDaThq6om/PrfP0CYk3/vn+y4BMNkKnbli8ON2QCiHov4KkzOSJ/xSoBJdayiiYvVQ==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -14861,9 +14861,9 @@ } }, "webpack": { - "version": "5.41.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.41.1.tgz", - "integrity": "sha512-AJZIIsqJ/MVTmegEq9Tlw5mk5EHdGiJbDdz9qP15vmUH+oxI1FdWcL0E9EO8K/zKaRPWqEs7G/OPxq1P61u5Ug==", + "version": "5.42.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.42.0.tgz", + "integrity": "sha512-Ln8HL0F831t1x/yPB/qZEUVmZM4w9BnHZ1EQD/sAUHv8m22hthoPniWTXEzFMh/Sf84mhrahut22TX5KxWGuyQ==", "dev": true, "requires": { "@types/eslint-scope": "^3.7.0", @@ -14871,7 +14871,7 @@ "@webassemblyjs/ast": "1.11.0", "@webassemblyjs/wasm-edit": "1.11.0", "@webassemblyjs/wasm-parser": "1.11.0", - "acorn": "^8.2.1", + "acorn": "^8.4.1", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", "enhanced-resolve": "^5.8.0", diff --git a/package.json b/package.json index f8642b83..6f994829 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "up": "cross-env ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=http://localhost:1081 npm i" }, "browserslist": [ - "Electron 13.0.2" + "Electron 13.1.5" ], "engines": { "node": ">= 14" @@ -184,11 +184,12 @@ "css-loader": "^5.2.6", "css-minimizer-webpack-plugin": "^3.0.2", "del": "^6.0.0", - "electron": "^13.1.4", + "electron": "^13.1.5", "electron-builder": "^22.11.7", "electron-debug": "^3.2.0", "electron-devtools-installer": "^3.2.0", - "eslint": "^7.29.0", + "electron-to-chromium": "^1.3.766", + "eslint": "^7.30.0", "eslint-config-standard": "^14.1.1", "eslint-formatter-friendly": "^7.0.0", "eslint-loader": "^4.0.2", @@ -201,12 +202,12 @@ "friendly-errors-webpack-plugin": "^1.7.0", "html-webpack-plugin": "^5.3.2", "less": "^4.1.1", - "less-loader": "^10.0.0", + "less-loader": "^10.0.1", "less-plugin-clean-css": "^1.5.1", "markdown-it": "^12.0.6", - "mini-css-extract-plugin": "^1.6.2", + "mini-css-extract-plugin": "^2.0.0", "postcss": "^8.3.5", - "postcss-loader": "^6.1.0", + "postcss-loader": "^6.1.1", "postcss-pxtorem": "^6.0.0", "pug": "^3.0.2", "pug-loader": "^2.4.0", @@ -220,7 +221,7 @@ "url-loader": "^4.1.1", "vue-loader": "^15.9.7", "vue-template-compiler": "^2.6.14", - "webpack": "^5.41.1", + "webpack": "^5.42.0", "webpack-cli": "^4.7.2", "webpack-dev-server": "^3.11.2", "webpack-hot-middleware": "^2.25.0", @@ -233,9 +234,8 @@ "electron-updater": "^4.3.9", "iconv-lite": "^0.6.3", "image-size": "^1.0.0", - "js-htmlencode": "^0.3.0", "lrc-file-parser": "^1.1.0", - "needle": "^2.6.0", + "needle": "^2.7.0", "node-id3": "^0.2.3", "request": "^2.88.2", "vue": "^2.6.14", diff --git a/src/renderer/utils/index.js b/src/renderer/utils/index.js index 1228b68b..879ce4d1 100644 --- a/src/renderer/utils/index.js +++ b/src/renderer/utils/index.js @@ -80,7 +80,7 @@ const encodeNames = { ''': "'", ''': "'", } -export const decodeName = (str = '') => str.replace(/(?:&|<|>|"|'|')/gm, s => encodeNames[s]) +export const decodeName = (str = '') => str?.replace(/(?:&|<|>|"|'|')/gm, s => encodeNames[s]) || '' const easeInOutQuad = (t, b, c, d) => { t /= d / 2 diff --git a/src/renderer/utils/music/bd/leaderboard.js b/src/renderer/utils/music/bd/leaderboard.js index af7c257b..9e89a5f7 100644 --- a/src/renderer/utils/music/bd/leaderboard.js +++ b/src/renderer/utils/music/bd/leaderboard.js @@ -1,6 +1,6 @@ import { httpFetch } from '../../request' // import { formatPlayTime } from '../../index' -// import jshtmlencode from 'js-htmlencode' + const boardList = [ // { id: 'bd__601', name: '歌单榜', bangid: '601' }, diff --git a/src/renderer/utils/music/bd/musicSearch.js b/src/renderer/utils/music/bd/musicSearch.js index c7574b81..726e6bd6 100644 --- a/src/renderer/utils/music/bd/musicSearch.js +++ b/src/renderer/utils/music/bd/musicSearch.js @@ -1,5 +1,5 @@ // import '../../polyfill/array.find' -// import jshtmlencode from 'js-htmlencode' + import { httpFetch } from '../../request' import { formatPlayTime } from '../../index' // import { debug } from '../../utils/env' diff --git a/src/renderer/utils/music/kg/musicSearch.js b/src/renderer/utils/music/kg/musicSearch.js index e5909076..e8144b61 100644 --- a/src/renderer/utils/music/kg/musicSearch.js +++ b/src/renderer/utils/music/kg/musicSearch.js @@ -1,5 +1,5 @@ // import '../../polyfill/array.find' -// import jshtmlencode from 'js-htmlencode' + import { httpFetch } from '../../request' import { decodeName, formatPlayTime, sizeFormate } from '../../index' // import { debug } from '../../utils/env' diff --git a/src/renderer/utils/music/kw/musicSearch.js b/src/renderer/utils/music/kw/musicSearch.js index 5035895a..be30101b 100644 --- a/src/renderer/utils/music/kw/musicSearch.js +++ b/src/renderer/utils/music/kw/musicSearch.js @@ -1,5 +1,5 @@ // import '../../polyfill/array.find' -// import jshtmlencode from 'js-htmlencode' + import { httpFetch } from '../../request' import { formatPlayTime, decodeName } from '../../index' // import { debug } from '../../utils/env' diff --git a/src/renderer/utils/music/mg/leaderboard.js b/src/renderer/utils/music/mg/leaderboard.js index 0d1cbef4..3315b8e2 100644 --- a/src/renderer/utils/music/mg/leaderboard.js +++ b/src/renderer/utils/music/mg/leaderboard.js @@ -1,6 +1,6 @@ import { httpFetch } from '../../request' import { sizeFormate } from '../../index' -// import jshtmlencode from 'js-htmlencode' + const boardList = [{ id: 'mg__27553319', name: '咪咕尖叫新歌榜', bangid: '27553319' }, { id: 'mg__27186466', name: '咪咕尖叫热歌榜', bangid: '27186466' }, { id: 'mg__27553408', name: '咪咕尖叫原创榜', bangid: '27553408' }, { id: 'mg__23189800', name: '咪咕港台榜', bangid: '23189800' }, { id: 'mg__23189399', name: '咪咕内地榜', bangid: '23189399' }, { id: 'mg__19190036', name: '咪咕欧美榜', bangid: '19190036' }, { id: 'mg__23189813', name: '咪咕日韩榜', bangid: '23189813' }, { id: 'mg__23190126', name: '咪咕彩铃榜', bangid: '23190126' }, { id: 'mg__15140045', name: '咪咕KTV榜', bangid: '15140045' }, { id: 'mg__15140034', name: '咪咕网络榜', bangid: '15140034' }, { id: 'mg__23217754', name: 'MV榜', bangid: '23217754' }, { id: 'mg__23218151', name: '新专辑榜', bangid: '23218151' }, { id: 'mg__21958042', name: 'iTunes榜', bangid: '21958042' }, { id: 'mg__21975570', name: 'billboard榜', bangid: '21975570' }, { id: 'mg__22272815', name: '台湾Hito中文榜', bangid: '22272815' }, { id: 'mg__22272904', name: '中国TOP排行榜', bangid: '22272904' }, { id: 'mg__22272943', name: '韩国Melon榜', bangid: '22272943' }, { id: 'mg__22273437', name: '英国UK榜', bangid: '22273437' }] diff --git a/src/renderer/utils/music/mg/leaderboard2.js b/src/renderer/utils/music/mg/leaderboard2.js index 49ded6cc..a925fd0e 100644 --- a/src/renderer/utils/music/mg/leaderboard2.js +++ b/src/renderer/utils/music/mg/leaderboard2.js @@ -1,7 +1,7 @@ import { httpFetch } from '../../request' import { formatPlayTime } from '../../index' // import { sizeFormate } from '../../index' -// import jshtmlencode from 'js-htmlencode' + // const boardList = [{ id: 'mg__27553319', name: '咪咕尖叫新歌榜', bangid: '27553319' }, { id: 'mg__27186466', name: '咪咕尖叫热歌榜', bangid: '27186466' }, { id: 'mg__27553408', name: '咪咕尖叫原创榜', bangid: '27553408' }, { id: 'mg__23189800', name: '咪咕港台榜', bangid: '23189800' }, { id: 'mg__23189399', name: '咪咕内地榜', bangid: '23189399' }, { id: 'mg__19190036', name: '咪咕欧美榜', bangid: '19190036' }, { id: 'mg__23189813', name: '咪咕日韩榜', bangid: '23189813' }, { id: 'mg__23190126', name: '咪咕彩铃榜', bangid: '23190126' }, { id: 'mg__15140045', name: '咪咕KTV榜', bangid: '15140045' }, { id: 'mg__15140034', name: '咪咕网络榜', bangid: '15140034' }, { id: 'mg__23217754', name: 'MV榜', bangid: '23217754' }, { id: 'mg__23218151', name: '新专辑榜', bangid: '23218151' }, { id: 'mg__21958042', name: 'iTunes榜', bangid: '21958042' }, { id: 'mg__21975570', name: 'billboard榜', bangid: '21975570' }, { id: 'mg__22272815', name: '台湾Hito中文榜', bangid: '22272815' }, { id: 'mg__22272904', name: '中国TOP排行榜', bangid: '22272904' }, { id: 'mg__22272943', name: '韩国Melon榜', bangid: '22272943' }, { id: 'mg__22273437', name: '英国UK榜', bangid: '22273437' }] const boardList = [ diff --git a/src/renderer/utils/music/mg/musicSearch.js b/src/renderer/utils/music/mg/musicSearch.js index 23a0d361..585d154b 100644 --- a/src/renderer/utils/music/mg/musicSearch.js +++ b/src/renderer/utils/music/mg/musicSearch.js @@ -1,5 +1,5 @@ // import '../../polyfill/array.find' -// import jshtmlencode from 'js-htmlencode' + import { httpFetch } from '../../request' import { sizeFormate } from '../../index' // import { debug } from '../../utils/env' diff --git a/src/renderer/utils/music/tx/musicSearch.js b/src/renderer/utils/music/tx/musicSearch.js index 35cedb2a..9cd5e7b4 100644 --- a/src/renderer/utils/music/tx/musicSearch.js +++ b/src/renderer/utils/music/tx/musicSearch.js @@ -1,5 +1,5 @@ // import '../../polyfill/array.find' -// import jshtmlencode from 'js-htmlencode' + import { httpFetch } from '../../request' import { formatPlayTime, sizeFormate } from '../../index' // import { debug } from '../../utils/env' diff --git a/src/renderer/utils/music/tx/songList.js b/src/renderer/utils/music/tx/songList.js index 4684c389..b8cea173 100644 --- a/src/renderer/utils/music/tx/songList.js +++ b/src/renderer/utils/music/tx/songList.js @@ -1,6 +1,5 @@ import { httpFetch } from '../../request' -import { formatPlayTime, sizeFormate } from '../../index' -import jshtmlencode from 'js-htmlencode' +import { decodeName, formatPlayTime, sizeFormate } from '../../index' export default { _requestObj_tags: null, @@ -163,7 +162,7 @@ export default { // time: basic.publish_time, img: basic.cover.medium_url || basic.cover.default_url, // grade: basic.favorcnt / 10, - desc: jshtmlencode.htmlDecode(basic.desc).replace(/
/g, '\n'), + desc: decodeName(basic.desc).replace(/
/g, '\n'), source: 'tx', })), total: content.total_cnt, @@ -219,7 +218,7 @@ export default { info: { name: cdlist.dissname, img: cdlist.logo, - desc: jshtmlencode.htmlDecode(cdlist.desc).replace(/
/g, '\n'), + desc: decodeName(cdlist.desc).replace(/
/g, '\n'), author: cdlist.nickname, play_count: this.formatPlayCount(cdlist.visitnum), },