dnomd343
/
unlock-music
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

refactor(qmc): extract qm meta code to utils 

(cherry picked from commit b6497e2bd3679e0e62bd6a90bdac16fa7c7f1b4e)
20230320
Jixun Wu 3 years ago
committed by MengYX
parent
57d2244c28
commit
4ae92cd630
No known key found for this signature in database GPG Key ID: E63F9C7303E8F604
2 changed files with 83 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 79
      src/decrypt/qmc.ts
  2. 71
      src/utils/qm_meta.ts

79
src/decrypt/qmc.ts
View File

@ -1,21 +1,10 @@
import { QmcMapCipher, QmcRC4Cipher, QmcStaticCipher, QmcStreamCipher } from './qmc_cipher';
import {
AudioMimeType,
GetArrayBuffer,
GetCoverFromFile,
GetImageFromURL,
GetMetaFromFile,
SniffAudioExt,
WriteMetaToFlac,
WriteMetaToMp3,
} from '@/decrypt/utils';
import { parseBlob as metaParseBlob } from 'music-metadata-browser';
import { AudioMimeType, GetArrayBuffer, SniffAudioExt } from '@/decrypt/utils';
import { DecryptQMCWasm } from './qmc_wasm';
import iconv from 'iconv-lite';
import { DecryptResult } from '@/decrypt/entity';
import { queryAlbumCover } from '@/utils/api';
import { QmcDeriveKey } from '@/decrypt/qmc_key';
import { extractQQMusicMeta } from '@/utils/qm_meta';
interface Handler {
ext: string;
@ -72,68 +61,24 @@ export async function Decrypt(file: Blob, raw_filename: string, raw_ext: string)
const ext = SniffAudioExt(musicDecoded, handler.ext);
const mime = AudioMimeType[ext];
let musicBlob = new Blob([musicDecoded], { type: mime });
const { album, artist, imgUrl, blob, title } = await extractQQMusicMeta(
new Blob([musicDecoded], { type: mime }),
raw_filename,
ext,
);
const musicMeta = await metaParseBlob(musicBlob);
for (let metaIdx in musicMeta.native) {
if (!musicMeta.native.hasOwnProperty(metaIdx)) continue;
if (musicMeta.native[metaIdx].some((item) => item.id === 'TCON' && item.value === '(12)')) {
console.warn('try using gbk encoding to decode meta');
musicMeta.common.artist = iconv.decode(new Buffer(musicMeta.common.artist ?? ''), 'gbk');
musicMeta.common.title = iconv.decode(new Buffer(musicMeta.common.title ?? ''), 'gbk');
musicMeta.common.album = iconv.decode(new Buffer(musicMeta.common.album ?? ''), 'gbk');
}
}
const info = GetMetaFromFile(raw_filename, musicMeta.common.title, musicMeta.common.artist);
let imgUrl = GetCoverFromFile(musicMeta);
if (!imgUrl) {
imgUrl = await getCoverImage(info.title, info.artist, musicMeta.common.album);
if (imgUrl) {
const imageInfo = await GetImageFromURL(imgUrl);
if (imageInfo) {
imgUrl = imageInfo.url;
try {
const newMeta = { picture: imageInfo.buffer, title: info.title, artists: info.artist?.split(' _ ') };
if (ext === 'mp3') {
musicDecoded = WriteMetaToMp3(Buffer.from(musicDecoded), newMeta, musicMeta);
musicBlob = new Blob([musicDecoded], { type: mime });
} else if (ext === 'flac') {
musicDecoded = WriteMetaToFlac(Buffer.from(musicDecoded), newMeta, musicMeta);
musicBlob = new Blob([musicDecoded], { type: mime });
} else {
console.info('writing metadata for ' + ext + ' is not being supported for now');
}
} catch (e) {
console.warn('Error while appending cover image to file ' + e);
}
}
}
}
return {
title: info.title,
artist: info.artist,
title: title,
artist: artist,
ext: ext,
album: musicMeta.common.album,
album: album,
picture: imgUrl,
file: URL.createObjectURL(musicBlob),
blob: musicBlob,
file: URL.createObjectURL(blob),
blob: blob,
mime: mime,
};
}
async function getCoverImage(title: string, artist?: string, album?: string): Promise<string> {
const song_query_url = 'https://stats.ixarea.com/apis' + '/music/qq-cover';
try {
const data = await queryAlbumCover(title, artist, album);
return `${song_query_url}/${data.Type}/${data.Id}`;
} catch (e) {
console.warn(e);
}
return '';
}
export class QmcDecoder {
private static readonly BYTE_COMMA = ','.charCodeAt(0);
file: Uint8Array;

71
src/utils/qm_meta.ts
View File

@ -0,0 +1,71 @@
import { parseBlob as metaParseBlob } from 'music-metadata-browser';
import iconv from 'iconv-lite';
import {
GetCoverFromFile,
GetImageFromURL,
GetMetaFromFile,
WriteMetaToFlac,
WriteMetaToMp3,
AudioMimeType,
} from '@/decrypt/utils';
import { queryAlbumCover } from '@/utils/api';
export async function extractQQMusicMeta(musicBlob: Blob, name: string, ext: string) {
const musicMeta = await metaParseBlob(musicBlob);
for (let metaIdx in musicMeta.native) {
if (!musicMeta.native.hasOwnProperty(metaIdx)) continue;
if (musicMeta.native[metaIdx].some((item) => item.id === 'TCON' && item.value === '(12)')) {
console.warn('try using gbk encoding to decode meta');
musicMeta.common.artist = iconv.decode(new Buffer(musicMeta.common.artist ?? ''), 'gbk');
musicMeta.common.title = iconv.decode(new Buffer(musicMeta.common.title ?? ''), 'gbk');
musicMeta.common.album = iconv.decode(new Buffer(musicMeta.common.album ?? ''), 'gbk');
}
}
const info = GetMetaFromFile(name, musicMeta.common.title, musicMeta.common.artist);
let imgUrl = GetCoverFromFile(musicMeta);
if (!imgUrl) {
imgUrl = await getCoverImage(info.title, info.artist, musicMeta.common.album);
if (imgUrl) {
const imageInfo = await GetImageFromURL(imgUrl);
if (imageInfo) {
imgUrl = imageInfo.url;
try {
const newMeta = { picture: imageInfo.buffer, title: info.title, artists: info.artist?.split(' _ ') };
const buffer = Buffer.from(await musicBlob.arrayBuffer());
const mime = AudioMimeType[ext] || AudioMimeType.mp3;
if (ext === 'mp3') {
musicBlob = new Blob([WriteMetaToMp3(buffer, newMeta, musicMeta)], { type: mime });
} else if (ext === 'flac') {
musicBlob = new Blob([WriteMetaToFlac(buffer, newMeta, musicMeta)], { type: mime });
} else {
console.info('writing metadata for ' + ext + ' is not being supported for now');
}
} catch (e) {
console.warn('Error while appending cover image to file ' + e);
}
}
}
}
return {
title: info.title,
artist: info.artist,
album: musicMeta.common.album,
imgUrl: imgUrl,
blob: musicBlob,
};
}
async function getCoverImage(title: string, artist?: string, album?: string): Promise<string> {
const song_query_url = 'https://stats.ixarea.com/apis' + '/music/qq-cover';
try {
const data = await queryAlbumCover(title, artist, album);
return `${song_query_url}/${data.Type}/${data.Id}`;
} catch (e) {
console.warn(e);
}
return '';
}
Write Preview
Loading…
Cancel
Save