From c5d408fff0bbdb36e8c7967329ee287f1615ad1f Mon Sep 17 00:00:00 2001
From: Remik1r3n <remik1r3n@outlook.com>
Date: Fri, 7 Feb 2025 14:07:14 +0800
Subject: [PATCH] =?UTF-8?q?B50=E6=9B=B4=E6=96=B0=E5=B0=8F=E6=94=B9?=
 =?UTF-8?q?=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Best50_To_Diving_Fish.py | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/Best50_To_Diving_Fish.py b/Best50_To_Diving_Fish.py
index d3e0930..1d1dc99 100644
--- a/Best50_To_Diving_Fish.py
+++ b/Best50_To_Diving_Fish.py
@@ -86,8 +86,12 @@ def maimaiUserMusicDetailToDivingFishFormat(userMusicDetailList) -> list:
                 'dxScore': currentMusicDetail['deluxscoreMax'],
             })
         except:
-            print(currentMusicDetail)
-            logger.error(f"Error: {currentMusicDetail}")
+            logger.error(f"Fish Format Translate Error: {currentMusicDetail}")
+
+    # debug output fish list to file
+    #with open("fishList.txt", "w", encoding="utf-8") as f:
+    #    f.write(str(divingFishList))
+
     return divingFishList
 
 def isVaildFishToken(importToken:str):
@@ -101,23 +105,20 @@ def isVaildFishToken(importToken:str):
     return True
 
 def implUserMusicToDivingFish(userId:int, fishImportToken:str):
-    '''上传所有成绩到水鱼的参考实现'''
+    '''上传所有成绩到水鱼的参考实现，返回成绩的数量或者False'''
     logger.info("开始上传舞萌成绩到水鱼查分器！")
     userFullMusicDetailList = getUserFullMusicDetail(userId)
     logger.info("成功得到成绩！转换成水鱼格式..")
     divingFishData = maimaiUserMusicDetailToDivingFishFormat(userFullMusicDetailList)
     logger.info("转换成功！开始上传水鱼..")
-    return updateFishRecords(fishImportToken, divingFishData)
+    if not updateFishRecords(fishImportToken, divingFishData)
+        logger.error("上传失败！")
+        return False
+    return len(divingFishData)
 
 if __name__ == '__main__':
     if True:
-        userId = None
-        importToken = None
+        userId = testUid2
+        importToken = testImportToken
         #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)
+        implUserMusicToDivingFish(userId, importToken)
\ No newline at end of file