Tendokyu/artemis
1
0
Fork 0
mirror of synced 2025-02-15 18:02:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Fix mai2 photo merge problem and Add UserScoreRankingAPI handler' (#2) from mai2_tournament_support into develop

Browse Source 
Reviewed-on: https://gitea.tendokyu.moe/SoulGateKey/artemis/pulls/2
This commit is contained in:
SoulGateKey 2024-11-12 05:42:20 +00:00
commit 7a307b4d69
2 changed files with 72 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
titles/mai2/base.py
View File

@ -963,3 +963,6 @@ class Mai2Base:
userRecommendSelectionMusicIdList: list[int]
"""
return {"userId": data["userId"], "userRecommendSelectionMusicIdList": []}
async def handle_get_user_score_ranking_api_request(self, data: Dict) ->Dict:
return {"userId": data["userId"], "userScoreRanking": []}

33
titles/mai2/frontend.py
View File

@ -106,7 +106,7 @@ class Mai2Frontend(FE_Base):
index = int(path_index) - 1 # 0 and 1 are 1st page
user_id = usr_sesh.user_id
playlog_count = await self.data.score.get_user_playlogs_count(user_id)
if playlog_count < index * 20 :
if playlog_count < index * 20:
return Response(template.render(
title=f"{self.core_config.server.name} | {self.nav_name}",
game_list=self.environment.globals["game_list"],
@ -118,15 +118,15 @@ class Mai2Frontend(FE_Base):
for record in playlog:
music_chart = await self.data.static.get_music_chart(usr_sesh.maimai_version, record.musicId, record.level)
if music_chart:
difficultyNum=music_chart.chartId
difficulty=music_chart.difficulty
artist=music_chart.artist
title=music_chart.title
difficultyNum = music_chart.chartId
difficulty = music_chart.difficulty
artist = music_chart.artist
title = music_chart.title
else:
difficultyNum=0
difficulty=0
artist="unknown"
title="musicid: " + str(record.musicId)
difficultyNum = 0
difficulty = 0
artist = "unknown"
title = "musicid: " + str(record.musicId)
playlog_with_title.append({
"raw": record,
"title": title,
@ -240,8 +240,8 @@ class Mai2Frontend(FE_Base):
form_data = await request.form()
maimai_version = form_data.get("version")
self.logger.info(f"version change to: {maimai_version}")
if(maimai_version.isdigit()):
usr_sesh.maimai_version=int(maimai_version)
if (maimai_version.isdigit()):
usr_sesh.maimai_version = int(maimai_version)
encoded_sesh = self.encode_session(usr_sesh)
self.logger.debug(f"Created session with JWT {encoded_sesh}")
resp.set_cookie("ARTEMIS_SESH", encoded_sesh)
@ -383,14 +383,14 @@ class Mai2Frontend(FE_Base):
return Response(status_code=404)
if path.exists(f"{out_folder}"):
print("path exists")
self.logger.info(f"Photo Path Exist.")
max_idx = 0
p = ImageFile.Parser()
for _, _, files in walk("out_folder"):
for _, _, files in walk(f"{out_folder}"):
if not files:
break
matcher = re.match("^(\d+)_(\d+)$", files[0])
matcher = re.match(r"^(\d+)_(\d+)\.bin$", files[0])
if not matcher:
break
@ -405,11 +405,12 @@ class Mai2Frontend(FE_Base):
return Response(status_code=500)
for i in range(max_idx + 1):
with open(f"{out_folder}/{i}_{max_idx}", "rb") as f:
with open(f"{out_folder}/{i}_{max_idx}.bin", "rb") as f:
p.feed(f.read())
try:
im = p.close()
im.save(f"{out_folder}.jpeg")
self.logger.info(f"{out_folder}.jpeg generated.")
except Exception as e:
self.logger.error(f"{photo_id} failed PIL validation! - {e}")
@ -417,7 +418,7 @@ class Mai2Frontend(FE_Base):
shutil.rmtree(out_folder)
if path.exists(f"{out_folder}.jpeg"):
print(f"{out_folder}.jpeg exists")
self.logger.info(f"{out_folder}.jpeg exists")
return FileResponse(f"{out_folder}.jpeg")
return Response(status_code=404)