fix: decrypt/qmc-cache

adapt: decrypt/qmc for qmc-cache

src/decrypt/qmc.ts

@@ -22,7 +22,7 @@ interface Handler {
     handler(data?: Uint8Array): QmcMask | undefined
 }
 
-const HandlerMap: { [key: string]: Handler } = {
+export const HandlerMap: { [key: string]: Handler } = {
     "mgg": {handler: QmcMaskDetectMgg, ext: "ogg", detect: true},
     "mflac": {handler: QmcMaskDetectMflac, ext: "flac", detect: true},
     "mgg.cache": {handler: QmcMaskDetectMgg, ext: "ogg", detect: false},
@@ -42,8 +42,8 @@ const HandlerMap: { [key: string]: Handler } = {
     "776176": {handler: QmcMaskGetDefault, ext: "wav", detect: false}
 };
 
-export async function Decrypt(file: File, raw_filename: string, raw_ext: string): Promise<DecryptResult> {
+export async function Decrypt(file: Blob, raw_filename: string, raw_ext: string): Promise<DecryptResult> {
-    if (!(raw_ext in HandlerMap)) throw "File type is incorrect!";
+    if (!(raw_ext in HandlerMap)) throw `Qmc cannot handle type: ${raw_ext}`;
     const handler = HandlerMap[raw_ext];
 
     const fileData = new Uint8Array(await GetArrayBuffer(file));

src/decrypt/qmccache.ts

@@ -1,15 +1,20 @@
-import {AudioMimeType, GetArrayBuffer, GetCoverFromFile, GetMetaFromFile, SniffAudioExt} from "@/decrypt/utils.ts";
+import {
+    AudioMimeType,
+    GetArrayBuffer,
+    GetCoverFromFile,
+    GetMetaFromFile,
+    SniffAudioExt,
+    SplitFilename
+} from "@/decrypt/utils.ts";
 
-import {Decrypt as QmcDecrypt} from "@/decrypt/qmc";
+import {Decrypt as QmcDecrypt, HandlerMap} from "@/decrypt/qmc";
 
 import {DecryptResult} from "@/decrypt/entity";
 
 import {parseBlob as metaParseBlob} from "music-metadata-browser";
 
-export async function Decrypt(file: Blob, raw_filename: string, raw_ext: string, detect: boolean = true)
+export async function Decrypt(file: Blob, raw_filename: string, _: string)
     : Promise<DecryptResult> {
-    let ext = raw_ext;
-    if (detect) {
     const buffer = new Uint8Array(await GetArrayBuffer(file));
     let length = buffer.length
     for (let i = 0; i < length; i++) {
@@ -19,16 +24,18 @@ export async function Decrypt(file: Blob, raw_filename: string, raw_ext: string,
         else if (buffer[i] <= 0xbf) buffer[i] = (buffer[i] - 0x80) * 4 + 2;
         else buffer[i] = (buffer[i] - 0xc0) * 4 + 3;
     }
-        ext = SniffAudioExt(buffer, raw_ext);
+    let ext = SniffAudioExt(buffer, "");
-        if (ext !== raw_ext) file = new Blob([buffer], {type: AudioMimeType[ext]})
+    const newName = SplitFilename(raw_filename)
-        else {
+    let audioBlob: Blob
-            file = new Blob([buffer], {type: "application/octet-stream"})
+    if (ext !== "" || newName.ext === "mp3") {
-            let ext = raw_filename.substring(file.name.lastIndexOf(".") + 1, file.name.length).toLowerCase();
+        audioBlob = new Blob([buffer], {type: AudioMimeType[ext]})
-            if (ext !== "mgg" && ext !== "mflac") throw "不支持的QQ音乐缓存格式：" + raw_filename + ".cache";
+    } else if (newName.ext in HandlerMap) {
-            return QmcDecrypt(file, raw_filename, ext+".cache");
+        audioBlob = new Blob([buffer], {type: "application/octet-stream"})
+        return QmcDecrypt(audioBlob, newName.name, newName.ext);
+    } else {
+        throw "不支持的QQ音乐缓存格式"
     }
-    }
+    const tag = await metaParseBlob(audioBlob);
-    const tag = await metaParseBlob(file);
     const {title, artist} = GetMetaFromFile(raw_filename, tag.common.title, tag.common.artist)
 
     return {
@@ -37,8 +44,8 @@ export async function Decrypt(file: Blob, raw_filename: string, raw_ext: string,
         ext,
         album: tag.common.album,
         picture: GetCoverFromFile(tag),
-        file: URL.createObjectURL(file),
+        file: URL.createObjectURL(audioBlob),
-        blob: file,
+        blob: audioBlob,
         mime: AudioMimeType[ext]
     }
 }

src/decrypt/utils.ts

@@ -160,3 +160,11 @@ export function WriteMetaToFlac(audioData: Buffer, info: IMusicMeta, original: I
     }
     return writer.save()
 }
+
+export function SplitFilename(n: string): { name: string; ext: string } {
+    const pos = n.lastIndexOf(".")
+    return {
+        ext: n.substring(pos + 1).toLowerCase(),
+        name: n.substring(0, pos)
+    }
+}