summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2018-09-30 04:14:01 +0200
committerZach Hilman <zachhilman@gmail.com>2018-10-01 22:02:50 +0200
commit4c2a94fa94e0192402c816c74f5a09061e3df520 (patch)
tree5600f34e700159ac679db7bc1bde6af96c447dd1
parentfile_sys: Implement function to apply IPS patches (diff)
downloadyuzu-4c2a94fa94e0192402c816c74f5a09061e3df520.tar
yuzu-4c2a94fa94e0192402c816c74f5a09061e3df520.tar.gz
yuzu-4c2a94fa94e0192402c816c74f5a09061e3df520.tar.bz2
yuzu-4c2a94fa94e0192402c816c74f5a09061e3df520.tar.lz
yuzu-4c2a94fa94e0192402c816c74f5a09061e3df520.tar.xz
yuzu-4c2a94fa94e0192402c816c74f5a09061e3df520.tar.zst
yuzu-4c2a94fa94e0192402c816c74f5a09061e3df520.zip
-rw-r--r--src/core/file_sys/patch_manager.cpp50
-rw-r--r--src/core/file_sys/patch_manager.h12
-rw-r--r--src/yuzu/game_list_worker.cpp7
3 files changed, 36 insertions, 33 deletions
diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp
index 57b7741f8..10b4acc92 100644
--- a/src/core/file_sys/patch_manager.cpp
+++ b/src/core/file_sys/patch_manager.cpp
@@ -34,16 +34,6 @@ std::string FormatTitleVersion(u32 version, TitleVersionFormat format) {
return fmt::format("v{}.{}.{}", bytes[3], bytes[2], bytes[1]);
}
-constexpr std::array<const char*, 3> PATCH_TYPE_NAMES{
- "Update",
- "LayeredFS",
- "DLC",
-};
-
-std::string FormatPatchTypeName(PatchType type) {
- return PATCH_TYPE_NAMES.at(static_cast<std::size_t>(type));
-}
-
PatchManager::PatchManager(u64 title_id) : title_id(title_id) {}
PatchManager::~PatchManager() = default;
@@ -138,8 +128,19 @@ VirtualFile PatchManager::PatchRomFS(VirtualFile romfs, u64 ivfc_offset,
return romfs;
}
-std::map<PatchType, std::string> PatchManager::GetPatchVersionNames() const {
- std::map<PatchType, std::string> out;
+void AppendCommaIfNotEmpty(std::string& to, const std::string& with) {
+ if (to.empty())
+ to += with;
+ else
+ to += ", " + with;
+}
+
+static bool IsDirValidAndNonEmpty(const VirtualDir& dir) {
+ return dir != nullptr && (!dir->GetFiles().empty() || !dir->GetSubdirectories().empty());
+}
+
+std::map<std::string, std::string> PatchManager::GetPatchVersionNames() const {
+ std::map<std::string, std::string> out;
const auto installed = Service::FileSystem::GetUnionContents();
// Game Updates
@@ -148,23 +149,34 @@ std::map<PatchType, std::string> PatchManager::GetPatchVersionNames() const {
auto [nacp, discard_icon_file] = update.GetControlMetadata();
if (nacp != nullptr) {
- out[PatchType::Update] = nacp->GetVersionString();
+ out["Update"] = nacp->GetVersionString();
} else {
if (installed->HasEntry(update_tid, ContentRecordType::Program)) {
const auto meta_ver = installed->GetEntryVersion(update_tid);
if (meta_ver == boost::none || meta_ver.get() == 0) {
- out[PatchType::Update] = "";
+ out["Update"] = "";
} else {
- out[PatchType::Update] =
+ out["Update"] =
FormatTitleVersion(meta_ver.get(), TitleVersionFormat::ThreeElements);
}
}
}
- // LayeredFS
- const auto lfs_dir = Service::FileSystem::GetModificationLoadRoot(title_id);
- if (lfs_dir != nullptr && lfs_dir->GetSize() > 0)
- out.insert_or_assign(PatchType::LayeredFS, "");
+ const auto mod_dir = Service::FileSystem::GetModificationLoadRoot(title_id);
+ if (mod_dir != nullptr && mod_dir->GetSize() > 0) {
+ for (const auto& mod : mod_dir->GetSubdirectories()) {
+ std::string types;
+ if (IsDirValidAndNonEmpty(mod->GetSubdirectory("exefs")))
+ AppendCommaIfNotEmpty(types, "IPS");
+ if (IsDirValidAndNonEmpty(mod->GetSubdirectory("romfs")))
+ AppendCommaIfNotEmpty(types, "LayeredFS");
+
+ if (types.empty())
+ continue;
+
+ out.insert_or_assign(mod->GetName(), types);
+ }
+ }
// DLC
const auto dlc_entries = installed->ListEntriesFilter(TitleType::AOC, ContentRecordType::Data);
diff --git a/src/core/file_sys/patch_manager.h b/src/core/file_sys/patch_manager.h
index 3a2a9d212..7807515f9 100644
--- a/src/core/file_sys/patch_manager.h
+++ b/src/core/file_sys/patch_manager.h
@@ -24,14 +24,6 @@ enum class TitleVersionFormat : u8 {
std::string FormatTitleVersion(u32 version,
TitleVersionFormat format = TitleVersionFormat::ThreeElements);
-enum class PatchType {
- Update,
- LayeredFS,
- DLC,
-};
-
-std::string FormatPatchTypeName(PatchType type);
-
// A centralized class to manage patches to games.
class PatchManager {
public:
@@ -49,8 +41,8 @@ public:
ContentRecordType type = ContentRecordType::Program) const;
// Returns a vector of pairs between patch names and patch versions.
- // i.e. Update v80 will return {Update, 80}
- std::map<PatchType, std::string> GetPatchVersionNames() const;
+ // i.e. Update 3.2.2 will return {"Update", "3.2.2"}
+ std::map<std::string, std::string> GetPatchVersionNames() const;
// Given title_id of the program, attempts to get the control data of the update and parse it,
// falling back to the base control data.
diff --git a/src/yuzu/game_list_worker.cpp b/src/yuzu/game_list_worker.cpp
index e228d61bd..1947bdb93 100644
--- a/src/yuzu/game_list_worker.cpp
+++ b/src/yuzu/game_list_worker.cpp
@@ -60,14 +60,13 @@ QString FormatGameName(const std::string& physical_name) {
QString FormatPatchNameVersions(const FileSys::PatchManager& patch_manager, bool updatable = true) {
QString out;
for (const auto& kv : patch_manager.GetPatchVersionNames()) {
- if (!updatable && kv.first == FileSys::PatchType::Update)
+ if (!updatable && kv.first == "Update")
continue;
if (kv.second.empty()) {
- out.append(fmt::format("{}\n", FileSys::FormatPatchTypeName(kv.first)).c_str());
+ out.append(fmt::format("{}\n", kv.first).c_str());
} else {
- out.append(fmt::format("{} ({})\n", FileSys::FormatPatchTypeName(kv.first), kv.second)
- .c_str());
+ out.append(fmt::format("{} ({})\n", kv.first, kv.second).c_str());
}
}