piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

NANDImporter: Add logging

Browse Source
This commit is contained in:
Starsam80
2017-05-14 18:47:02 -06:00
parent 618eb9f743
commit 3229cde292
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,9 @@
#include "Common/Crypto/AES.h" #include "Common/Crypto/AES.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/Logging/Log.h"
#include "Common/MsgHandler.h" #include "Common/MsgHandler.h"
#include "Common/StringUtil.h"
#include "Common/Swap.h" #include "Common/Swap.h"
#include "DiscIO/NANDContentLoader.h" #include "DiscIO/NANDContentLoader.h"
@ -31,6 +33,10 @@ void NANDImporter::ImportNANDBin(const std::string& path_to_bin,
return; return;
const std::string nand_root = File::GetUserPath(D_WIIROOT_IDX); const std::string nand_root = File::GetUserPath(D_WIIROOT_IDX);
m_nand_root_length = nand_root.length();
if (nand_root.back() == '/')
m_nand_root_length++;
FindSuperblock(); FindSuperblock();
ProcessEntry(0, nand_root); ProcessEntry(0, nand_root);
ExportKeys(nand_root); ExportKeys(nand_root);
@ -87,6 +93,7 @@ void NANDImporter::FindSuperblock()
if (!memcmp(m_nand.data() + pos, "SFFS", 4)) if (!memcmp(m_nand.data() + pos, "SFFS", 4))
{ {
u32 version = Common::swap32(&m_nand[pos + 4]); u32 version = Common::swap32(&m_nand[pos + 4]);
INFO_LOG(DISCIO, "Found superblock at 0x%x with version 0x%x", pos, version);
if (superblock == 0 || version > newest_version) if (superblock == 0 || version > newest_version)
{ {
superblock = pos; superblock = pos;
@ -97,6 +104,8 @@ void NANDImporter::FindSuperblock()
m_nand_fat_offset = superblock + 0xC; m_nand_fat_offset = superblock + 0xC;
m_nand_fst_offset = m_nand_fat_offset + 0x10000; m_nand_fst_offset = m_nand_fat_offset + 0x10000;
INFO_LOG(DISCIO, "Using superblock version 0x%x at position 0x%x. FAT/FST offset: 0x%x/0x%x",
newest_version, superblock, m_nand_fat_offset, m_nand_fst_offset);
} }
std::string NANDImporter::GetPath(const NANDFSTEntry& entry, const std::string& parent_path) std::string NANDImporter::GetPath(const NANDFSTEntry& entry, const std::string& parent_path)
@ -112,6 +121,13 @@ std::string NANDImporter::GetPath(const NANDFSTEntry& entry, const std::string&
return parent_path + '/' + name; return parent_path + '/' + name;
} }
std::string NANDImporter::FormatDebugString(const NANDFSTEntry& entry)
{
return StringFromFormat("%12.12s 0x%02x 0x%02x 0x%04x 0x%04x 0x%08x 0x%04x 0x%04x 0x%04x 0x%08x",
entry.name, entry.mode, entry.attr, entry.sub, entry.sib, entry.size,
entry.x1, entry.uid, entry.gid, entry.x3);
}
void NANDImporter::ProcessEntry(u16 entry_number, const std::string& parent_path) void NANDImporter::ProcessEntry(u16 entry_number, const std::string& parent_path)
{ {
NANDFSTEntry entry; NANDFSTEntry entry;
@ -125,17 +141,22 @@ void NANDImporter::ProcessEntry(u16 entry_number, const std::string& parent_path
ProcessFile(entry, parent_path); ProcessFile(entry, parent_path);
else if ((entry.mode & 3) == 2) else if ((entry.mode & 3) == 2)
ProcessDirectory(entry, parent_path); ProcessDirectory(entry, parent_path);
else
ERROR_LOG(DISCIO, "Unknown mode: %s", FormatDebugString(entry).c_str());
} }
void NANDImporter::ProcessDirectory(const NANDFSTEntry& entry, const std::string& parent_path) void NANDImporter::ProcessDirectory(const NANDFSTEntry& entry, const std::string& parent_path)
{ {
m_update_callback(); m_update_callback();
INFO_LOG(DISCIO, "Path: %s", FormatDebugString(entry).c_str());
const std::string path = GetPath(entry, parent_path); const std::string path = GetPath(entry, parent_path);
File::CreateDir(path); File::CreateDir(path);
if (entry.sub != 0xffff) if (entry.sub != 0xffff)
ProcessEntry(entry.sub, path); ProcessEntry(entry.sub, path);
INFO_LOG(DISCIO, "Path: %s", parent_path.c_str() + m_nand_root_length);
} }
void NANDImporter::ProcessFile(const NANDFSTEntry& entry, const std::string& parent_path) void NANDImporter::ProcessFile(const NANDFSTEntry& entry, const std::string& parent_path)
@ -144,6 +165,7 @@ void NANDImporter::ProcessFile(const NANDFSTEntry& entry, const std::string& par
constexpr size_t NAND_FAT_BLOCK_SIZE = 0x4000; constexpr size_t NAND_FAT_BLOCK_SIZE = 0x4000;
m_update_callback(); m_update_callback();
INFO_LOG(DISCIO, "File: %s", FormatDebugString(entry).c_str());
const std::string path = GetPath(entry, parent_path); const std::string path = GetPath(entry, parent_path);
File::IOFile file(path, "wb"); File::IOFile file(path, "wb");

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

@ -41,6 +41,7 @@ private:
bool ReadNANDBin(const std::string& path_to_bin); bool ReadNANDBin(const std::string& path_to_bin);
void FindSuperblock(); void FindSuperblock();
std::string GetPath(const NANDFSTEntry& entry, const std::string& parent_path); std::string GetPath(const NANDFSTEntry& entry, const std::string& parent_path);
std::string FormatDebugString(const NANDFSTEntry& entry);
void ProcessEntry(u16 entry_number, const std::string& parent_path); void ProcessEntry(u16 entry_number, const std::string& parent_path);
void ProcessFile(const NANDFSTEntry& entry, const std::string& parent_path); void ProcessFile(const NANDFSTEntry& entry, const std::string& parent_path);
void ProcessDirectory(const NANDFSTEntry& entry, const std::string& parent_path); void ProcessDirectory(const NANDFSTEntry& entry, const std::string& parent_path);
@ -51,5 +52,6 @@ private:
size_t m_nand_fat_offset = 0; size_t m_nand_fat_offset = 0;
size_t m_nand_fst_offset = 0; size_t m_nand_fst_offset = 0;
std::function<void()> m_update_callback; std::function<void()> m_update_callback;
size_t m_nand_root_length = 0;
}; };
} }