ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WiiSave: Move overwrite prompt to Import 

WriteHeader should just write the header and not do anything else.
This commit is contained in:
Léo Lam 2018-06-01 00:10:55 +02:00
parent a46a8dd378
commit 94953670f2
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Source/Core/Core/HW/WiiSave.cpp
View File

@ -123,6 +123,7 @@ public:
}; };
virtual ~Storage() = default; virtual ~Storage() = default;
virtual bool SaveExists() { return true; }
virtual std::optional<Header> ReadHeader() = 0; virtual std::optional<Header> ReadHeader() = 0;
virtual std::optional<BkHeader> ReadBkHeader() = 0; virtual std::optional<BkHeader> ReadBkHeader() = 0;
virtual std::optional<std::vector<SaveFile>> ReadFiles() = 0; virtual std::optional<std::vector<SaveFile>> ReadFiles() = 0;
@ -146,6 +147,8 @@ public:
ScanForFiles(); ScanForFiles();
} }
bool SaveExists() override { return File::Exists(m_wii_title_path + "/banner.bin"); }
std::optional<Header> ReadHeader() override std::optional<Header> ReadHeader() override
{ {
Header header{}; Header header{};
@ -205,17 +208,8 @@ public:
bool WriteHeader(const Header& header) override bool WriteHeader(const Header& header) override
{ {
const std::string banner_file_path = m_wii_title_path + "/banner.bin"; File::IOFile banner_file(m_wii_title_path + "/banner.bin", "wb");
if (!File::Exists(banner_file_path) || return banner_file.WriteBytes(header.banner, header.hdr.banner_size);
AskYesNoT("%s already exists. Consider making a backup of the current save files before "
"overwriting.\nOverwrite now?",
banner_file_path.c_str()))
{
File::IOFile banner_file(banner_file_path, "wb");
banner_file.WriteBytes(header.banner, header.hdr.banner_size);
return true;
}
return false;
} }
bool WriteBkHeader(const BkHeader& bk_header) override { return true; } bool WriteBkHeader(const BkHeader& bk_header) override { return true; }
@ -518,10 +512,19 @@ bool Import(const std::string& data_bin_path)
{ {
IOS::HLE::Kernel ios; IOS::HLE::Kernel ios;
const auto data_bin = MakeDataBinStorage(&ios.GetIOSC(), data_bin_path, "rb"); const auto data_bin = MakeDataBinStorage(&ios.GetIOSC(), data_bin_path, "rb");
if (const std::optional<Header> header = data_bin->ReadHeader()) const std::optional<Header> header = data_bin->ReadHeader();
return Copy(data_bin.get(), MakeNandStorage(ios.GetFS().get(), header->hdr.tid).get()); if (!header)
ERROR_LOG(CORE, "WiiSave::Import: Failed to read header"); {
return false; ERROR_LOG(CORE, "WiiSave::Import: Failed to read header");
return false;
}
const auto nand = MakeNandStorage(ios.GetFS().get(), header->hdr.tid);
if (nand->SaveExists() && !AskYesNoT("Save data for this title already exists. Consider backing "
"up the current data before overwriting.\nOverwrite now?"))
{
return false;
}
return Copy(data_bin.get(), nand.get());
} }
static bool Export(u64 tid, const std::string& export_path, IOS::HLE::Kernel* ios) static bool Export(u64 tid, const std::string& export_path, IOS::HLE::Kernel* ios)