From 5727b800fe51a88b2d7cf10225000619c2657808 Mon Sep 17 00:00:00 2001
From: Remik1r3n <remik1r3n@outlook.com>
Date: Tue, 4 Feb 2025 16:12:18 +0800
Subject: [PATCH] =?UTF-8?q?Fixed=20bug:=20nextindex=E6=81=B0=E5=A5=BD?=
 =?UTF-8?q?=E6=98=AF50=E5=80=8D=E6=95=B0=E6=97=B6=E5=80=99=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Best50_To_Diving_Fish.py    | 27 +++++++++------------------
 HelperGetUserMusicDetail.py | 20 +++++++-------------
 2 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/Best50_To_Diving_Fish.py b/Best50_To_Diving_Fish.py
index 763500e..07d90ed 100644
--- a/Best50_To_Diving_Fish.py
+++ b/Best50_To_Diving_Fish.py
@@ -111,22 +111,13 @@ def implUserMusicToDivingFish(userId:int, fishImportToken:str):
 
 if __name__ == '__main__':
     if True:
-        userId = testUid
-        importToken = testImportToken
-        currentLoginTimestamp = generateTimestamp()
-        loginResult = apiLogin(currentLoginTimestamp, userId)
-
-        if loginResult['returnCode'] != 1:
-            logger.info("登录失败")
-            exit()
-        try:
-            userFullMusicDetailList = getUserFullMusicDetail(userId)
-            logger.warning("Now We Begin To Build DivingFish Data")
-            divingFishData = maimaiUserMusicDetailToDivingFishFormat(userFullMusicDetailList)
-            logger.debug(divingFishData)
-            logger.warning("Now We Begin To Update DivingFish Data")
-            updateFishRecords(importToken, divingFishData)
-        finally:
-            #logger.error(f"Error: {e}")
-            logger.info(apiLogout(currentLoginTimestamp, userId))
+        userId = None
+        importToken = None
+        #currentLoginTimestamp = generateTimestamp()
 
+        userFullMusicDetailList = getUserFullMusicDetail(userId)
+        logger.warning("Now We Begin To Build DivingFish Data")
+        divingFishData = maimaiUserMusicDetailToDivingFishFormat(userFullMusicDetailList)
+        logger.debug(divingFishData)
+        logger.warning("Now We Begin To Update DivingFish Data")
+        updateFishRecords(importToken, divingFishData)
diff --git a/HelperGetUserMusicDetail.py b/HelperGetUserMusicDetail.py
index 634156e..f6cac3f 100644
--- a/HelperGetUserMusicDetail.py
+++ b/HelperGetUserMusicDetail.py
@@ -30,6 +30,10 @@ def getUserFullMusicDetail(userId: int):
         userMusicResponse = getUserMusicDetail(userId, nextIndex or 0)
         nextIndex = userMusicResponse['nextIndex']
         logger.info(f"NextIndex: {nextIndex}")
+        # 处理已经没有 userMusicList 的情况
+        if not userMusicResponse['userMusicList']:
+            break
+        # 只要还有 userMusicList 就一直加进去，直到全部获取完毕
         for currentMusic in userMusicResponse['userMusicList']:
             for currentMusicDetail in currentMusic['userMusicDetailList']:
                 if not currentMusicDetail['playCount'] > 0:
@@ -51,16 +55,6 @@ def parseUserFullMusicDetail(userFullMusicDetailList: list):
 
 if __name__ == '__main__':
     userId = testUid
-    currentLoginTimestamp = generateTimestamp()
-    #loginResult = apiLogin(currentLoginTimestamp, userId)
-
-    #if loginResult['returnCode'] != 1:
-    #    logger.info("登录失败")
-    #    exit()
-    try:
-        userFullMusicDetailList = getUserFullMusicDetail(userId)
-        parsedUserFullMusicDetail = parseUserFullMusicDetail(userFullMusicDetailList)
-        logger.info(parsedUserFullMusicDetail)
-    finally:
-        #logger.error(f"Error: {e}")
-        logger.info(apiLogout(currentLoginTimestamp, userId))
+    userFullMusicDetailList = getUserFullMusicDetail(userId)
+    parsedUserFullMusicDetail = parseUserFullMusicDetail(userFullMusicDetailList)
+    logger.info(parsedUserFullMusicDetail)