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

Fix games.yml hdd paths #14995

Merged
merged 1 commit into from Jan 2, 2024
Merged

Fix games.yml hdd paths #14995

merged 1 commit into from Jan 2, 2024

Conversation

Megamouse
Copy link
Contributor

  • Fixes a regression from the previous game path mounting fixes (we pass the emu dir now instead of title id)
  • Mount ps1 and psp remasters with their full dir name instead of the title id
  • Mount hdd games located in /games with their full dir name instead of the title_id

probably fixes #14994

@Megamouse Megamouse added Bugfix Loader Involving the load of PS3 file formats labels Jan 1, 2024
@Megamouse
Copy link
Contributor Author

Tested with a ps1 game and it still works.
It also fixes the uncharted videos from the last PR if located in /games.
For some reason infamouse 2 still expects the title id as game dir though, so I guess it uses some hardcoded check which may not be "fixable".


if (begin == source.npos)
return {};

return source.substr(begin, source.find_last_not_of(values) + 1);
}

std::string fmt::trim_front(const std::string& source, std::string_view values)
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it's better to return a string view, or at least have two functions like fs::get_parent_dir_view

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well, if it ever is necessary we can add it. But for this PR it hardly matters at all

@Megamouse Megamouse merged commit d03393f into RPCS3:master Jan 2, 2024
6 checks passed
@Megamouse Megamouse deleted the paths branch January 2, 2024 10:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bugfix Loader Involving the load of PS3 file formats
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Regression] inFAMOUS™ 2 (Digital) [NPUA80638] stopped booting up starting with 0.0.29-15856
2 participants