From 48f879cb5828442cdd4032b039472e496468ca0e Mon Sep 17 00:00:00 2001 From: Emmm Monster <58943012+emmmx@users.noreply.github.com> Date: Thu, 3 Jun 2021 12:47:51 +0800 Subject: [PATCH] simplify: decrypt/ncm-cache & decrypt/common --- src/decrypt/common.ts | 30 +++++++++++++++--------------- src/decrypt/ncmcache.ts | 17 +++++++---------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/src/decrypt/common.ts b/src/decrypt/common.ts index 8e2142d..3f4368c 100644 --- a/src/decrypt/common.ts +++ b/src/decrypt/common.ts @@ -8,35 +8,35 @@ import {Decrypt as KwmDecrypt} from "@/decrypt/kwm"; import {Decrypt as RawDecrypt} from "@/decrypt/raw"; import {Decrypt as TmDecrypt} from "@/decrypt/tm"; import {DecryptResult, FileInfo} from "@/decrypt/entity"; +import {SplitFilename} from "@/decrypt/utils"; export async function CommonDecrypt(file: FileInfo): Promise { - let raw_ext = file.name.substring(file.name.lastIndexOf(".") + 1, file.name.length).toLowerCase(); - let raw_filename = file.name.substring(0, file.name.lastIndexOf(".")); + const raw = SplitFilename(file.name) let rt_data: DecryptResult; - switch (raw_ext) { + switch (raw.ext) { case "ncm":// Netease Mp3/Flac - rt_data = await NcmDecrypt(file.raw, raw_filename, raw_ext); + rt_data = await NcmDecrypt(file.raw, raw.name, raw.ext); break; case "uc":// Netease Cache - rt_data = await NcmCacheDecrypt(file.raw, raw_filename, raw_ext); + rt_data = await NcmCacheDecrypt(file.raw, raw.name, raw.ext); break; case "kwm":// Kuwo Mp3/Flac - rt_data = await KwmDecrypt(file.raw, raw_filename, raw_ext); + rt_data = await KwmDecrypt(file.raw, raw.name, raw.ext); break case "xm": // Xiami Wav/M4a/Mp3/Flac case "wav":// Xiami/Raw Wav case "mp3":// Xiami/Raw Mp3 case "flac":// Xiami/Raw Flac case "m4a":// Xiami/Raw M4a - rt_data = await XmDecrypt(file.raw, raw_filename, raw_ext); + rt_data = await XmDecrypt(file.raw, raw.name, raw.ext); break; case "ogg":// Raw Ogg - rt_data = await RawDecrypt(file.raw, raw_filename, raw_ext); + rt_data = await RawDecrypt(file.raw, raw.name, raw.ext); break; case "tm0":// QQ Music IOS Mp3 case "tm3":// QQ Music IOS Mp3 - rt_data = await RawDecrypt(file.raw, raw_filename, "mp3"); + rt_data = await RawDecrypt(file.raw, raw.name, "mp3"); break; case "qmc3"://QQ Music Android Mp3 case "qmc2"://QQ Music Android Ogg @@ -53,26 +53,26 @@ export async function CommonDecrypt(file: FileInfo): Promise { case "6f6767"://QQ Music Weiyun Ogg case "6d3461"://QQ Music Weiyun M4a case "776176"://QQ Music Weiyun Wav - rt_data = await QmcDecrypt(file.raw, raw_filename, raw_ext); + rt_data = await QmcDecrypt(file.raw, raw.name, raw.ext); break; case "tm2":// QQ Music IOS M4a case "tm6":// QQ Music IOS M4a - rt_data = await TmDecrypt(file.raw, raw_filename); + rt_data = await TmDecrypt(file.raw, raw.name); break; case "cache"://QQ Music Cache - rt_data = await QmcCacheDecrypt(file.raw, raw_filename, raw_ext); + rt_data = await QmcCacheDecrypt(file.raw, raw.name, raw.ext); break; case "vpr": case "kgm": case "kgma": - rt_data = await KgmDecrypt(file.raw, raw_filename, raw_ext); + rt_data = await KgmDecrypt(file.raw, raw.name, raw.ext); break default: throw "不支持此文件格式" } - if (!rt_data.rawExt) rt_data.rawExt = raw_ext; - if (!rt_data.rawFilename) rt_data.rawFilename = raw_filename; + if (!rt_data.rawExt) rt_data.rawExt = raw.ext; + if (!rt_data.rawFilename) rt_data.rawFilename = raw.name; console.log(rt_data); return rt_data; } diff --git a/src/decrypt/ncmcache.ts b/src/decrypt/ncmcache.ts index 79db62c..f921cc6 100644 --- a/src/decrypt/ncmcache.ts +++ b/src/decrypt/ncmcache.ts @@ -4,18 +4,15 @@ 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, raw_ext: string) : Promise { - let ext = raw_ext; - if (detect) { - const buffer = new Uint8Array(await GetArrayBuffer(file)); - let length = buffer.length - for (let i = 0; i < length; i++) { - buffer[i] ^= 163 - } - ext = SniffAudioExt(buffer, raw_ext); - if (ext !== raw_ext) file = new Blob([buffer], {type: AudioMimeType[ext]}) + const buffer = new Uint8Array(await GetArrayBuffer(file)); + let length = buffer.length + for (let i = 0; i < length; i++) { + buffer[i] ^= 163 } + const ext = SniffAudioExt(buffer, raw_ext); + if (ext !== raw_ext) file = new Blob([buffer], {type: AudioMimeType[ext]}) const tag = await metaParseBlob(file); const {title, artist} = GetMetaFromFile(raw_filename, tag.common.title, tag.common.artist)