-
Notifications
You must be signed in to change notification settings - Fork 15
[Ready for review] 直接替换maidata.txt谱面的功能 #32
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Starrah
wants to merge
11
commits into
MuNET-OSS:main
Choose a base branch
from
Starrah:notes-direct-replacement
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
2cbdcda
feat: 在Music.xml中新增"X-MCM/ShiftMethod"字段,记录导入时的延迟调整模式
Starrah 104429d
refactor: 初步重构 ReplaceChartModal.tsx 为和其他替换功能一样的“带可选fileHandle参数的函数”模…
Starrah 6f99149
fix: ReplaceChart接口(直接替换MA2)不会自动修正音符数量
Starrah 3c01ae0
[WIP] 1. ImportChartCheckApi新增参数:isReplacement,表示该检查请求是由“替换谱面”功能发起的,还…
Starrah 58d910f
refactor: 把导入谱面时“显示导入警告等信息”,和延迟模式调整,的UI抽提出来作为单独的组件,方便复用
Starrah 38af84f
feat: ReplaceChartModal.tsx支持导入maidata所必须的显示,包括显示谱面检查警告和选择延迟调整模式
Starrah ef7b54c
refactor[1/2]: 将解析Maidata、转谱的核心逻辑抽提到单独的ImportMaidata函数中。
Starrah 6bdf568
refactor[2/2]: 将Maidata转谱的各种逻辑和工具函数,提取到一个MaidataImportService中。然后让Imp…
Starrah d403221
feat: 实现ReplaceChart的替换maidata功能的前后端完整逻辑和接口对接
Starrah f355cb1
fix: 在ReplaceChart后、updateMusicList时,disable掉MusicEdit/ChartPanel的wat…
Starrah bd79db6
gemini说得对
Starrah File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,11 @@ | ||
| using Microsoft.AspNetCore.Mvc; | ||
| using MaiChartManager.Services; | ||
| using Microsoft.AspNetCore.Mvc; | ||
|
|
||
| namespace MaiChartManager.Controllers.Charts; | ||
|
|
||
| [ApiController] | ||
| [Route("MaiChartManagerServlet/[action]Api/{assetDir}/{id:int}/{level:int}")] | ||
| public class ChartController(StaticSettings settings, ILogger<StaticSettings> logger) : ControllerBase | ||
| public class ChartController(StaticSettings settings, ILogger<StaticSettings> logger, MaidataImportService importService) : ControllerBase | ||
| { | ||
| [HttpPost] | ||
| public void EditChartLevel(int id, int level, [FromBody] int value, string assetDir) | ||
|
|
@@ -95,15 +96,53 @@ public void EditChartEnable(int id, int level, [FromBody] bool value, string ass | |
| } | ||
|
|
||
| [HttpPost] | ||
| public void ReplaceChart(int id, int level, IFormFile file, string assetDir) | ||
| public ImportChartResult ReplaceChart(int id, int level, IFormFile file, string assetDir, | ||
| [FromForm] ShiftMethod? shift) | ||
| { | ||
| var music = settings.GetMusic(id, assetDir); | ||
| if (music == null || file == null) return; | ||
| var targetChart = music.Charts[level]; | ||
| targetChart.Path = $"{id:000000}_0{level}.ma2"; | ||
| using var stream = System.IO.File.Open(Path.Combine(StaticSettings.StreamingAssets, assetDir, "music", $"music{id:000000}", targetChart.Path), FileMode.Create); | ||
| file.CopyTo(stream); | ||
| targetChart.Problems.Clear(); | ||
| stream.Close(); | ||
| if (music == null || file == null) return new ImportChartResult([new ImportChartMessage("文件上传失败", MessageLevel.Fatal)], true); | ||
| if (file.FileName.EndsWith(".ma2")) | ||
| { | ||
| var targetChart = music.Charts[level]; | ||
| targetChart.Path = $"{id:000000}_0{level}.ma2"; | ||
| using var stream = System.IO.File.Open(Path.Combine(StaticSettings.StreamingAssets, assetDir, "music", $"music{id:000000}", targetChart.Path), FileMode.Create); | ||
| file.CopyTo(stream); | ||
| targetChart.Problems.Clear(); | ||
|
|
||
| // 检查新谱面ma2的音符数量是否有变化,如果有修正之 | ||
| string fileContent; | ||
| using (var reader = new StreamReader(file.OpenReadStream())) | ||
| { | ||
| fileContent = reader.ReadToEnd(); | ||
| } | ||
| var newMaxNotes = MaidataImportService.ParseTNumAllFromMa2(fileContent); | ||
| if (newMaxNotes != 0 && targetChart.MaxNotes != newMaxNotes) | ||
| { | ||
| targetChart.MaxNotes = newMaxNotes; | ||
| } | ||
| music.Save(); | ||
|
|
||
| return new ImportChartResult([], false); | ||
| } | ||
| else if (file.FileName.EndsWith("maidata.txt")) | ||
| { | ||
| if (level != -1) throw new NotImplementedException("使用maidata时暂不支持只替换单个难度谱面,只能同时替换全部的"); | ||
| // 通过此前的谱面的定数是否为0,判断是否需要ignoreLevelNum | ||
| bool ignoreLevelNum = true; | ||
| foreach (var chart in music.Charts) | ||
| { | ||
| if (music.Id < 100000 && chart.Enable && chart.Level > 0) ignoreLevelNum = false; | ||
| } | ||
| var importResult = importService.ImportMaidata(music, file, (ShiftMethod)shift, ignoreLevelNum, false, true); | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 我觉得这里就这么做就ok,正常用户只要不是自己发请求,shift就不该是null。万一是null,报个异常给前端我觉得刚刚好 |
||
| if (!importResult.Fatal) | ||
| { | ||
| music.Save(); | ||
| music.Refresh(); | ||
| } | ||
|
|
||
| return importResult; | ||
| } | ||
| // 正常来说是不会进到这里的,因为前端已经对文件名做了校验了,所以这个报错用户正常来说是看不到的,就不做i18n了。 | ||
| else return new ImportChartResult([new ImportChartMessage("不支持的文件格式!", MessageLevel.Fatal)], true); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
assetDirparameter is used to construct a file path without validation. An attacker could provide a value like../../..to perform a path traversal attack and write files outside the intended directory. This is especially dangerous here as the content of the written file is controlled by the user upload. Consider validatingassetDiragainst an allow-list of expected directory names.