um/web
um
/
web
84
151
Fork 62
Code Issues 15 Pull Requests 1 Packages Projects Releases 2 Wiki Activity

New Decryptor: Add js decoder for Ximalaya X2M and X3M #23

Merged
um-dev merged 9 commits from Yuki1536/um-web1:master into master 2022-12-22 16:24:43 +00:00
Conversation 6 Commits 9 Files Changed 4 +1 -2
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1fdab13ff8 - Show all commits

3
src/decrypt/ximalaya.ts
View File

@ -32,7 +32,7 @@ export async function Decrypt(file: File, raw_filename: string, raw_ext: string)
}
}
const info = GetMetaFromFile(musicMeta.common.artist, musicMeta.common.title, raw_filename);
const info = GetMetaFromFile(raw_filename, musicMeta.common.title, musicMeta.common.artist);
return {
picture: "",
@ -48,7 +48,6 @@ export async function Decrypt(file: File, raw_filename: string, raw_ext: string)
function ProcessX2M(data: Uint8Array) {
const x2mHeaderSize = 1024;
// x2m Key in test format: ['x', 'm', 'l', 'y'];
const x2mKey = new Uint8Array([0x78, 0x6D, 0x6C, 0x79]);
let x2mScrambleTable = new Uint16Array(x2mHeaderSize);
if (x2mScrambleTableBytes.length != 2 * x2mHeaderSize)