summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Zach Hilman2018-12-24 16:18:28 -0500
committerGravatar Zach Hilman2018-12-28 15:30:36 -0500
commitabbcc8e61e33ba093df9c823a03c70eccf010e4c (patch)
tree13a0b705139336b59f491e216febc9d1859da0d7 /src
parentam: Add size parameter to am:IStorage logging (diff)
downloadyuzu-abbcc8e61e33ba093df9c823a03c70eccf010e4c.tar.gz
yuzu-abbcc8e61e33ba093df9c823a03c70eccf010e4c.tar.xz
yuzu-abbcc8e61e33ba093df9c823a03c70eccf010e4c.zip
romfs: Add SingleDiscard extraction type
Needed for manual RomFS extraction, as Full generates an extra directory and Truncated generates variable results.
Diffstat (limited to 'src')
-rw-r--r--src/core/file_sys/romfs.cpp3
-rw-r--r--src/core/file_sys/romfs.h5
2 files changed, 6 insertions, 2 deletions
diff --git a/src/core/file_sys/romfs.cpp b/src/core/file_sys/romfs.cpp
index 81e1f66ac..ebbdf081e 100644
--- a/src/core/file_sys/romfs.cpp
+++ b/src/core/file_sys/romfs.cpp
@@ -119,6 +119,9 @@ VirtualDir ExtractRomFS(VirtualFile file, RomFSExtractionType type) {
119 119
120 VirtualDir out = std::move(root); 120 VirtualDir out = std::move(root);
121 121
122 if (type == RomFSExtractionType::SingleDiscard)
123 return out->GetSubdirectories().front();
124
122 while (out->GetSubdirectories().size() == 1 && out->GetFiles().empty()) { 125 while (out->GetSubdirectories().size() == 1 && out->GetFiles().empty()) {
123 if (out->GetSubdirectories().front()->GetName() == "data" && 126 if (out->GetSubdirectories().front()->GetName() == "data" &&
124 type == RomFSExtractionType::Truncated) 127 type == RomFSExtractionType::Truncated)
diff --git a/src/core/file_sys/romfs.h b/src/core/file_sys/romfs.h
index 0ec404731..0f35639bc 100644
--- a/src/core/file_sys/romfs.h
+++ b/src/core/file_sys/romfs.h
@@ -33,8 +33,9 @@ struct IVFCHeader {
33static_assert(sizeof(IVFCHeader) == 0xE0, "IVFCHeader has incorrect size."); 33static_assert(sizeof(IVFCHeader) == 0xE0, "IVFCHeader has incorrect size.");
34 34
35enum class RomFSExtractionType { 35enum class RomFSExtractionType {
36 Full, // Includes data directory 36 Full, // Includes data directory
37 Truncated, // Traverses into data directory 37 Truncated, // Traverses into data directory
38 SingleDiscard, // Traverses into the first subdirectory of root
38}; 39};
39 40
40// Converts a RomFS binary blob to VFS Filesystem 41// Converts a RomFS binary blob to VFS Filesystem