Skip to content

fix: Empty list behavior and infinite import#687

Merged
Mivik merged 4 commits intomainfrom
fix-behavior
Mar 6, 2026
Merged

fix: Empty list behavior and infinite import#687
Mivik merged 4 commits intomainfrom
fix-behavior

Conversation

@NuanRMxi
Copy link
Member

@NuanRMxi NuanRMxi commented Mar 5, 2026

fix: #686
fix: #430

@NuanRMxi
Copy link
Member Author

NuanRMxi commented Mar 5, 2026

It may have fixed the infinite import issue, but further testing is needed as my build did not run on Android
它可能已经修复了无限导入问题,但由于我的构建没有在Android上运行,因此需要进一步测试

@NuanRMxi NuanRMxi changed the title fix: Empty list behavior fix: Empty list behavior and infinite import Mar 5, 2026
@Mivik
Copy link
Contributor

Mivik commented Mar 6, 2026

LGTM, thanks!

@Mivik Mivik merged commit 0b2ab58 into main Mar 6, 2026
3 of 8 checks passed
@NuanRMxi NuanRMxi deleted the fix-behavior branch March 6, 2026 15:09
unzip_into(BufReader::new(File::open(path)?), &dir, true)?;
let dir_obj = prpr::dir::Dir::new(dir)?;
unzip_into(BufReader::new(File::open(path)?), &dir_obj, true)?;
let _ = std::fs::remove_file(path);
Copy link
Contributor

@YuevUwU YuevUwU Mar 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[WARN] The current merged commit will remove your chart file immediately after importing.

Reverted by b9bef11 in #689

unzip_into(BufReader::new(File::open(file)?), &dir, false).context("failed to unzip")?;
unzip_into(BufReader::new(File::open(&file)?), &dir, false).context("failed to unzip")?;
let config: ResPackInfo = serde_yaml::from_reader(dir.open("info.yml").context("missing yml")?)?;
let _ = std::fs::remove_file(file);
Copy link
Contributor

@YuevUwU YuevUwU Mar 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@NuanRMxi Is this expected?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

commit 540bb98 has been Revert in a new PR

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So Don't worry about it, just merge my other PR and it will be fine

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

commit 540bb98 has been Revert in a new PR

#689 only revert the removing about charts, not delete the removing about respack

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

看眼dc在这聊不太方便

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted on 93c9c5e in #689

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug] 空事件列表行为与RPE制谱器行为不一致 [Bug] 不规范谱面导致Phira无限导入谱面并闪退

3 participants