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

Merge pull request #2820 from JosJuice/filesystem 

Filesystem redesign and performance improvements
This commit is contained in:
Leo Lam 2017-06-15 21:24:42 +02:00 committed by GitHub
parent 335f54cac6 583406d900
commit 09c0a3caaf
12 changed files with 627 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/Core/HW/DVD/FileMonitor.cpp
View File

@ -88,28 +88,28 @@ void Log(u64 offset, const DiscIO::Partition& partition)
if (!s_filesystem) if (!s_filesystem)
return; return;
const std::string filename = s_filesystem->GetFileName(offset); const std::unique_ptr<DiscIO::FileInfo> file_info = s_filesystem->FindFileInfo(offset);
// Do nothing if no file was found at that offset // Do nothing if no file was found at that offset
if (filename.empty()) if (!file_info)
return; return;
const std::string path = file_info->GetPath();
// Do nothing if we found the same file again // Do nothing if we found the same file again
if (s_previous_file == filename) if (s_previous_file == path)
return; return;
const u64 size = s_filesystem->GetFileSize(filename); const std::string size_string = ThousandSeparate(file_info->GetSize() / 1000, 7);
const std::string size_string = ThousandSeparate(size / 1000, 7);
const std::string log_string = const std::string log_string = StringFromFormat("%s kB %s", size_string.c_str(), path.c_str());
StringFromFormat("%s kB %s", size_string.c_str(), filename.c_str()); if (IsSoundFile(path))
if (IsSoundFile(filename))
INFO_LOG(FILEMON, "%s", log_string.c_str()); INFO_LOG(FILEMON, "%s", log_string.c_str());
else else
WARN_LOG(FILEMON, "%s", log_string.c_str()); WARN_LOG(FILEMON, "%s", log_string.c_str());
// Update the last accessed file // Update the last accessed file
s_previous_file = filename; s_previous_file = path;
} }
} // namespace FileMonitor } // namespace FileMonitor

19
Source/Core/DiscIO/DiscScrubber.cpp
View File

@ -219,14 +219,21 @@ bool DiscScrubber::ParsePartitionData(const Partition& partition, PartitionHeade
MarkAsUsedE(partition_data_offset, header->fst_offset, header->fst_size); MarkAsUsedE(partition_data_offset, header->fst_offset, header->fst_size);
// Go through the filesystem and mark entries as used // Go through the filesystem and mark entries as used
for (const FileInfo& file : filesystem->GetFileList()) ParseFileSystemData(partition_data_offset, filesystem->GetRoot());
{
DEBUG_LOG(DISCIO, "%s", file.m_FullPath.empty() ? "/" : file.m_FullPath.c_str());
if ((file.m_NameOffset & 0x1000000) == 0)
MarkAsUsedE(partition_data_offset, file.m_Offset, file.m_FileSize);
}
return true; return true;
} }
void DiscScrubber::ParseFileSystemData(u64 partition_data_offset, const FileInfo& directory)
{
for (const DiscIO::FileInfo& file_info : directory)
{
DEBUG_LOG(DISCIO, "Scrubbing %s", file_info.GetPath().c_str());
if (file_info.IsDirectory())
ParseFileSystemData(partition_data_offset, file_info);
else
MarkAsUsedE(partition_data_offset, file_info.GetOffset(), file_info.GetSize());
}
}
} // namespace DiscIO } // namespace DiscIO

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

@ -25,6 +25,7 @@ class IOFile;
namespace DiscIO namespace DiscIO
{ {
class FileInfo;
class Volume; class Volume;
struct Partition; struct Partition;
@ -64,6 +65,7 @@ private:
bool ReadFromVolume(u64 offset, u64& buffer, const Partition& partition); bool ReadFromVolume(u64 offset, u64& buffer, const Partition& partition);
bool ParseDisc(); bool ParseDisc();
bool ParsePartitionData(const Partition& partition, PartitionHeader* header); bool ParsePartitionData(const Partition& partition, PartitionHeader* header);
void ParseFileSystemData(u64 partition_data_offset, const FileInfo& directory);
std::string m_filename; std::string m_filename;
std::unique_ptr<Volume> m_disc; std::unique_ptr<Volume> m_disc;

537
Source/Core/DiscIO/FileSystemGCWii.cpp
View File

@ -6,6 +6,8 @@
#include <cinttypes> #include <cinttypes>
#include <cstddef> #include <cstddef>
#include <cstring> #include <cstring>
#include <map>
#include <memory>
#include <optional> #include <optional>
#include <string> #include <string>
#include <vector> #include <vector>
@ -22,114 +24,372 @@
namespace DiscIO namespace DiscIO
{ {
FileSystemGCWii::FileSystemGCWii(const Volume* _rVolume, const Partition& partition) constexpr u32 FST_ENTRY_SIZE = 4 * 3; // An FST entry consists of three 32-bit integers
: FileSystem(_rVolume, partition), m_Initialized(false), m_Valid(false), m_offset_shift(0)
// Set everything manually.
FileInfoGCWii::FileInfoGCWii(const u8* fst, u8 offset_shift, u32 index, u32 total_file_infos)
: m_fst(fst), m_offset_shift(offset_shift), m_index(index), m_total_file_infos(total_file_infos)
{ {
m_Valid = DetectFileSystem();
} }
FileSystemGCWii::~FileSystemGCWii() // For the root object only.
// m_fst and m_index must be correctly set before GetSize() is called!
FileInfoGCWii::FileInfoGCWii(const u8* fst, u8 offset_shift)
: m_fst(fst), m_offset_shift(offset_shift), m_index(0), m_total_file_infos(GetSize())
{ {
m_FileInfoVector.clear();
} }
u64 FileSystemGCWii::GetFileSize(const std::string& _rFullPath) // Copy data that is common to the whole file system.
FileInfoGCWii::FileInfoGCWii(const FileInfoGCWii& file_info, u32 index)
: FileInfoGCWii(file_info.m_fst, file_info.m_offset_shift, index, file_info.m_total_file_infos)
{ {
if (!m_Initialized)
InitFileSystem();
const FileInfo* pFileInfo = FindFileInfo(_rFullPath);
if (pFileInfo != nullptr && !pFileInfo->IsDirectory())
return pFileInfo->m_FileSize;
return 0;
} }
std::string FileSystemGCWii::GetFileName(u64 _Address) FileInfoGCWii::~FileInfoGCWii() = default;
{
if (!m_Initialized)
InitFileSystem();
for (auto& fileInfo : m_FileInfoVector) uintptr_t FileInfoGCWii::GetAddress() const
{ {
if ((fileInfo.m_Offset <= _Address) && ((fileInfo.m_Offset + fileInfo.m_FileSize) > _Address)) return reinterpret_cast<uintptr_t>(m_fst + FST_ENTRY_SIZE * m_index);
{
return fileInfo.m_FullPath;
}
} }
u32 FileInfoGCWii::GetNextIndex() const
{
return IsDirectory() ? GetSize() : m_index + 1;
}
FileInfo& FileInfoGCWii::operator++()
{
m_index = GetNextIndex();
return *this;
}
std::unique_ptr<FileInfo> FileInfoGCWii::clone() const
{
return std::make_unique<FileInfoGCWii>(*this);
}
FileInfo::const_iterator FileInfoGCWii::begin() const
{
return const_iterator(std::make_unique<FileInfoGCWii>(*this, m_index + 1));
}
FileInfo::const_iterator FileInfoGCWii::end() const
{
return const_iterator(std::make_unique<FileInfoGCWii>(*this, GetNextIndex()));
}
u32 FileInfoGCWii::Get(EntryProperty entry_property) const
{
return Common::swap32(m_fst + FST_ENTRY_SIZE * m_index +
sizeof(u32) * static_cast<int>(entry_property));
}
u32 FileInfoGCWii::GetSize() const
{
return Get(EntryProperty::FILE_SIZE);
}
u64 FileInfoGCWii::GetOffset() const
{
return static_cast<u64>(Get(EntryProperty::FILE_OFFSET)) << m_offset_shift;
}
bool FileInfoGCWii::IsDirectory() const
{
return (Get(EntryProperty::NAME_OFFSET) & 0xFF000000) != 0;
}
u32 FileInfoGCWii::GetTotalChildren() const
{
return Get(EntryProperty::FILE_SIZE) - (m_index + 1);
}
u64 FileInfoGCWii::GetNameOffset() const
{
return static_cast<u64>(FST_ENTRY_SIZE) * m_total_file_infos +
(Get(EntryProperty::NAME_OFFSET) & 0xFFFFFF);
}
std::string FileInfoGCWii::GetName() const
{
// TODO: Should we really always use SHIFT-JIS?
// Some names in Pikmin (NTSC-U) don't make sense without it, but is it correct?
return SHIFTJISToUTF8(reinterpret_cast<const char*>(m_fst + GetNameOffset()));
}
std::string FileInfoGCWii::GetPath() const
{
// The root entry doesn't have a name
if (m_index == 0)
return ""; return "";
if (IsDirectory())
{
u32 parent_directory_index = Get(EntryProperty::FILE_OFFSET);
return FileInfoGCWii(*this, parent_directory_index).GetPath() + GetName() + "/";
}
else
{
// The parent directory can be found by searching backwards
// for a directory that contains this file. The search cannot fail,
// because the root directory at index 0 contains all files.
FileInfoGCWii potential_parent(*this, m_index - 1);
while (!(potential_parent.IsDirectory() &&
potential_parent.Get(EntryProperty::FILE_SIZE) > m_index))
{
potential_parent = FileInfoGCWii(*this, potential_parent.m_index - 1);
}
return potential_parent.GetPath() + GetName();
}
} }
u64 FileSystemGCWii::ReadFile(const std::string& _rFullPath, u8* _pBuffer, u64 _MaxBufferSize, bool FileInfoGCWii::IsValid(u64 fst_size, const FileInfoGCWii& parent_directory) const
u64 _OffsetInFile)
{ {
if (!m_Initialized) if (GetNameOffset() >= fst_size)
InitFileSystem(); {
ERROR_LOG(DISCIO, "Impossibly large name offset in file system");
return false;
}
const FileInfo* pFileInfo = FindFileInfo(_rFullPath); if (IsDirectory())
if (pFileInfo == nullptr) {
if (Get(EntryProperty::FILE_OFFSET) != parent_directory.m_index)
{
ERROR_LOG(DISCIO, "Incorrect parent offset in file system");
return false;
}
u32 size = Get(EntryProperty::FILE_SIZE);
if (size <= m_index)
{
ERROR_LOG(DISCIO, "Impossibly small directory size in file system");
return false;
}
if (size > parent_directory.Get(EntryProperty::FILE_SIZE))
{
ERROR_LOG(DISCIO, "Impossibly large directory size in file system");
return false;
}
for (const FileInfo& child : *this)
{
if (!static_cast<const FileInfoGCWii&>(child).IsValid(fst_size, *this))
return false;
}
}
return true;
}
FileSystemGCWii::FileSystemGCWii(const Volume* volume, const Partition& partition)
: FileSystem(volume, partition), m_valid(false), m_offset_shift(0), m_root(nullptr, 0, 0, 0)
{
// Check if this is a GameCube or Wii disc
if (m_volume->ReadSwapped<u32>(0x18, m_partition) == u32(0x5D1C9EA3))
m_offset_shift = 2; // Wii file system
else if (m_volume->ReadSwapped<u32>(0x1c, m_partition) == u32(0xC2339F3D))
m_offset_shift = 0; // GameCube file system
else
return;
const std::optional<u32> fst_offset_unshifted = m_volume->ReadSwapped<u32>(0x424, m_partition);
const std::optional<u32> fst_size_unshifted = m_volume->ReadSwapped<u32>(0x428, m_partition);
if (!fst_offset_unshifted || !fst_size_unshifted)
return;
const u64 fst_offset = static_cast<u64>(*fst_offset_unshifted) << m_offset_shift;
const u64 fst_size = static_cast<u64>(*fst_size_unshifted) << m_offset_shift;
if (fst_size < FST_ENTRY_SIZE)
{
ERROR_LOG(DISCIO, "File system is too small");
return;
}
// 128 MiB is more than the total amount of RAM in a Wii.
// No file system should use anywhere near that much.
static const u32 ARBITRARY_FILE_SYSTEM_SIZE_LIMIT = 128 * 1024 * 1024;
if (fst_size > ARBITRARY_FILE_SYSTEM_SIZE_LIMIT)
{
// Without this check, Dolphin can crash by trying to allocate too much
// memory when loading a disc image with an incorrect FST size.
ERROR_LOG(DISCIO, "File system is abnormally large! Aborting loading");
return;
}
// Read the whole FST
m_file_system_table.resize(fst_size);
if (!m_volume->Read(fst_offset, fst_size, m_file_system_table.data(), m_partition))
{
ERROR_LOG(DISCIO, "Couldn't read file system table");
return;
}
// Create the root object
m_root = FileInfoGCWii(m_file_system_table.data(), m_offset_shift);
if (!m_root.IsDirectory())
{
ERROR_LOG(DISCIO, "File system root is not a directory");
return;
}
if (FST_ENTRY_SIZE * m_root.GetSize() > fst_size)
{
ERROR_LOG(DISCIO, "File system has too many entries for its size");
return;
}
// If the FST's final byte isn't 0, CFileInfoGCWii::GetName() can read past the end
if (m_file_system_table[fst_size - 1] != 0)
{
ERROR_LOG(DISCIO, "File system does not end with a null byte");
return;
}
m_valid = m_root.IsValid(fst_size, m_root);
}
FileSystemGCWii::~FileSystemGCWii() = default;
const FileInfo& FileSystemGCWii::GetRoot() const
{
return m_root;
}
std::unique_ptr<FileInfo> FileSystemGCWii::FindFileInfo(const std::string& path) const
{
if (!IsValid())
return nullptr;
return FindFileInfo(path, m_root);
}
std::unique_ptr<FileInfo> FileSystemGCWii::FindFileInfo(const std::string& path,
const FileInfo& file_info) const
{
// Given a path like "directory1/directory2/fileA.bin", this function will
// find directory1 and then call itself to search for "directory2/fileA.bin".
if (path.empty() || path == "/")
return file_info.clone();
// It's only possible to search in directories. Searching in a file is an error
if (!file_info.IsDirectory())
return nullptr;
size_t first_dir_separator = path.find('/');
const std::string searching_for = path.substr(0, first_dir_separator);
const std::string rest_of_path =
(first_dir_separator != std::string::npos) ? path.substr(first_dir_separator + 1) : "";
for (const FileInfo& child : file_info)
{
if (child.GetName() == searching_for)
{
// A match is found. The rest of the path is passed on to finish the search.
std::unique_ptr<FileInfo> result = FindFileInfo(rest_of_path, child);
// If the search wasn't successful, the loop continues, just in case there's a second
// file info that matches searching_for (which probably won't happen in practice)
if (result)
return result;
}
}
return nullptr;
}
std::unique_ptr<FileInfo> FileSystemGCWii::FindFileInfo(u64 disc_offset) const
{
if (!IsValid())
return nullptr;
// Build a cache (unless there already is one)
if (m_offset_file_info_cache.empty())
{
u32 fst_entries = m_root.GetSize();
for (u32 i = 0; i < fst_entries; i++)
{
FileInfoGCWii file_info(m_root, i);
if (!file_info.IsDirectory())
m_offset_file_info_cache.emplace(file_info.GetOffset() + file_info.GetSize(), i);
}
}
// Get the first file that ends after disc_offset
const auto it = m_offset_file_info_cache.upper_bound(disc_offset);
if (it == m_offset_file_info_cache.end())
return nullptr;
std::unique_ptr<FileInfo> result(std::make_unique<FileInfoGCWii>(m_root, it->second));
// If the file's start isn't after disc_offset, success
if (result->GetOffset() <= disc_offset)
return result;
return nullptr;
}
u64 FileSystemGCWii::ReadFile(const FileInfo* file_info, u8* buffer, u64 max_buffer_size,
u64 offset_in_file) const
{
if (!file_info || file_info->IsDirectory())
return 0; return 0;
if (_OffsetInFile >= pFileInfo->m_FileSize) if (offset_in_file >= file_info->GetSize())
return 0; return 0;
u64 read_length = std::min(_MaxBufferSize, pFileInfo->m_FileSize - _OffsetInFile); u64 read_length = std::min(max_buffer_size, file_info->GetSize() - offset_in_file);
DEBUG_LOG(DISCIO, "Reading %" PRIx64 " bytes at %" PRIx64 " from file %s. Offset: %" PRIx64 DEBUG_LOG(DISCIO, "Reading %" PRIx64 " bytes at %" PRIx64 " from file %s. Offset: %" PRIx64
" Size: %" PRIx64, " Size: %" PRIx32,
read_length, _OffsetInFile, _rFullPath.c_str(), pFileInfo->m_Offset, read_length, offset_in_file, file_info->GetPath().c_str(), file_info->GetOffset(),
pFileInfo->m_FileSize); file_info->GetSize());
m_rVolume->Read(pFileInfo->m_Offset + _OffsetInFile, read_length, _pBuffer, m_partition); m_volume->Read(file_info->GetOffset() + offset_in_file, read_length, buffer, m_partition);
return read_length; return read_length;
} }
bool FileSystemGCWii::ExportFile(const std::string& _rFullPath, const std::string& _rExportFilename) bool FileSystemGCWii::ExportFile(const FileInfo* file_info,
const std::string& export_filename) const
{ {
if (!m_Initialized) if (!file_info || file_info->IsDirectory())
InitFileSystem();
const FileInfo* pFileInfo = FindFileInfo(_rFullPath);
if (!pFileInfo)
return false; return false;
u64 remainingSize = pFileInfo->m_FileSize; u64 remaining_size = file_info->GetSize();
u64 fileOffset = pFileInfo->m_Offset; u64 file_offset = file_info->GetOffset();
File::IOFile f(_rExportFilename, "wb"); File::IOFile f(export_filename, "wb");
if (!f) if (!f)
return false; return false;
bool result = true; bool result = true;
while (remainingSize) while (remaining_size)
{ {
// Limit read size to 128 MB // Limit read size to 128 MB
size_t readSize = (size_t)std::min(remainingSize, (u64)0x08000000); size_t read_size = (size_t)std::min(remaining_size, (u64)0x08000000);
std::vector<u8> buffer(readSize); std::vector<u8> buffer(read_size);
result = m_rVolume->Read(fileOffset, readSize, &buffer[0], m_partition); result = m_volume->Read(file_offset, read_size, &buffer[0], m_partition);
if (!result) if (!result)
break; break;
f.WriteBytes(&buffer[0], readSize); f.WriteBytes(&buffer[0], read_size);
remainingSize -= readSize; remaining_size -= read_size;
fileOffset += readSize; file_offset += read_size;
} }
return result; return result;
} }
bool FileSystemGCWii::ExportApploader(const std::string& _rExportFolder) const bool FileSystemGCWii::ExportApploader(const std::string& export_folder) const
{ {
std::optional<u32> apploader_size = m_rVolume->ReadSwapped<u32>(0x2440 + 0x14, m_partition); std::optional<u32> apploader_size = m_volume->ReadSwapped<u32>(0x2440 + 0x14, m_partition);
const std::optional<u32> trailer_size = m_rVolume->ReadSwapped<u32>(0x2440 + 0x18, m_partition); const std::optional<u32> trailer_size = m_volume->ReadSwapped<u32>(0x2440 + 0x18, m_partition);
constexpr u32 header_size = 0x20; constexpr u32 header_size = 0x20;
if (!apploader_size || !trailer_size) if (!apploader_size || !trailer_size)
return false; return false;
@ -137,14 +397,14 @@ bool FileSystemGCWii::ExportApploader(const std::string& _rExportFolder) const
DEBUG_LOG(DISCIO, "Apploader size -> %x", *apploader_size); DEBUG_LOG(DISCIO, "Apploader size -> %x", *apploader_size);
std::vector<u8> buffer(*apploader_size); std::vector<u8> buffer(*apploader_size);
if (m_rVolume->Read(0x2440, *apploader_size, buffer.data(), m_partition)) if (m_volume->Read(0x2440, *apploader_size, buffer.data(), m_partition))
{ {
std::string exportName(_rExportFolder + "/apploader.img"); std::string export_name(export_folder + "/apploader.img");
File::IOFile AppFile(exportName, "wb"); File::IOFile apploader_file(export_name, "wb");
if (AppFile) if (apploader_file)
{ {
AppFile.WriteBytes(buffer.data(), *apploader_size); apploader_file.WriteBytes(buffer.data(), *apploader_size);
return true; return true;
} }
} }
@ -154,7 +414,7 @@ bool FileSystemGCWii::ExportApploader(const std::string& _rExportFolder) const
std::optional<u64> FileSystemGCWii::GetBootDOLOffset() const std::optional<u64> FileSystemGCWii::GetBootDOLOffset() const
{ {
std::optional<u32> offset = m_rVolume->ReadSwapped<u32>(0x420, m_partition); std::optional<u32> offset = m_volume->ReadSwapped<u32>(0x420, m_partition);
return offset ? static_cast<u64>(*offset) << m_offset_shift : std::optional<u64>(); return offset ? static_cast<u64>(*offset) << m_offset_shift : std::optional<u64>();
} }
@ -166,9 +426,9 @@ std::optional<u32> FileSystemGCWii::GetBootDOLSize(u64 dol_offset) const
for (u8 i = 0; i < 7; i++) for (u8 i = 0; i < 7; i++)
{ {
const std::optional<u32> offset = const std::optional<u32> offset =
m_rVolume->ReadSwapped<u32>(dol_offset + 0x00 + i * 4, m_partition); m_volume->ReadSwapped<u32>(dol_offset + 0x00 + i * 4, m_partition);
const std::optional<u32> size = const std::optional<u32> size =
m_rVolume->ReadSwapped<u32>(dol_offset + 0x90 + i * 4, m_partition); m_volume->ReadSwapped<u32>(dol_offset + 0x90 + i * 4, m_partition);
if (!offset || !size) if (!offset || !size)
return {}; return {};
dol_size = std::max(*offset + *size, dol_size); dol_size = std::max(*offset + *size, dol_size);
@ -178,9 +438,9 @@ std::optional<u32> FileSystemGCWii::GetBootDOLSize(u64 dol_offset) const
for (u8 i = 0; i < 11; i++) for (u8 i = 0; i < 11; i++)
{ {
const std::optional<u32> offset = const std::optional<u32> offset =
m_rVolume->ReadSwapped<u32>(dol_offset + 0x1c + i * 4, m_partition); m_volume->ReadSwapped<u32>(dol_offset + 0x1c + i * 4, m_partition);
const std::optional<u32> size = const std::optional<u32> size =
m_rVolume->ReadSwapped<u32>(dol_offset + 0xac + i * 4, m_partition); m_volume->ReadSwapped<u32>(dol_offset + 0xac + i * 4, m_partition);
if (!offset || !size) if (!offset || !size)
return {}; return {};
dol_size = std::max(*offset + *size, dol_size); dol_size = std::max(*offset + *size, dol_size);
@ -189,7 +449,7 @@ std::optional<u32> FileSystemGCWii::GetBootDOLSize(u64 dol_offset) const
return dol_size; return dol_size;
} }
bool FileSystemGCWii::ExportDOL(const std::string& _rExportFolder) const bool FileSystemGCWii::ExportDOL(const std::string& export_folder) const
{ {
std::optional<u64> dol_offset = GetBootDOLOffset(); std::optional<u64> dol_offset = GetBootDOLOffset();
if (!dol_offset) if (!dol_offset)
@ -199,14 +459,14 @@ bool FileSystemGCWii::ExportDOL(const std::string& _rExportFolder) const
return false; return false;
std::vector<u8> buffer(*dol_size); std::vector<u8> buffer(*dol_size);
if (m_rVolume->Read(*dol_offset, *dol_size, &buffer[0], m_partition)) if (m_volume->Read(*dol_offset, *dol_size, buffer.data(), m_partition))
{ {
std::string exportName(_rExportFolder + "/boot.dol"); std::string export_name(export_folder + "/boot.dol");
File::IOFile DolFile(exportName, "wb"); File::IOFile dol_file(export_name, "wb");
if (DolFile) if (dol_file)
{ {
DolFile.WriteBytes(&buffer[0], *dol_size); dol_file.WriteBytes(&buffer[0], *dol_size);
return true; return true;
} }
} }
@ -214,137 +474,4 @@ bool FileSystemGCWii::ExportDOL(const std::string& _rExportFolder) const
return false; return false;
} }
std::string FileSystemGCWii::GetStringFromOffset(u64 _Offset) const
{
std::string data(255, 0x00);
m_rVolume->Read(_Offset, data.size(), (u8*)&data[0], m_partition);
data.erase(std::find(data.begin(), data.end(), 0x00), data.end());
// TODO: Should we really always use SHIFT-JIS?
// It makes some filenames in Pikmin (NTSC-U) sane, but is it correct?
return SHIFTJISToUTF8(data);
}
const std::vector<FileInfo>& FileSystemGCWii::GetFileList()
{
if (!m_Initialized)
InitFileSystem();
return m_FileInfoVector;
}
const FileInfo* FileSystemGCWii::FindFileInfo(const std::string& _rFullPath)
{
if (!m_Initialized)
InitFileSystem();
for (auto& fileInfo : m_FileInfoVector)
{
if (!strcasecmp(fileInfo.m_FullPath.c_str(), _rFullPath.c_str()))
return &fileInfo;
}
return nullptr;
}
bool FileSystemGCWii::DetectFileSystem()
{
if (m_rVolume->ReadSwapped<u32>(0x18, m_partition) == u32(0x5D1C9EA3))
{
m_offset_shift = 2; // Wii file system
return true;
}
else if (m_rVolume->ReadSwapped<u32>(0x1c, m_partition) == u32(0xC2339F3D))
{
m_offset_shift = 0; // GameCube file system
return true;
}
return false;
}
void FileSystemGCWii::InitFileSystem()
{
m_Initialized = true;
// read the whole FST
const std::optional<u32> fst_offset_unshifted = m_rVolume->ReadSwapped<u32>(0x424, m_partition);
if (!fst_offset_unshifted)
return;
const u64 FSTOffset = static_cast<u64>(*fst_offset_unshifted) << m_offset_shift;
// read all fileinfos
const std::optional<u32> root_name_offset = m_rVolume->ReadSwapped<u32>(FSTOffset, m_partition);
const std::optional<u32> root_offset = m_rVolume->ReadSwapped<u32>(FSTOffset + 0x4, m_partition);
const std::optional<u32> root_size = m_rVolume->ReadSwapped<u32>(FSTOffset + 0x8, m_partition);
if (!root_name_offset || !root_offset || !root_size)
return;
FileInfo root = {*root_name_offset, static_cast<u64>(*root_offset) << m_offset_shift, *root_size};
if (!root.IsDirectory())
return;
// 12 bytes (the size of a file entry) times 10 * 1024 * 1024 is 120 MiB,
// more than total RAM in a Wii. No file system should use anywhere near that much.
static const u32 ARBITRARY_FILE_SYSTEM_SIZE_LIMIT = 10 * 1024 * 1024;
if (root.m_FileSize > ARBITRARY_FILE_SYSTEM_SIZE_LIMIT)
{
// Without this check, Dolphin can crash by trying to allocate too much
// memory when loading the file systems of certain malformed disc images.
ERROR_LOG(DISCIO, "File system is abnormally large! Aborting loading");
return;
}
if (m_FileInfoVector.size())
PanicAlert("Wtf?");
u64 NameTableOffset = FSTOffset;
m_FileInfoVector.reserve((size_t)root.m_FileSize);
for (u32 i = 0; i < root.m_FileSize; i++)
{
const u64 read_offset = FSTOffset + (i * 0xC);
const std::optional<u32> name_offset = m_rVolume->ReadSwapped<u32>(read_offset, m_partition);
const std::optional<u32> offset = m_rVolume->ReadSwapped<u32>(read_offset + 0x4, m_partition);
const std::optional<u32> size = m_rVolume->ReadSwapped<u32>(read_offset + 0x8, m_partition);
m_FileInfoVector.emplace_back(name_offset.value_or(0),
static_cast<u64>(offset.value_or(0)) << m_offset_shift,
size.value_or(0));
NameTableOffset += 0xC;
}
BuildFilenames(1, m_FileInfoVector.size(), "", NameTableOffset);
}
size_t FileSystemGCWii::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex,
const std::string& _szDirectory, u64 _NameTableOffset)
{
size_t CurrentIndex = _FirstIndex;
while (CurrentIndex < _LastIndex)
{
FileInfo& rFileInfo = m_FileInfoVector[CurrentIndex];
u64 const uOffset = _NameTableOffset + (rFileInfo.m_NameOffset & 0xFFFFFF);
std::string const offset_str{GetStringFromOffset(uOffset)};
bool const is_dir = rFileInfo.IsDirectory();
rFileInfo.m_FullPath.reserve(_szDirectory.size() + offset_str.size());
rFileInfo.m_FullPath.append(_szDirectory.data(), _szDirectory.size())
.append(offset_str.data(), offset_str.size())
.append("/", size_t(is_dir));
if (!is_dir)
{
++CurrentIndex;
continue;
}
// check next index
CurrentIndex = BuildFilenames(CurrentIndex + 1, (size_t)rFileInfo.m_FileSize,
rFileInfo.m_FullPath, _NameTableOffset);
}
return CurrentIndex;
}
} // namespace } // namespace

103
Source/Core/DiscIO/FileSystemGCWii.h
View File

@ -5,6 +5,8 @@
#pragma once #pragma once
#include <cstddef> #include <cstddef>
#include <map>
#include <memory>
#include <optional> #include <optional>
#include <string> #include <string>
#include <vector> #include <vector>
@ -17,36 +19,97 @@ namespace DiscIO
class Volume; class Volume;
struct Partition; struct Partition;
class FileInfoGCWii : public FileInfo
{
public:
// None of the constructors take ownership of FST pointers
// Set everything manually
FileInfoGCWii(const u8* fst, u8 offset_shift, u32 index, u32 total_file_infos);
// For the root object only
FileInfoGCWii(const u8* fst, u8 offset_shift);
// Copy another object
FileInfoGCWii(const FileInfoGCWii& file_info) = default;
// Copy data that is common to the whole file system
FileInfoGCWii(const FileInfoGCWii& file_info, u32 index);
~FileInfoGCWii() override;
std::unique_ptr<FileInfo> clone() const override;
const_iterator begin() const override;
const_iterator end() const override;
u64 GetOffset() const override;
u32 GetSize() const override;
bool IsDirectory() const override;
u32 GetTotalChildren() const override;
std::string GetName() const override;
std::string GetPath() const override;
bool IsValid(u64 fst_size, const FileInfoGCWii& parent_directory) const;
protected:
uintptr_t GetAddress() const override;
FileInfo& operator++() override;
private:
enum class EntryProperty
{
// NAME_OFFSET's lower 3 bytes are the name's offset within the name table.
// NAME_OFFSET's upper 1 byte is 1 for directories and 0 for files.
NAME_OFFSET = 0,
// For files, FILE_OFFSET is the file offset in the partition,
// and for directories, it's the FST index of the parent directory.
// The root directory has its parent directory index set to 0.
FILE_OFFSET = 1,
// For files, FILE_SIZE is the file size, and for directories,
// it's the FST index of the next entry that isn't in the directory.
FILE_SIZE = 2
};
// For files, returns the index of the next item. For directories,
// returns the index of the next item that isn't inside it.
u32 GetNextIndex() const;
// Returns one of the three properties of this FST entry.
// Read the comments in EntryProperty for details.
u32 Get(EntryProperty entry_property) const;
// Returns the name offset, excluding the directory identification byte
u64 GetNameOffset() const;
const u8* m_fst;
u8 m_offset_shift;
u32 m_index;
u32 m_total_file_infos;
};
class FileSystemGCWii : public FileSystem class FileSystemGCWii : public FileSystem
{ {
public: public:
FileSystemGCWii(const Volume* _rVolume, const Partition& partition); FileSystemGCWii(const Volume* volume, const Partition& partition);
virtual ~FileSystemGCWii(); ~FileSystemGCWii() override;
bool IsValid() const override { return m_Valid; } bool IsValid() const override { return m_valid; }
u64 GetFileSize(const std::string& _rFullPath) override; const FileInfo& GetRoot() const override;
const std::vector<FileInfo>& GetFileList() override; std::unique_ptr<FileInfo> FindFileInfo(const std::string& path) const override;
std::string GetFileName(u64 _Address) override; std::unique_ptr<FileInfo> FindFileInfo(u64 disc_offset) const override;
u64 ReadFile(const std::string& _rFullPath, u8* _pBuffer, u64 _MaxBufferSize,
u64 _OffsetInFile) override; u64 ReadFile(const FileInfo* file_info, u8* buffer, u64 max_buffer_size,
bool ExportFile(const std::string& _rFullPath, const std::string& _rExportFilename) override; u64 offset_in_file) const override;
bool ExportApploader(const std::string& _rExportFolder) const override; bool ExportFile(const FileInfo* file_info, const std::string& export_filename) const override;
bool ExportDOL(const std::string& _rExportFolder) const override; bool ExportApploader(const std::string& export_folder) const override;
bool ExportDOL(const std::string& export_folder) const override;
std::optional<u64> GetBootDOLOffset() const override; std::optional<u64> GetBootDOLOffset() const override;
std::optional<u32> GetBootDOLSize(u64 dol_offset) const override; std::optional<u32> GetBootDOLSize(u64 dol_offset) const override;
private: private:
bool m_Initialized; bool m_valid;
bool m_Valid;
u32 m_offset_shift; u32 m_offset_shift;
std::vector<FileInfo> m_FileInfoVector; std::vector<u8> m_file_system_table;
FileInfoGCWii m_root;
// Maps the end offset of files to FST indexes
mutable std::map<u64, u32> m_offset_file_info_cache;
std::string GetStringFromOffset(u64 _Offset) const; std::unique_ptr<FileInfo> FindFileInfo(const std::string& path, const FileInfo& file_info) const;
const FileInfo* FindFileInfo(const std::string& _rFullPath);
bool DetectFileSystem();
void InitFileSystem();
size_t BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex,
const std::string& _szDirectory, u64 _NameTableOffset);
}; };
} // namespace } // namespace

10
Source/Core/DiscIO/Filesystem.cpp
View File

@ -9,14 +9,14 @@
namespace DiscIO namespace DiscIO
{ {
FileSystem::FileSystem(const Volume* _rVolume, const Partition& partition) FileInfo::~FileInfo() = default;
: m_rVolume(_rVolume), m_partition(partition)
FileSystem::FileSystem(const Volume* volume, const Partition& partition)
: m_volume(volume), m_partition(partition)
{ {
} }
FileSystem::~FileSystem() FileSystem::~FileSystem() = default;
{
}
std::unique_ptr<FileSystem> CreateFileSystem(const Volume* volume, const Partition& partition) std::unique_ptr<FileSystem> CreateFileSystem(const Volume* volume, const Partition& partition)
{ {

121
Source/Core/DiscIO/Filesystem.h
View File

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <iterator>
#include <memory> #include <memory>
#include <optional> #include <optional>
#include <string> #include <string>
@ -15,47 +16,125 @@
namespace DiscIO namespace DiscIO
{ {
// file info of an FST entry // file info of an FST entry
struct FileInfo class FileInfo
{ {
u64 m_NameOffset = 0u; friend class const_iterator;
u64 m_Offset = 0u;
u64 m_FileSize = 0u;
std::string m_FullPath;
bool IsDirectory() const { return (m_NameOffset & 0xFF000000) != 0; } public:
FileInfo(u64 name_offset, u64 offset, u64 filesize) class const_iterator final
: m_NameOffset(name_offset), m_Offset(offset), m_FileSize(filesize)
{ {
public:
using iterator_category = std::forward_iterator_tag;
using value_type = const FileInfo;
using difference_type = std::ptrdiff_t;
using pointer = value_type*;
using reference = value_type&;
const_iterator() : m_file_info(nullptr) {}
const_iterator(std::unique_ptr<FileInfo> file_info) : m_file_info(std::move(file_info)) {}
const_iterator(const const_iterator& it) : m_file_info(it.m_file_info->clone()) {}
const_iterator(const_iterator&& it) : m_file_info(std::move(it.m_file_info)) {}
~const_iterator() = default;
const_iterator& operator=(const const_iterator& it)
{
m_file_info = it.m_file_info ? it.m_file_info->clone() : nullptr;
return *this;
} }
const_iterator& operator=(const_iterator&& it)
{
m_file_info = std::move(it.m_file_info);
return *this;
}
const_iterator& operator++()
{
++*m_file_info;
return *this;
}
const_iterator operator++(int)
{
const_iterator old = *this;
++*m_file_info;
return old;
}
bool operator==(const const_iterator& it) const
{
return m_file_info ? (it.m_file_info && *m_file_info == *it.m_file_info) : (!it.m_file_info);
}
bool operator!=(const const_iterator& it) const { return !operator==(it); }
// Incrementing or destroying an iterator will invalidate its returned references and
// pointers, but will not invalidate copies of the iterator or file info object.
const FileInfo& operator*() const { return *m_file_info.get(); }
const FileInfo* operator->() const { return m_file_info.get(); }
private:
std::unique_ptr<FileInfo> m_file_info;
};
FileInfo(FileInfo const&) = default; virtual ~FileInfo();
FileInfo() = default;
bool operator==(const FileInfo& other) const { return GetAddress() == other.GetAddress(); }
bool operator!=(const FileInfo& other) const { return !operator==(other); }
virtual std::unique_ptr<FileInfo> clone() const = 0;
virtual const_iterator cbegin() const { return begin(); }
virtual const_iterator cend() const { return end(); }
virtual const_iterator begin() const = 0;
virtual const_iterator end() const = 0;
// The offset of a file on the disc (inside the partition, if there is one).
// Not guaranteed to return a meaningful value for directories.
virtual u64 GetOffset() const = 0;
// The size of a file.
// Not guaranteed to return a meaningful value for directories.
virtual u32 GetSize() const = 0;
virtual bool IsDirectory() const = 0;
// The number of files and directories in a directory, including those in subdirectories.
// Not guaranteed to return a meaningful value for files.
virtual u32 GetTotalChildren() const = 0;
virtual std::string GetName() const = 0;
// GetPath will find the parents of the current object and call GetName on them,
// so it's slower than other functions. If you're traversing through folders
// to get a file and its path, building the path while traversing is faster.
virtual std::string GetPath() const = 0;
protected:
// Only used for comparisons with other file info objects
virtual uintptr_t GetAddress() const = 0;
// Called by iterators
virtual FileInfo& operator++() = 0;
}; };
class FileSystem class FileSystem
{ {
public: public:
FileSystem(const Volume* _rVolume, const Partition& partition); FileSystem(const Volume* volume, const Partition& partition);
virtual ~FileSystem(); virtual ~FileSystem();
// If IsValid is false, GetRoot must not be called. CreateFileSystem
// takes care of this automatically, so other code is recommended to use it.
virtual bool IsValid() const = 0; virtual bool IsValid() const = 0;
virtual const std::vector<FileInfo>& GetFileList() = 0; // The object returned by GetRoot and all objects created from it
virtual u64 GetFileSize(const std::string& _rFullPath) = 0; // are only valid for as long as the file system object is valid.
virtual u64 ReadFile(const std::string& _rFullPath, u8* _pBuffer, u64 _MaxBufferSize, virtual const FileInfo& GetRoot() const = 0;
u64 _OffsetInFile = 0) = 0; // Returns nullptr if not found
virtual bool ExportFile(const std::string& _rFullPath, const std::string& _rExportFilename) = 0; virtual std::unique_ptr<FileInfo> FindFileInfo(const std::string& path) const = 0;
virtual bool ExportApploader(const std::string& _rExportFolder) const = 0; // Returns nullptr if not found
virtual bool ExportDOL(const std::string& _rExportFolder) const = 0; virtual std::unique_ptr<FileInfo> FindFileInfo(u64 disc_offset) const = 0;
virtual std::string GetFileName(u64 _Address) = 0;
virtual u64 ReadFile(const FileInfo* file_info, u8* buffer, u64 max_buffer_size,
u64 offset_in_file = 0) const = 0;
virtual bool ExportFile(const FileInfo* file_info, const std::string& export_filename) const = 0;
virtual bool ExportApploader(const std::string& export_folder) const = 0;
virtual bool ExportDOL(const std::string& export_folder) const = 0;
virtual std::optional<u64> GetBootDOLOffset() const = 0; virtual std::optional<u64> GetBootDOLOffset() const = 0;
virtual std::optional<u32> GetBootDOLSize(u64 dol_offset) const = 0; virtual std::optional<u32> GetBootDOLSize(u64 dol_offset) const = 0;
virtual const Partition GetPartition() const { return m_partition; } virtual const Partition GetPartition() const { return m_partition; }
protected: protected:
const Volume* const m_rVolume; const Volume* const m_volume;
const Partition m_partition; const Partition m_partition;
}; };
// Returns nullptr if a valid file system could not be created
std::unique_ptr<FileSystem> CreateFileSystem(const Volume* volume, const Partition& partition); std::unique_ptr<FileSystem> CreateFileSystem(const Volume* volume, const Partition& partition);
} // namespace } // namespace

13
Source/Core/DiscIO/VolumeGC.cpp
View File

@ -177,7 +177,11 @@ void VolumeGC::LoadBannerFile() const
if (!file_system) if (!file_system)
return; return;
size_t file_size = static_cast<size_t>(file_system->GetFileSize("opening.bnr")); std::unique_ptr<FileInfo> file_info = file_system->FindFileInfo("opening.bnr");
if (!file_info)
return;
size_t file_size = static_cast<size_t>(file_info->GetSize());
constexpr int BNR1_MAGIC = 0x31524e42; constexpr int BNR1_MAGIC = 0x31524e42;
constexpr int BNR2_MAGIC = 0x32524e42; constexpr int BNR2_MAGIC = 0x32524e42;
if (file_size != BNR1_SIZE && file_size != BNR2_SIZE) if (file_size != BNR1_SIZE && file_size != BNR2_SIZE)
@ -186,7 +190,12 @@ void VolumeGC::LoadBannerFile() const
return; return;
} }
file_system->ReadFile("opening.bnr", reinterpret_cast<u8*>(&banner_file), file_size); if (file_size !=
file_system->ReadFile(file_info.get(), reinterpret_cast<u8*>(&banner_file), file_size))
{
WARN_LOG(DISCIO, "Could not read opening.bnr.");
return;
}
bool is_bnr1; bool is_bnr1;
if (banner_file.id == BNR1_MAGIC && file_size == BNR1_SIZE) if (banner_file.id == BNR1_MAGIC && file_size == BNR1_SIZE)

5
Source/Core/DiscIO/VolumeWii.cpp
View File

@ -274,8 +274,9 @@ std::map<Language, std::string> VolumeWii::GetLongNames() const
return {}; return {};
std::vector<u8> opening_bnr(NAMES_TOTAL_BYTES); std::vector<u8> opening_bnr(NAMES_TOTAL_BYTES);
size_t size = file_system->ReadFile("opening.bnr", opening_bnr.data(), opening_bnr.size(), 0x5C); std::unique_ptr<FileInfo> file_info = file_system->FindFileInfo("opening.bnr");
opening_bnr.resize(size); opening_bnr.resize(
file_system->ReadFile(file_info.get(), opening_bnr.data(), opening_bnr.size(), 0x5C));
return ReadWiiNames(opening_bnr); return ReadWiiNames(opening_bnr);
} }

188
Source/Core/DolphinWX/ISOProperties/FilesystemPanel.cpp
View File

@ -5,6 +5,8 @@
#include "DolphinWX/ISOProperties/FilesystemPanel.h" #include "DolphinWX/ISOProperties/FilesystemPanel.h"
#include <array> #include <array>
#include <functional>
#include <memory>
#include <vector> #include <vector>
#include <wx/bitmap.h> #include <wx/bitmap.h>
@ -83,55 +85,22 @@ wxImageList* LoadIconBitmaps(const wxWindow* context)
return icon_list; return icon_list;
} }
size_t CreateDirectoryTree(wxTreeCtrl* tree_ctrl, wxTreeItemId parent, void CreateDirectoryTree(wxTreeCtrl* tree_ctrl, wxTreeItemId parent,
const std::vector<DiscIO::FileInfo>& file_infos, const DiscIO::FileInfo& directory)
const size_t first_index, const size_t last_index)
{ {
size_t current_index = first_index; for (const DiscIO::FileInfo& file_info : directory)
while (current_index < last_index)
{ {
const DiscIO::FileInfo& file_info = file_infos[current_index]; const wxString name = StrToWxStr(file_info.GetName());
std::string file_path = file_info.m_FullPath;
// Trim the trailing '/' if it exists.
if (file_path.back() == DIR_SEP_CHR)
{
file_path.pop_back();
}
// Cut off the path up to the actual filename or folder.
// Say we have "/music/stream/stream1.strm", the result will be "stream1.strm".
const size_t dir_sep_index = file_path.rfind(DIR_SEP_CHR);
if (dir_sep_index != std::string::npos)
{
file_path = file_path.substr(dir_sep_index + 1);
}
// check next index
if (file_info.IsDirectory()) if (file_info.IsDirectory())
{ {
const wxTreeItemId item = tree_ctrl->AppendItem(parent, StrToWxStr(file_path), ICON_FOLDER); wxTreeItemId item = tree_ctrl->AppendItem(parent, name, ICON_FOLDER);
current_index = CreateDirectoryTree(tree_ctrl, item, file_infos, current_index + 1, CreateDirectoryTree(tree_ctrl, item, file_info);
static_cast<size_t>(file_info.m_FileSize));
} }
else else
{ {
tree_ctrl->AppendItem(parent, StrToWxStr(file_path), ICON_FILE); tree_ctrl->AppendItem(parent, name, ICON_FILE);
current_index++;
} }
} }
return current_index;
}
size_t CreateDirectoryTree(wxTreeCtrl* tree_ctrl, wxTreeItemId parent,
const std::vector<DiscIO::FileInfo>& file_infos)
{
if (file_infos.empty())
return 0;
return CreateDirectoryTree(tree_ctrl, parent, file_infos, 1, file_infos.at(0).m_FileSize);
} }
WiiPartition* FindWiiPartition(wxTreeCtrl* tree_ctrl, const wxString& label) WiiPartition* FindWiiPartition(wxTreeCtrl* tree_ctrl, const wxString& label)
@ -213,7 +182,7 @@ bool FilesystemPanel::PopulateFileSystemTree()
WiiPartition* const partition = new WiiPartition(std::move(file_system)); WiiPartition* const partition = new WiiPartition(std::move(file_system));
m_tree_ctrl->SetItemData(partition_root, partition); m_tree_ctrl->SetItemData(partition_root, partition);
CreateDirectoryTree(m_tree_ctrl, partition_root, partition->filesystem->GetFileList()); CreateDirectoryTree(m_tree_ctrl, partition_root, partition->filesystem->GetRoot());
if (partitions[i] == m_opened_iso->GetGamePartition()) if (partitions[i] == m_opened_iso->GetGamePartition())
m_tree_ctrl->Expand(partition_root); m_tree_ctrl->Expand(partition_root);
@ -226,7 +195,7 @@ bool FilesystemPanel::PopulateFileSystemTree()
if (!m_filesystem) if (!m_filesystem)
return false; return false;
CreateDirectoryTree(m_tree_ctrl, m_tree_ctrl->GetRootItem(), m_filesystem->GetFileList()); CreateDirectoryTree(m_tree_ctrl, m_tree_ctrl->GetRootItem(), m_filesystem->GetRoot());
} }
return true; return true;
@ -394,13 +363,13 @@ void FilesystemPanel::ExtractAllFiles(const wxString& output_folder)
while (item.IsOk()) while (item.IsOk())
{ {
const auto* const partition = static_cast<WiiPartition*>(m_tree_ctrl->GetItemData(item)); const auto* const partition = static_cast<WiiPartition*>(m_tree_ctrl->GetItemData(item));
ExtractDirectories("", WxStrToStr(output_folder), partition->filesystem.get()); ExtractDirectories("", WxStrToStr(output_folder), *partition->filesystem);
item = m_tree_ctrl->GetNextChild(root, cookie); item = m_tree_ctrl->GetNextChild(root, cookie);
} }
} }
else else
{ {
ExtractDirectories("", WxStrToStr(output_folder), m_filesystem.get()); ExtractDirectories("", WxStrToStr(output_folder), *m_filesystem);
} }
} }
@ -417,12 +386,14 @@ void FilesystemPanel::ExtractSingleFile(const wxString& output_file_path) const
// Remove "Partition x/" // Remove "Partition x/"
selection_file_path.erase(0, slash_index + 1); selection_file_path.erase(0, slash_index + 1);
partition->filesystem->ExportFile(WxStrToStr(selection_file_path), partition->filesystem->ExportFile(
partition->filesystem->FindFileInfo(WxStrToStr(selection_file_path)).get(),
WxStrToStr(output_file_path)); WxStrToStr(output_file_path));
} }
else else
{ {
m_filesystem->ExportFile(WxStrToStr(selection_file_path), WxStrToStr(output_file_path)); m_filesystem->ExportFile(m_filesystem->FindFileInfo(WxStrToStr(selection_file_path)).get(),
WxStrToStr(output_file_path));
} }
} }
@ -440,100 +411,71 @@ void FilesystemPanel::ExtractSingleDirectory(const wxString& output_folder)
directory_path.erase(0, slash_index + 1); directory_path.erase(0, slash_index + 1);
ExtractDirectories(WxStrToStr(directory_path), WxStrToStr(output_folder), ExtractDirectories(WxStrToStr(directory_path), WxStrToStr(output_folder),
partition->filesystem.get()); *partition->filesystem);
} }
else else
{ {
ExtractDirectories(WxStrToStr(directory_path), WxStrToStr(output_folder), m_filesystem.get()); ExtractDirectories(WxStrToStr(directory_path), WxStrToStr(output_folder), *m_filesystem);
}
}
void ExtractDir(const std::string& full_path, const std::string& output_folder,
const DiscIO::FileSystem& file_system, const DiscIO::FileInfo& directory,
const std::function<bool(const std::string& path)>& update_progress)
{
for (const DiscIO::FileInfo& file_info : directory)
{
const std::string path = full_path + file_info.GetName() + (file_info.IsDirectory() ? "/" : "");
const std::string output_path = output_folder + DIR_SEP_CHR + path;
if (update_progress(path))
return;
DEBUG_LOG(DISCIO, "%s", output_path.c_str());
if (file_info.IsDirectory())
{
File::CreateFullPath(output_path);
ExtractDir(path, output_folder, file_system, file_info, update_progress);
}
else
{
if (File::Exists(output_path))
NOTICE_LOG(DISCIO, "%s already exists", output_path.c_str());
else if (!file_system.ExportFile(&file_info, output_path))
ERROR_LOG(DISCIO, "Could not export %s", output_path.c_str());
}
} }
} }
void FilesystemPanel::ExtractDirectories(const std::string& full_path, void FilesystemPanel::ExtractDirectories(const std::string& full_path,
const std::string& output_folder, const std::string& output_folder,
DiscIO::FileSystem* filesystem) const DiscIO::FileSystem& filesystem)
{ {
const std::vector<DiscIO::FileInfo>& fst = filesystem->GetFileList(); if (full_path.empty()) // Root
u32 index = 0;
u32 size = 0;
// Extract all
if (full_path.empty())
{ {
size = static_cast<u32>(fst.size()); filesystem.ExportApploader(output_folder);
filesystem.ExportDOL(output_folder);
filesystem->ExportApploader(output_folder);
filesystem->ExportDOL(output_folder);
}
else
{
// Look for the dir we are going to extract
for (index = 0; index < fst.size(); ++index)
{
if (fst[index].m_FullPath == full_path)
{
INFO_LOG(DISCIO, "Found the directory at %u", index);
size = static_cast<u32>(fst[index].m_FileSize);
break;
}
} }
INFO_LOG(DISCIO, "Directory found from %u to %u\nextracting to: %s", index, size, std::unique_ptr<DiscIO::FileInfo> file_info = filesystem.FindFileInfo(full_path);
output_folder.c_str()); u32 size = file_info->GetTotalChildren();
} u32 progress = 0;
const auto dialog_title = (index != 0) ? _("Extracting Directory") : _("Extracting All Files"); wxString dialog_title = full_path.empty() ? _("Extracting All Files") : _("Extracting Directory");
wxProgressDialog dialog(dialog_title, _("Extracting..."), static_cast<int>(size - 1), this, wxProgressDialog dialog(dialog_title, _("Extracting..."), size, this,
wxPD_APP_MODAL | wxPD_AUTO_HIDE | wxPD_CAN_ABORT | wxPD_ELAPSED_TIME | wxPD_APP_MODAL | wxPD_AUTO_HIDE | wxPD_CAN_ABORT | wxPD_ELAPSED_TIME |
wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME | wxPD_SMOOTH); wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME | wxPD_SMOOTH);
// Extraction File::CreateFullPath(output_folder + "/" + full_path);
for (u32 i = index; i < size; i++) ExtractDir(full_path, output_folder, filesystem, *file_info, [&](const std::string& path) {
{
dialog.SetTitle(wxString::Format( dialog.SetTitle(wxString::Format(
"%s : %u%%", dialog_title.c_str(), "%s : %d%%", dialog_title.c_str(),
static_cast<u32>((static_cast<float>(i - index) / static_cast<float>(size - index)) * static_cast<u32>((static_cast<float>(progress) / static_cast<float>(size)) * 100)));
100))); dialog.Update(progress, wxString::Format(_("Extracting %s"), StrToWxStr(path)));
++progress;
dialog.Update(i, wxString::Format(_("Extracting %s"), StrToWxStr(fst[i].m_FullPath))); return dialog.WasCancelled();
});
if (dialog.WasCancelled())
break;
if (fst[i].IsDirectory())
{
const std::string export_name =
StringFromFormat("%s/%s/", output_folder.c_str(), fst[i].m_FullPath.c_str());
INFO_LOG(DISCIO, "%s", export_name.c_str());
if (!File::Exists(export_name) && !File::CreateFullPath(export_name))
{
ERROR_LOG(DISCIO, "Could not create the path %s", export_name.c_str());
}
else
{
if (!File::IsDirectory(export_name))
ERROR_LOG(DISCIO, "%s already exists and is not a directory", export_name.c_str());
ERROR_LOG(DISCIO, "Folder %s already exists", export_name.c_str());
}
}
else
{
const std::string export_name =
StringFromFormat("%s/%s", output_folder.c_str(), fst[i].m_FullPath.c_str());
INFO_LOG(DISCIO, "%s", export_name.c_str());
if (!File::Exists(export_name) && !filesystem->ExportFile(fst[i].m_FullPath, export_name))
{
ERROR_LOG(DISCIO, "Could not export %s", export_name.c_str());
}
else
{
ERROR_LOG(DISCIO, "%s already exists", export_name.c_str());
}
}
}
} }
wxString FilesystemPanel::BuildFilePathFromSelection() const wxString FilesystemPanel::BuildFilePathFromSelection() const

2
Source/Core/DolphinWX/ISOProperties/FilesystemPanel.h
View File

@ -51,7 +51,7 @@ private:
void ExtractSingleFile(const wxString& output_file_path) const; void ExtractSingleFile(const wxString& output_file_path) const;
void ExtractSingleDirectory(const wxString& output_folder); void ExtractSingleDirectory(const wxString& output_folder);
void ExtractDirectories(const std::string& full_path, const std::string& output_folder, void ExtractDirectories(const std::string& full_path, const std::string& output_folder,
DiscIO::FileSystem* filesystem); const DiscIO::FileSystem& filesystem);
wxString BuildFilePathFromSelection() const; wxString BuildFilePathFromSelection() const;
wxString BuildDirectoryPathFromSelection() const; wxString BuildDirectoryPathFromSelection() const;

1
Source/Core/DolphinWX/ISOProperties/ISOProperties.h
View File

@ -5,6 +5,7 @@
#pragma once #pragma once
#include <cstddef> #include <cstddef>
#include <functional>
#include <memory> #include <memory>
#include <set> #include <set>
#include <string> #include <string>