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 #8127 from lioncash/resource 

UICommon/ResourcePack: Minor cleanup
This commit is contained in:
Léo Lam 2019-05-27 23:05:10 +02:00 committed by GitHub
parent 42de5b9a10 f07cf9ebab
commit 800d875faa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/UICommon/ResourcePack/Manager.cpp
View File

@ -143,8 +143,6 @@ bool Remove(ResourcePack& pack)
if (pack_iterator == packs.end()) if (pack_iterator == packs.end())
return false; return false;
std::string filename;
IniFile file = GetPackConfig(); IniFile file = GetPackConfig();
auto* order = file.GetOrCreateSection("Order"); auto* order = file.GetOrCreateSection("Order");

62
Source/Core/UICommon/ResourcePack/ResourcePack.cpp
View File

@ -10,48 +10,49 @@
#include "Common/FileSearch.h" #include "Common/FileSearch.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/ScopeGuard.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "UICommon/ResourcePack/Manager.h" #include "UICommon/ResourcePack/Manager.h"
#include "UICommon/ResourcePack/Manifest.h" #include "UICommon/ResourcePack/Manifest.h"
static const char* TEXTURE_PATH = "Load/Textures/";
namespace ResourcePack namespace ResourcePack
{ {
constexpr char TEXTURE_PATH[] = "Load/Textures/";
// Since minzip doesn't provide a way to unzip a file of a length > 65535, we have to implement // Since minzip doesn't provide a way to unzip a file of a length > 65535, we have to implement
// this ourselves // this ourselves
static bool ReadCurrentFileUnlimited(unzFile file, std::vector<char>& destination) template <typename ContiguousContainer>
static bool ReadCurrentFileUnlimited(unzFile file, ContiguousContainer& destination)
{ {
const uint32_t MAX_BUFFER_SIZE = 65535; const u32 MAX_BUFFER_SIZE = 65535;
if (unzOpenCurrentFile(file) != UNZ_OK) if (unzOpenCurrentFile(file) != UNZ_OK)
return false; return false;
uint32_t bytes_to_go = static_cast<uint32_t>(destination.size()); Common::ScopeGuard guard{[&] { unzCloseCurrentFile(file); }};
auto bytes_to_go = static_cast<u32>(destination.size());
while (bytes_to_go > 0) while (bytes_to_go > 0)
{ {
int bytes_read = unzReadCurrentFile(file, &destination[destination.size() - bytes_to_go], const int bytes_read = unzReadCurrentFile(file, &destination[destination.size() - bytes_to_go],
std::min(bytes_to_go, MAX_BUFFER_SIZE)); std::min(bytes_to_go, MAX_BUFFER_SIZE));
if (bytes_read < 0) if (bytes_read < 0)
{ {
unzCloseCurrentFile(file);
return false; return false;
} }
bytes_to_go -= bytes_read; bytes_to_go -= static_cast<u32>(bytes_read);
} }
unzCloseCurrentFile(file);
return true; return true;
} }
ResourcePack::ResourcePack(const std::string& path) : m_path(path) ResourcePack::ResourcePack(const std::string& path) : m_path(path)
{ {
auto file = unzOpen(path.c_str()); auto file = unzOpen(path.c_str());
Common::ScopeGuard file_guard{[&] { unzClose(file); }};
if (file == nullptr) if (file == nullptr)
{ {
@ -68,25 +69,18 @@ ResourcePack::ResourcePack(const std::string& path) : m_path(path)
} }
unz_file_info manifest_info; unz_file_info manifest_info;
unzGetCurrentFileInfo(file, &manifest_info, nullptr, 0, nullptr, 0, nullptr, 0); unzGetCurrentFileInfo(file, &manifest_info, nullptr, 0, nullptr, 0, nullptr, 0);
std::vector<char> manifest_contents; std::string manifest_contents(manifest_info.uncompressed_size, '\0');
manifest_contents.resize(manifest_info.uncompressed_size);
if (!ReadCurrentFileUnlimited(file, manifest_contents)) if (!ReadCurrentFileUnlimited(file, manifest_contents))
{ {
m_valid = false; m_valid = false;
m_error = "Failed to read manifest.json"; m_error = "Failed to read manifest.json";
return; return;
} }
unzCloseCurrentFile(file); unzCloseCurrentFile(file);
m_manifest = m_manifest = std::make_shared<Manifest>(manifest_contents);
std::make_shared<Manifest>(std::string(manifest_contents.begin(), manifest_contents.end()));
if (!m_manifest->IsValid()) if (!m_manifest->IsValid())
{ {
m_valid = false; m_valid = false;
@ -114,13 +108,10 @@ ResourcePack::ResourcePack(const std::string& path) : m_path(path)
do do
{ {
std::string filename; std::string filename(256, '\0');
filename.resize(256);
unz_file_info texture_info; unz_file_info texture_info;
unzGetCurrentFileInfo(file, &texture_info, filename.data(), static_cast<u16>(filename.size()),
unzGetCurrentFileInfo(file, &texture_info, &filename[0], static_cast<uint16_t>(filename.size()),
nullptr, 0, nullptr, 0); nullptr, 0, nullptr, 0);
if (filename.compare(0, 9, "textures/") != 0 || texture_info.uncompressed_size == 0) if (filename.compare(0, 9, "textures/") != 0 || texture_info.uncompressed_size == 0)
@ -136,8 +127,6 @@ ResourcePack::ResourcePack(const std::string& path) : m_path(path)
m_textures.push_back(filename.substr(9)); m_textures.push_back(filename.substr(9));
} while (unzGoToNextFile(file) != UNZ_END_OF_LIST_OF_FILE); } while (unzGoToNextFile(file) != UNZ_END_OF_LIST_OF_FILE);
unzClose(file);
} }
bool ResourcePack::IsValid() const bool ResourcePack::IsValid() const
@ -179,6 +168,7 @@ bool ResourcePack::Install(const std::string& path)
} }
auto file = unzOpen(m_path.c_str()); auto file = unzOpen(m_path.c_str());
Common::ScopeGuard file_guard{[&] { unzClose(file); }};
for (const auto& texture : m_textures) for (const auto& texture : m_textures)
{ {
@ -204,9 +194,9 @@ bool ResourcePack::Install(const std::string& path)
return false; return false;
} }
const std::string texture_path = path + TEXTURE_PATH + texture;
std::string m_full_dir; std::string m_full_dir;
SplitPath(texture_path, &m_full_dir, nullptr, nullptr);
SplitPath(path + TEXTURE_PATH + texture, &m_full_dir, nullptr, nullptr);
if (!File::CreateFullPath(m_full_dir)) if (!File::CreateFullPath(m_full_dir))
{ {
@ -215,19 +205,16 @@ bool ResourcePack::Install(const std::string& path)
} }
unz_file_info texture_info; unz_file_info texture_info;
unzGetCurrentFileInfo(file, &texture_info, nullptr, 0, nullptr, 0, nullptr, 0); unzGetCurrentFileInfo(file, &texture_info, nullptr, 0, nullptr, 0, nullptr, 0);
std::vector<char> data; std::vector<char> data(texture_info.uncompressed_size);
data.resize(texture_info.uncompressed_size);
if (!ReadCurrentFileUnlimited(file, data)) if (!ReadCurrentFileUnlimited(file, data))
{ {
m_error = "Failed to read texture " + texture; m_error = "Failed to read texture " + texture;
return false; return false;
} }
std::ofstream out(path + TEXTURE_PATH + texture, std::ios::trunc | std::ios::binary); std::ofstream out(texture_path, std::ios::trunc | std::ios::binary);
if (!out.good()) if (!out.good())
{ {
@ -239,10 +226,7 @@ bool ResourcePack::Install(const std::string& path)
out.flush(); out.flush();
} }
unzClose(file);
SetInstalled(*this, true); SetInstalled(*this, true);
return true; return true;
} }
@ -294,7 +278,8 @@ bool ResourcePack::Uninstall(const std::string& path)
if (provided_by_other_pack) if (provided_by_other_pack)
continue; continue;
if (File::Exists(path + TEXTURE_PATH + texture) && !File::Delete(path + TEXTURE_PATH + texture)) const std::string texture_path = path + TEXTURE_PATH + texture;
if (File::Exists(texture_path) && !File::Delete(texture_path))
{ {
m_error = "Failed to delete texture " + texture; m_error = "Failed to delete texture " + texture;
return false; return false;
@ -303,8 +288,7 @@ bool ResourcePack::Uninstall(const std::string& path)
// Recursively delete empty directories // Recursively delete empty directories
std::string dir; std::string dir;
SplitPath(texture_path, &dir, nullptr, nullptr);
SplitPath(path + TEXTURE_PATH + texture, &dir, nullptr, nullptr);
while (dir.length() > (path + TEXTURE_PATH).length()) while (dir.length() > (path + TEXTURE_PATH).length())
{ {