Merge branch 'master' of https://github.com/Remik1r3n/maimaiDX-Api

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": [{

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:
@@ -111,7 +111,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)

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)