From 47635c95e1d3201c1b5413d772d7fcfdc05d6f69 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Mon, 22 Jan 2024 11:17:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=AD=8C=E6=9B=B2=E6=97=B6=E5=B0=81=E9=9D=A2=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E7=9A=84=E6=8E=A7=E5=88=B6=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=88#1609=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 1 + src/common/utils/musicMeta/flacMeta.js | 3 ++- src/common/utils/musicMeta/mp3Meta.js | 13 ++++++++----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index 981ca18f..db1fecf1 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -22,6 +22,7 @@ - 添加对wy源某些歌曲有问题的歌词进行修复 - 改进本地音乐在线信息的匹配机制 - 优化任务下载状态显示,现在下载时若数据传输完成但数据写入未完成时会显示相应的状态 +- 添加对下载歌曲时封面图片大小的控制处理(#1609) ### 修复 diff --git a/src/common/utils/musicMeta/flacMeta.js b/src/common/utils/musicMeta/flacMeta.js index a98f75ae..84dead42 100644 --- a/src/common/utils/musicMeta/flacMeta.js +++ b/src/common/utils/musicMeta/flacMeta.js @@ -59,7 +59,7 @@ const writeMeta = async(filePath, meta, picPath) => { module.exports = (filePath, meta) => { if (!meta.APIC) return writeMeta(filePath, meta) - const picUrl = meta.APIC + let picUrl = meta.APIC delete meta.APIC if (!/^http/.test(picUrl)) { return writeMeta(filePath, meta) @@ -67,6 +67,7 @@ module.exports = (filePath, meta) => { let ext = path.extname(picUrl) let picPath = filePath.replace(/\.flac$/, '') + (ext ? ext.replace(extReg, '$1') : '.jpg') + if (picUrl.includes('music.126.net')) picUrl += `${picUrl.includes('?') ? '&' : '?'}param=500y500` download(picUrl, picPath).then(success => { if (success) { writeMeta(filePath, meta, picPath).finally(() => { diff --git a/src/common/utils/musicMeta/mp3Meta.js b/src/common/utils/musicMeta/mp3Meta.js index 8824e0c6..1f768791 100644 --- a/src/common/utils/musicMeta/mp3Meta.js +++ b/src/common/utils/musicMeta/mp3Meta.js @@ -1,6 +1,6 @@ const NodeID3 = require('node-id3') const path = require('path') -const fs = require('fs') +// const fs = require('fs') const download = require('./downloader') const extReg = /^(\.(?:jpe?g|png)).*$/ @@ -23,13 +23,16 @@ module.exports = (filePath, meta) => { } let ext = path.extname(meta.APIC) let picPath = filePath.replace(/\.mp3$/, '') + (ext ? ext.replace(extReg, '$1') : '.jpg') - download(meta.APIC, picPath).then(success => { + + let picUrl = meta.APIC + if (picUrl.includes('music.126.net')) picUrl += `${picUrl.includes('?') ? '&' : '?'}param=500y500` + download(picUrl, picPath).then(success => { if (success) { meta.APIC = picPath handleWriteMeta(meta, filePath) - fs.unlink(picPath, err => { - if (err) console.log(err.message) - }) + // fs.unlink(picPath, err => { + // if (err) console.log(err.message) + // }) } else { delete meta.APIC handleWriteMeta(meta, filePath)