um/web
um
/
web
82
149
Fork 60
Code Issues 15 Pull Requests 1 Packages Projects Releases 2 Wiki Activity

Fix #79 ncm->flac no metadata (file downloaded from phone)

This commit is contained in:
MengYX 2020-08-03 14:02:17 +08:00
parent fd2866f53d
commit 4a2d31238b
No known key found for this signature in database
GPG Key ID: E63F9C7303E8F604
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/decrypt/ncm.js
View File

@ -35,7 +35,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
const artists = []; const artists = [];
if (!!musicMeta.artist) musicMeta.artist.forEach(arr => artists.push(arr[0])); if (!!musicMeta.artist) musicMeta.artist.forEach(arr => artists.push(arr[0]));
const info = GetFileInfo(artists.join(" & "), musicMeta.musicName, raw_filename); const info = GetFileInfo(artists.join("; "), musicMeta.musicName, raw_filename);
if (artists.length === 0) artists.push(info.artist); if (artists.length === 0) artists.push(info.artist);
if (musicMeta.format === undefined) musicMeta.format = DetectAudioExt(audioData, "mp3"); if (musicMeta.format === undefined) musicMeta.format = DetectAudioExt(audioData, "mp3");
@ -49,13 +49,15 @@ export async function Decrypt(file, raw_filename, raw_ext) {
audioData, artists, info.title, musicMeta.album, imageInfo.buffer, musicMeta.albumPic); audioData, artists, info.title, musicMeta.album, imageInfo.buffer, musicMeta.albumPic);
} else if (musicMeta.format === "flac") { } else if (musicMeta.format === "flac") {
const writer = new MetaFlac(Buffer.from(audioData)) const writer = new MetaFlac(Buffer.from(audioData))
//writer.setTag("TITLE=" + info.title); if (writer.getTag("TITLE") === "") writer.setTag("TITLE=" + info.title)
//writer.setTag("ALBUM=" + musicMeta.album); if (writer.getTag("ALBUM") === "") writer.setTag("ALBUM=" + musicMeta.album)
//artists.forEach(artist => writer.setTag("ARTIST=" + artist)); writer.removeTag("ARTIST")
artists.forEach(artist => writer.setTag("ARTIST=" + artist))
writer.importPictureFromBuffer(Buffer.from(imageInfo.buffer)) writer.importPictureFromBuffer(Buffer.from(imageInfo.buffer))
audioData = writer.save() audioData = writer.save()
} }
} catch (e) { } catch (e) {
//todo: 图片过大，无法写入
console.warn("Error while appending cover image to file " + e) console.warn("Error while appending cover image to file " + e)
} }