From 671de4d21a3dcc1720acdea0cd0e9a79191b93ab Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 2 Feb 2025 22:45:56 +0800
Subject: [PATCH 1/2] small change

---
 Best50_To_Diving_Fish.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Best50_To_Diving_Fish.py b/Best50_To_Diving_Fish.py
index 97e2725..bdec884 100644
--- a/Best50_To_Diving_Fish.py
+++ b/Best50_To_Diving_Fish.py
@@ -55,7 +55,7 @@ def getFishRecords(importToken: str) -> dict:
 def updateFishRecords(importToken: str, records: list[dict]) -> dict:
     return apiDivingFish('POST', '/player/update_records', importToken, records)
 
-def maimaiUserMusicDetailToDivingFish(userMusicDetailList: list) -> list:
+def maimaiUserMusicDetailToDivingFishFormat(userMusicDetailList: list) -> list:
     '''舞萌的 UserMusicDetail 成绩格式转换成水鱼的格式'''
     divingFishList = []
     for currentMusicDetail in userMusicDetailList:
@@ -89,6 +89,12 @@ def maimaiUserMusicDetailToDivingFish(userMusicDetailList: list) -> list:
             logger.error(f"Error: {currentMusicDetail}")
     return divingFishList
 
+def implUserMusicToDivingFish(userId:int, fishImportToken:str):
+    userFullMusicDetailList = getUserFullMusicDetail(userId)
+    divingFishData = maimaiUserMusicDetailToDivingFishFormat(userFullMusicDetailList)
+    updateFishRecords(fishImportToken, divingFishData)
+
+
 if __name__ == '__main__':
     if True:
         userId = testUid
@@ -102,7 +108,7 @@ if __name__ == '__main__':
         try:
             userFullMusicDetailList = getUserFullMusicDetail(userId)
             logger.warning("Now We Begin To Build DivingFish Data")
-            divingFishData = maimaiUserMusicDetailToDivingFish(userFullMusicDetailList)
+            divingFishData = maimaiUserMusicDetailToDivingFishFormat(userFullMusicDetailList)
             logger.debug(divingFishData)
             logger.warning("Now We Begin To Update DivingFish Data")
             updateFishRecords(importToken, divingFishData)

From 2dd1d81135175cfb6ba1fdacc74c7df2a2a45585 Mon Sep 17 00:00:00 2001
From: Remik1r3n <remik1r3n@outlook.com>
Date: Mon, 3 Feb 2025 01:54:30 +0800
Subject: [PATCH 2/2] Add Ability to quick Generate Music Data

---
 ActionChangeVersion.py | 14 ++-----------
 HelperFullPlay.py      | 45 ++++++++++++------------------------------
 2 files changed, 15 insertions(+), 44 deletions(-)

diff --git a/ActionChangeVersion.py b/ActionChangeVersion.py
index 4315165..125f2b4 100644
--- a/ActionChangeVersion.py
+++ b/ActionChangeVersion.py
@@ -3,20 +3,10 @@
 from loguru import logger
 from Config import *
 from HelperLogInOut import apiLogin, apiLogout, generateTimestamp
-from HelperFullPlay import implFullPlayAction
+from HelperFullPlay import implFullPlayAction, generateMusicData
 
 def implChangeVersionNumber(userId: int, currentLoginTimestamp:int, currentLoginResult, dataVersion="1.40.09", romVersion="1.41.00") -> str:
-    musicData= ({
-    "musicId": 834, # PANDORA PARADOXXX
-    "level": 4,
-    "playCount": 1,
-    "achievement": 0,
-    "comboStatus": 0,
-    "syncStatus": 0,
-    "deluxscoreMax": 0,
-    "scoreRank": 0,
-    "extNum1": 0
-    })
+    musicData = generateMusicData()
     userAllPatches = {
     "upsertUserAll": {
         "userData": [{
diff --git a/HelperFullPlay.py b/HelperFullPlay.py
index 85f1f0b..f5b8702 100644
--- a/HelperFullPlay.py
+++ b/HelperFullPlay.py
@@ -7,26 +7,19 @@ from HelperGetUserThing import implGetUser_
 from HelperUploadUserPlayLog import apiUploadUserPlaylog
 from HelperUserAll import generateFullUserAll
 
-def EXAMPLE_implUploadScore(userId: int, currentLoginTimestamp:int, currentLoginResult) -> str:
-    '''示例！'''
-    musicData= ({
-    "musicId": 229,
-    "level": 2,
-    "playCount": 1,
-    "achievement": 0,
-    "comboStatus": 0,
-    "syncStatus": 0,
-    "deluxscoreMax": 0,
-    "scoreRank": 0,
-    "extNum1": 0
-})
-    userAllPatches = {
-    "upsertUserAll": {
-        "userMusicDetailList": [musicData],
-        "isNewMusicDetailList": "1"  # 0为编辑，即可删除掉成绩
-    }}
-    result = implFullPlayAction(userId, currentLoginTimestamp, currentLoginResult, musicData, userAllPatches)
-    return result
+def generateMusicData():
+    '''生成一份占位的音乐数据'''
+    return {
+        "musicId": 834, # PANDORA PARADOXXX
+        "level": 4,
+        "playCount": 1,
+        "achievement": 0,
+        "comboStatus": 0,
+        "syncStatus": 0,
+        "deluxscoreMax": 0,
+        "scoreRank": 0,
+        "extNum1": 0
+    }
 
 def applyUserAllPatches(userAll, patches):
     """
@@ -57,18 +50,6 @@ def implFullPlayAction(userId: int, currentLoginTimestamp:int, currentLoginResul
     一份完整的上机实现，可以打 patch 来实现各种功能
     需要在外部先登录并传入登录结果
     '''
-    # 上传上去的歌曲记录
-#    musicDataToBeUploaded = ({
-#    "musicId": musicToBeDeleted,
-#    "level": diffLevelId,
-#    "playCount": 1,
-#    "achievement": 0,
-#    "comboStatus": 0,
-#    "syncStatus": 0,
-#    "deluxscoreMax": 0,
-#    "scoreRank": 0,
-#    "extNum1": 0
-#})
     
     # 取得 UserData
     currentUserData = implGetUser_("Data", userId)