Filter non-executable files out of the game list. #4922
Conversation
src/core/loader/loader.h
Outdated
| * @param out_executable Reference to store the executable flag into. | ||
| * @return ResultStatus result of function | ||
| */ | ||
| virtual ResultStatus IsExecutable(u8& out_executable) { |
There was a problem hiding this comment.
This should likely be a const member function, since a query shouldn't modify the loader's internal state.
There was a problem hiding this comment.
The function needs to be able to load the backing NCCH if it isn't already, so it can read the header data.
There was a problem hiding this comment.
This should likely be a bool
| @@ -198,6 +198,15 @@ ResultStatus AppLoader_NCCH::Load(std::shared_ptr<Kernel::Process>& process) { | |||
| return ResultStatus::Success; | |||
| } | |||
|
|
|||
| ResultStatus AppLoader_NCCH::IsExecutable(u8& out_executable) { | |||
| Loader::ResultStatus result = overlay_ncch->Load(); | |||
There was a problem hiding this comment.
This should probably not be loading the entire NCCH just to query whether or not it's executable. It's kind of overkill in this case.
There was a problem hiding this comment.
We already loaded the entire NCCH for game list anyway...
There was a problem hiding this comment.
I couldn't see a way to get the header data out of the NCCHContainer without making sure Load was called first. And yeah, Load would be called right after the check anyway when the game list reads the program ID.
src/core/loader/loader.h
Outdated
| * @param out_executable Reference to store the executable flag into. | ||
| * @return ResultStatus result of function | ||
| */ | ||
| virtual ResultStatus IsExecutable(u8& out_executable) { |
There was a problem hiding this comment.
This should likely be a bool
|
Changed the output type to a bool. |
|
So, this should close #4565 right? One question, is there any situation where the presence of those files may be important information to the user? |
|
I believe so, yes. And the only thing that immediately comes to mind would be allowing users to view included game manuals, but that should probably be exposed through some other means than an entry in the game list, and would be a feature for another PR. |
Currently, installing game CIAs will add a bunch of unusable entries for extra NCCH files like manual data. This change checks the executable bit in the NCCH header and filters non-executable entries out of the game list.
Before:
After:
This change is