WiiSave: Use new filesystem interface #7059
Conversation
Converts WiiSave to the new filesystem interface.
There was a problem hiding this comment.
I've considered commenting on that tuple to become a struct with named members (and perhaps be shared with FS::Metadata), but it might not be worth the extra code (that can also be saved by using structured bindings; once we can at least). Also, since it seems to be constexpr right now (does that really work in practise?) a struct might get in the way.
Source/Core/Core/HW/WiiSave.cpp
Outdated
| @@ -204,8 +205,9 @@ class NandStorage final : public Storage | |||
| return false; | |||
|
|
|||
| const std::string banner_file_path = m_data_dir + "/banner.bin"; | |||
| const auto file = m_fs->CreateAndOpenFile(*m_uid, *m_gid, banner_file_path, FS::Mode::ReadWrite, | |||
| FS::Mode::ReadWrite, FS::Mode::ReadWrite); | |||
| const std::tuple<FS::Mode, FS::Mode, FS::Mode> modes = GetFsMode(header.permissions); | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
|
Hmm, adding a |
|
If it plays nice with the |
As suggested here: https://dolp.in/pr7059#pullrequestreview-125401778 More descriptive than having a std::tuple of FS::Mode, and lets us give names to known triplets of modes (like in ES). Functions that only forward mode arguments are slightly less verbose now too.
|
@BhaaLseN: pushed another commit with the Modes struct change |
All paths in SaveFile are relative to the title data directory, not absolute. Fixes an accidental regression from 5.0-7988 (PR dolphin-emu#7059).
All paths in SaveFile are relative to the title data directory, not absolute. Fixes an accidental regression from 5.0-7988 (PR dolphin-emu#7059).
Migrates WiiSave to the new filesystem interface.
The first commit is straightforward: it just replaces all of the FileUtil/File calls with IOS/FS in NandStorage.
The second commit makes WiiSave use the file permission information that is returned by FS or stored in the save header. Two functions, GetFsMode and GetBinMode, were added to convert the permission values between the two formats. Files will now be saved and restored with non-hardcoded, correct values.