piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

NANDImporter: Use a indeterminate progress meter

Browse Source
This commit is contained in:
Starsam80 2017-05-06 21:26:46 -06:00
parent 4dce620130
commit 618eb9f743
No known key found for this signature in database
GPG Key ID: 4E48BB48BA7E9026
3 changed files with 13 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Source/Core/DiscIO/NANDImporter.cpp
View File

@ -23,7 +23,7 @@ NANDImporter::NANDImporter() = default;
NANDImporter::~NANDImporter() = default;
void NANDImporter::ImportNANDBin(const std::string& path_to_bin,
std::function<void(size_t, size_t)> update_callback)
std::function<void()> update_callback)
{
m_update_callback = std::move(update_callback);
@ -32,7 +32,6 @@ void NANDImporter::ImportNANDBin(const std::string& path_to_bin,
const std::string nand_root = File::GetUserPath(D_WIIROOT_IDX);
FindSuperblock();
CountEntries(0);
ProcessEntry(0, nand_root);
ExportKeys(nand_root);
ExtractCertificates(nand_root);
@ -62,6 +61,11 @@ bool NANDImporter::ReadNANDBin(const std::string& path_to_bin)
for (size_t i = 0; i < NAND_TOTAL_BLOCKS; i++)
{
// Instead of updating on every cycle, we only update every 1000 cycles for a balance between
// not updating fast enough vs updating too fast
if (i % 1000 == 0)
m_update_callback();
file.ReadBytes(&m_nand[i * NAND_BLOCK_SIZE], NAND_BLOCK_SIZE);
file.Seek(NAND_ECC_BLOCK_SIZE, SEEK_CUR); // We don't care about the ECC blocks
}
@ -113,7 +117,6 @@ void NANDImporter::ProcessEntry(u16 entry_number, const std::string& parent_path
NANDFSTEntry entry;
memcpy(&entry, &m_nand[m_nand_fst_offset + sizeof(NANDFSTEntry) * Common::swap16(entry_number)],
sizeof(NANDFSTEntry));
UpdateStatus();
if (entry.sib != 0xffff)
ProcessEntry(entry.sib, parent_path);
@ -126,6 +129,8 @@ void NANDImporter::ProcessEntry(u16 entry_number, const std::string& parent_path
void NANDImporter::ProcessDirectory(const NANDFSTEntry& entry, const std::string& parent_path)
{
m_update_callback();
const std::string path = GetPath(entry, parent_path);
File::CreateDir(path);
@ -138,6 +143,8 @@ void NANDImporter::ProcessFile(const NANDFSTEntry& entry, const std::string& par
constexpr size_t NAND_AES_KEY_OFFSET = 0x158;
constexpr size_t NAND_FAT_BLOCK_SIZE = 0x4000;
m_update_callback();
const std::string path = GetPath(entry, parent_path);
File::IOFile file(path, "wb");
std::array<u8, 16> key{};
@ -201,24 +208,4 @@ void NANDImporter::ExportKeys(const std::string& nand_root)
if (!file.WriteBytes(m_nand_keys.data(), NAND_KEYS_SIZE))
PanicAlertT("Unable to write to file %s", file_path.c_str());
}
void NANDImporter::CountEntries(u16 entry_number)
{
NANDFSTEntry entry;
memcpy(&entry, &m_nand[m_nand_fst_offset + sizeof(NANDFSTEntry) * Common::swap16(entry_number)],
sizeof(NANDFSTEntry));
m_total_entries++;
if (entry.sib != 0xffff)
CountEntries(entry.sib);
if ((entry.mode & 3) == 2 && entry.sub != 0xffff)
CountEntries(entry.sub);
}
void NANDImporter::UpdateStatus()
{
m_update_callback(m_current_entry++, m_total_entries);
}
}

9
Source/Core/DiscIO/NANDImporter.h
View File

@ -18,8 +18,7 @@ public:
NANDImporter();
~NANDImporter();
void ImportNANDBin(const std::string& path_to_bin,
std::function<void(size_t, size_t)> update_callback);
void ImportNANDBin(const std::string& path_to_bin, std::function<void()> update_callback);
void ExtractCertificates(const std::string& nand_root);
private:
@ -46,15 +45,11 @@ private:
void ProcessFile(const NANDFSTEntry& entry, const std::string& parent_path);
void ProcessDirectory(const NANDFSTEntry& entry, const std::string& parent_path);
void ExportKeys(const std::string& nand_root);
void CountEntries(u16 entry_number);
void UpdateStatus();
std::vector<u8> m_nand;
std::vector<u8> m_nand_keys;
size_t m_nand_fat_offset = 0;
size_t m_nand_fst_offset = 0;
std::function<void(size_t, size_t)> m_update_callback;
size_t m_total_entries = 0;
size_t m_current_entry = 0;
std::function<void()> m_update_callback;
};
}

6
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -1279,11 +1279,7 @@ void CFrame::OnImportBootMiiBackup(wxCommandEvent& WXUNUSED(event))
wxProgressDialog dialog(_("Importing NAND backup"), _("Working..."), 100, this,
wxPD_APP_MODAL | wxPD_ELAPSED_TIME | wxPD_SMOOTH);
DiscIO::NANDImporter().ImportNANDBin(file_name,
[&dialog](size_t current_entry, size_t total_entries) {
dialog.SetRange(total_entries);
dialog.Update(current_entry);
});
DiscIO::NANDImporter().ImportNANDBin(file_name, [&dialog] { dialog.Pulse(); });
UpdateLoadWiiMenuItem();
}