From 93db6371d96f90daf7e9d0d21fb6373e2c61340e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=91=98=E5=B0=8F=E5=A2=A8?=
 <2291200076@qq.com>
Date: Sun, 2 Oct 2022 12:03:36 +0800
Subject: [PATCH] update

---
 netease_music/src/getInfo/albumInfoUtils.js  |  2 +-
 netease_music/src/getInfo/artistInfoUtils.js | 13 +++++++++----
 netease_music/src/getInfo/lyricInfoUtils.js  |  2 +-
 netease_music/src/getInfo/songInfoUtils.js   |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/netease_music/src/getInfo/albumInfoUtils.js b/netease_music/src/getInfo/albumInfoUtils.js
index 6cc70e8..100610f 100644
--- a/netease_music/src/getInfo/albumInfoUtils.js
+++ b/netease_music/src/getInfo/albumInfoUtils.js
@@ -35,7 +35,7 @@ async function fetchAll({ isUpdate = false }) {
     for (let i = 0; i < albumIds.length; i++) {
         await global.checkIsExit();
         const albumId = albumIds[i];
-        console.log(`${i}/${albumIds.length} | album: ${albumId}`);
+        console.log(`${i + 1}/${albumIds.length} | album: ${albumId}`);
         try {
             await fetch({ albumId: albumId, update: isUpdate });
         } catch (err) {
diff --git a/netease_music/src/getInfo/artistInfoUtils.js b/netease_music/src/getInfo/artistInfoUtils.js
index 84069be..827ae4f 100644
--- a/netease_music/src/getInfo/artistInfoUtils.js
+++ b/netease_music/src/getInfo/artistInfoUtils.js
@@ -31,7 +31,7 @@ async function fetchAll() {
     for (let i = 0; i < artistIds.length; i++) {
         await global.checkIsExit();
         const artistId = artistIds[i];
-        console.log(`${i}/${artistIds.length} | artist: ${artistId}`);
+        console.log(`${i + 1}/${artistIds.length} | artist: ${artistId}`);
         try {
             await fetch({ artistId: artistId });
         } catch (err) {
@@ -72,9 +72,14 @@ async function fetch({ artistId, debug = false }) {
     // console.log(artistInfoDict);
 
     let image = /<meta property="og:image" content="http:\/\/p.\.music\.126\.net\/(.*?)" \/>/.exec(html)[1];
-    let songListJSONString = /<textarea id="song-list-pre-data" style="display:none;">(.*?)<\/textarea>/.exec(html)[1];
-    let songList = JSON.parse(songListJSONString);
-    let songIds = songList.map(song => song.id);
+    let songIds = [];
+    try {
+        let songListJSONString = /<textarea id="song-list-pre-data" style="display:none;">(.*?)<\/textarea>/.exec(html)[1];
+        let songList = JSON.parse(songListJSONString);
+        songIds = songList.map(song => song.id);
+    } catch (error) {
+        // 可能是歌手下面没有音乐 例如：https://music.163.com/#/artist?id=30032762
+    }
 
     let artistInfo = {
         artistId: artistId,
diff --git a/netease_music/src/getInfo/lyricInfoUtils.js b/netease_music/src/getInfo/lyricInfoUtils.js
index f2c517b..223e31c 100644
--- a/netease_music/src/getInfo/lyricInfoUtils.js
+++ b/netease_music/src/getInfo/lyricInfoUtils.js
@@ -16,7 +16,7 @@ async function fetchAll() {
     for (let i = 0; i < songIds.length; i++) {
         await global.checkIsExit();
         const songId = songIds[i];
-        console.log(`${i}/${songIds.length} | lyric: ${songId}`);
+        console.log(`${i + 1}/${songIds.length} | lyric: ${songId}`);
         try {
             await fetch({ songId: songId });
         } catch (err) {
diff --git a/netease_music/src/getInfo/songInfoUtils.js b/netease_music/src/getInfo/songInfoUtils.js
index ab89fa3..4b3adab 100644
--- a/netease_music/src/getInfo/songInfoUtils.js
+++ b/netease_music/src/getInfo/songInfoUtils.js
@@ -35,7 +35,7 @@ async function fetchAll() {
     for (let i = 0; i < songIds.length; i++) {
         await global.checkIsExit();
         const songId = songIds[i];
-        console.log(`${i}/${songIds.length} | song: ${songId}`);
+        console.log(`${i + 1}/${songIds.length} | song: ${songId}`);
         try {
             await fetch({ songId: songId });
         } catch (err) {