Skip to content
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

Revert recent file system changes #11370

Merged
merged 4 commits into from Jan 13, 2022
Merged

Revert recent file system changes #11370

merged 4 commits into from Jan 13, 2022

Conversation

MSuih
Copy link
Member

@MSuih MSuih commented Jan 13, 2022

The changes in #11178 broke path handling for Windows users as seen in #11360. The fixes in #11365 did not fully fix every use case and there's still a lot of complaints about broken path handling causing various issues.

Pull request #11367 aims to fix the remaining bugs, but I think we should roll back the entire feature and take our time to implement it properly instead of rushing in with one quickly merged and poorly tested fix PR after another.

@MSuih MSuih added Discussion Workaround To be fixed properly in the future. labels Jan 13, 2022
@MSuih
Copy link
Member Author

MSuih commented Jan 13, 2022

This is just a suggestion from me, I'm fine if it is rejected.

@Nekotekina
Copy link
Member

Well, at least don't revert unrelated commits.

@MSuih
Copy link
Member Author

MSuih commented Jan 13, 2022

Should be resolved now

@@ -931,7 +931,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
break;
}

if (fs::file sfb_file{parent_dir + "/PS3_DISC.SFB"}; sfb_file && !sfb_file.stat().is_directory && sfb_file.size() >= 4 && sfb_file.read<u32>() == ".SFB"_u32)
if (fs::file sfb_file{parent_dir + "/PS3_DISC.SFB"}; sfb_file && sfb_file.size() >= 4 && sfb_file.read<u32>() == ".SFB"_u32)
{
Copy link
Contributor

Choose a reason for hiding this comment

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

What was wrong with this line?

Copy link
Member Author

Choose a reason for hiding this comment

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

I wasn't sure if it was related to the other changes and I decided to rather revert too much than too little and then have to do another revert. We can introduce the changes back in future PRs, its not a problem.

@Basmurd
Copy link

Basmurd commented Jan 28, 2022

The emulator has stopped compiling PPU modules at all, both with a clean installation and with an installation on top of the old version, and just freezes for no apparent reason.

kd-11 pushed a commit to kd-11/rpcs3 that referenced this pull request Feb 14, 2022
* Revert "FS: use std::filesystem::u8path"

This reverts commit cd016be.

* Revert "VFS: fix missing path deliminators"

This reverts commit 84753db.

* Revert "Bugfix of Emulator::Load disc path searching"

This reverts commit b9179de.

* Revert "fs: Reimplement path resolving using std::filesystem::weakly_canonical"

This reverts commit 0c4b2ff.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Discussion Workaround To be fixed properly in the future.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants