1
0
forked from um/web

Show Detail Info While Error Occurred

This commit is contained in:
MengYX 2019-11-23 18:30:59 +08:00
parent b68efea15b
commit c71cb8ee85
No known key found for this signature in database
GPG Key ID: E63F9C7303E8F604
4 changed files with 36 additions and 24 deletions

View File

@ -140,10 +140,13 @@
data = await MFlacDecrypt.Decrypt(file.raw);
break;
default:
console.log("Not Supported File!");
data = {
status: false,
message: "不支持此文件格式",
};
break;
}
if (null != data) {
if (data.status) {
this.tableData.push(data);
this.$notify.success({
title: '解锁成功',
@ -160,8 +163,8 @@
window._paq.push(["trackEvent", "Unlock", "Success", JSON.stringify(_rp_data)]);
} else {
this.$notify.error({
title: '错误',
message: '解析此文件时出现问题,请查看<a target="_blank" href="https://github.com/ix64/unlock-music/wiki/使用提示">使用提示</a>',
title: '出现问题',
message: data.message + ',参考<a target="_blank" href="https://github.com/ix64/unlock-music/wiki/使用提示">使用提示</a>',
dangerouslyUseHTMLString: true
});
window._paq.push(["trackEvent", "Unlock", "Error", file.name]);

View File

@ -4,7 +4,10 @@ export {Decrypt}
async function Decrypt(file) {
// 获取扩展名
let filename_ext = file.name.substring(file.name.lastIndexOf(".") + 1, file.name.length).toLowerCase();
if (filename_ext !== "mflac") return;
if (filename_ext !== "mflac") return {
status: false,
message: "File type is incorrect!",
};
// 读取文件
const fileBuffer = await new Promise(resolve => {
const reader = new FileReader();
@ -18,7 +21,10 @@ async function Decrypt(file) {
// 转换数据
const seed = new Mask();
if (!seed.DetectMask(audioData)) return;
if (!seed.DetectMask(audioData)) return{
status: false,
message: "此音乐无法解锁目前mflac格式不提供完整支持",
};
for (let cur = 0; cur < audioDataLen; ++cur) {
audioData[cur] ^= seed.NextMask();
}
@ -51,6 +57,8 @@ async function Decrypt(file) {
}
// 返回*/
return {
status: true,
message: "",
filename: filename,
title: title,
artist: artist,

View File

@ -24,10 +24,10 @@ async function Decrypt(file) {
if (dataView.getUint32(0, true) !== 0x4e455443 ||
dataView.getUint32(4, true) !== 0x4d414446
) {
console.log({type: "error", data: "not ncm file"});
return;
}
) return {
status: false,
message: "此ncm文件已损坏",
};
let offset = 10;
@ -50,13 +50,12 @@ async function Decrypt(file) {
const result = new Uint8Array(plainText.sigBytes);
{
const words = plainText.words;
const sigBytes = plainText.sigBytes;
for (let i = 0; i < sigBytes; i++) {
result[i] = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
}
}
return result.slice(17);
})();
@ -130,13 +129,12 @@ async function Decrypt(file) {
}
if (musicMeta.format === undefined) {
musicMeta.format = (() => {
const [f, L, a, C] = audioData;
if (f === 0x66 && L === 0x4c && a === 0x61 && C === 0x43) {
return "flac";
musicMeta.format = "flac";
} else {
musicMeta.format = "mp3";
}
return "mp3";
})();
}
const mime = audio_mime_type[musicMeta.format];

View File

@ -31,7 +31,10 @@ async function Decrypt(file) {
new_ext = "flac";
break;
default:
return;
return {
status: false,
message: "File type is incorrect!",
};
}
const mime = audio_mime_type[new_ext];
// 读取文件