mirror/unblock-music-web
1
0
Fork 0
mirror of https://git.unlock-music.dev/um/web.git synced 2025-11-04 22:03:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Xiami return info

Browse Source
This commit is contained in:
MengYX 2020-05-14 17:36:16 +08:00
parent 24bfc9e603
commit 6410576adb
No known key found for this signature in database
GPG Key ID: E63F9C7303E8F604
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/decrypt/common.js
View File

@ -50,8 +50,8 @@ export async function CommonDecrypt(file) {
rt_data = {status: false, message: "不支持此文件格式",} rt_data = {status: false, message: "不支持此文件格式",}
} }
rt_data.rawExt = raw_ext; if (!rt_data.rawExt) rt_data.rawExt = raw_ext;
rt_data.rawFilename = raw_filename; if (!rt_data.rawFilename) rt_data.rawFilename = raw_filename;
return rt_data; return rt_data;
} }

16
src/decrypt/xm.js
View File

@ -1,11 +1,4 @@
import { import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetFileInfo, GetMetaCoverURL, IsBytesEqual} from "./util";
AudioMimeType,
DetectAudioExt,
GetArrayBuffer,
GetFileInfo,
GetMetaCoverURL,
IsBytesEqual
} from "./util";
import {Decrypt as RawDecrypt} from "./raw"; import {Decrypt as RawDecrypt} from "./raw";
@ -24,7 +17,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
if (!IsBytesEqual(MagicHeader, oriData.slice(0, 4)) || if (!IsBytesEqual(MagicHeader, oriData.slice(0, 4)) ||
!IsBytesEqual(MagicHeader2, oriData.slice(8, 12))) { !IsBytesEqual(MagicHeader2, oriData.slice(8, 12))) {
if (raw_ext === "xm") { if (raw_ext === "xm") {
return {status: false, message: "Not a valid xm file!"} return {status: false, message: "此xm文件已损坏"}
} else { } else {
return await RawDecrypt(file, raw_filename, raw_ext, true) return await RawDecrypt(file, raw_filename, raw_ext, true)
} }
@ -32,7 +25,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
let typeText = (new TextDecoder()).decode(oriData.slice(4, 8)) let typeText = (new TextDecoder()).decode(oriData.slice(4, 8))
if (!FileTypeMap.hasOwnProperty(typeText)) { if (!FileTypeMap.hasOwnProperty(typeText)) {
return {status: false, message: "New Xiami file category!"} return {status: false, message: "未知的xm文件类型"}
} }
let key = oriData[0xf] let key = oriData[0xf]
@ -66,7 +59,8 @@ export async function Decrypt(file, raw_filename, raw_ext) {
album: musicMeta.common.album, album: musicMeta.common.album,
picture: imgUrl, picture: imgUrl,
file: URL.createObjectURL(musicBlob), file: URL.createObjectURL(musicBlob),
mime: mime mime: mime,
rawExt: "xm"
} }
} }