Compare commits
No commits in common. "9205dbf701128a33c0de42174046f30270e33d74" and "fde495ce42f12e2fe396c8b6319c5e2aad565bc6" have entirely different histories.
9205dbf701
...
fde495ce42
4
package-lock.json
generated
4
package-lock.json
generated
@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "unlock-music",
|
||||
"version": "1.10.5",
|
||||
"version": "1.10.4",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "unlock-music",
|
||||
"version": "1.10.5",
|
||||
"version": "1.10.4",
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "unlock-music",
|
||||
"version": "1.10.5",
|
||||
"version": "1.10.4",
|
||||
"ext_build": 0,
|
||||
"updateInfo": "完善音乐标签编辑功能,支持编辑更多标签",
|
||||
"license": "MIT",
|
||||
|
@ -139,7 +139,7 @@ class NcmDecrypt {
|
||||
} else {
|
||||
result = JSON.parse(plainText.slice(labelIndex + 1));
|
||||
}
|
||||
if (result.albumPic) {
|
||||
if (!!result.albumPic) {
|
||||
result.albumPic = result.albumPic.replace('http://', 'https://') + '?param=500y500';
|
||||
}
|
||||
return result;
|
||||
@ -160,20 +160,11 @@ class NcmDecrypt {
|
||||
|
||||
// build artists
|
||||
let artists: string[] = [];
|
||||
if (typeof this.oriMeta.artist === 'string') {
|
||||
// v3.0: artist 现在可能是字符串了?
|
||||
artists.push(this.oriMeta.artist);
|
||||
} else if (Array.isArray(this.oriMeta.artist)) {
|
||||
this.oriMeta.artist.forEach((artist) => {
|
||||
if (typeof artist === 'string') {
|
||||
artists.push(artist);
|
||||
} else if (Array.isArray(artist) && artist[0] && typeof artist[0] === 'string') {
|
||||
artists.push(artist[0]);
|
||||
}
|
||||
});
|
||||
if (!!this.oriMeta.artist) {
|
||||
this.oriMeta.artist.forEach((arr) => artists.push(<string>arr[0]));
|
||||
}
|
||||
|
||||
if (artists.length === 0 && info.artist) {
|
||||
if (artists.length === 0 && !!info.artist) {
|
||||
artists = info.artist
|
||||
.split(',')
|
||||
.map((val) => val.trim())
|
||||
@ -189,7 +180,7 @@ class NcmDecrypt {
|
||||
this.image.buffer = await img.getBufferAsync('image/jpeg');
|
||||
}
|
||||
} catch (e) {
|
||||
console.log('fetch cover image failed', e);
|
||||
console.log('get cover image failed', e);
|
||||
}
|
||||
|
||||
this.newMeta = { title: info.title, artists, album: this.oriMeta.album, picture: this.image?.buffer };
|
||||
@ -235,14 +226,12 @@ class NcmDecrypt {
|
||||
this.audio = this._getAudio(keyBox);
|
||||
this.format = this.oriMeta.format || SniffAudioExt(this.audio);
|
||||
this.mime = AudioMimeType[this.format];
|
||||
|
||||
try {
|
||||
await this._buildMeta();
|
||||
try {
|
||||
await this._writeMeta();
|
||||
} catch (e) {
|
||||
console.warn('build/write meta failed, skip.', e);
|
||||
console.warn('write meta data failed', e);
|
||||
}
|
||||
|
||||
return this.gatherResult();
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user