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 #11973 from Minty-Meeo/string-improvements-part-1d 

DITConfiguration: Use File::ReadFileToString
This commit is contained in:
JosJuice 2023-06-18 09:56:52 +02:00 committed by GitHub
parent 44498872e9 80575c4489
commit 9943750866
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp
View File

@ -19,41 +19,30 @@
#include "InputCommon/DynamicInputTextures/DITSpecification.h" #include "InputCommon/DynamicInputTextures/DITSpecification.h"
#include "InputCommon/ImageOperations.h" #include "InputCommon/ImageOperations.h"
namespace
{
std::string GetStreamAsString(std::ifstream& stream)
{
std::stringstream ss;
ss << stream.rdbuf();
return ss.str();
}
} // namespace
namespace InputCommon::DynamicInputTextures namespace InputCommon::DynamicInputTextures
{ {
Configuration::Configuration(const std::string& json_file) Configuration::Configuration(const std::string& json_path)
{ {
std::ifstream json_stream; std::string json_data;
File::OpenFStream(json_stream, json_file, std::ios_base::in); if (!File::ReadFileToString(json_path, json_data))
if (!json_stream.is_open())
{ {
ERROR_LOG_FMT(VIDEO, "Failed to load dynamic input json file '{}'", json_file); ERROR_LOG_FMT(VIDEO, "Failed to load dynamic input json file '{}'", json_path);
m_valid = false; m_valid = false;
return; return;
} }
picojson::value root; picojson::value root;
const auto error = picojson::parse(root, GetStreamAsString(json_stream)); const auto error = picojson::parse(root, json_data);
if (!error.empty()) if (!error.empty())
{ {
ERROR_LOG_FMT(VIDEO, "Failed to load dynamic input json file '{}' due to parse error: {}", ERROR_LOG_FMT(VIDEO, "Failed to load dynamic input json file '{}' due to parse error: {}",
json_file, error); json_path, error);
m_valid = false; m_valid = false;
return; return;
} }
SplitPath(json_file, &m_base_path, nullptr, nullptr); SplitPath(json_path, &m_base_path, nullptr, nullptr);
const picojson::value& specification_json = root.get("specification"); const picojson::value& specification_json = root.get("specification");
u8 specification = 1; u8 specification = 1;
@ -66,7 +55,7 @@ Configuration::Configuration(const std::string& json_file)
ERROR_LOG_FMT( ERROR_LOG_FMT(
VIDEO, VIDEO,
"Failed to load dynamic input json file '{}', specification '{}' is not within bounds", "Failed to load dynamic input json file '{}', specification '{}' is not within bounds",
json_file, spec_from_json); json_path, spec_from_json);
m_valid = false; m_valid = false;
return; return;
} }
@ -77,12 +66,12 @@ Configuration::Configuration(const std::string& json_file)
{ {
ERROR_LOG_FMT(VIDEO, ERROR_LOG_FMT(VIDEO,
"Failed to load dynamic input json file '{}', specification '{}' is invalid", "Failed to load dynamic input json file '{}', specification '{}' is invalid",
json_file, specification); json_path, specification);
m_valid = false; m_valid = false;
return; return;
} }
m_valid = ProcessSpecificationV1(root, m_dynamic_input_textures, m_base_path, json_file); m_valid = ProcessSpecificationV1(root, m_dynamic_input_textures, m_base_path, json_path);
} }
Configuration::~Configuration() = default; Configuration::~Configuration() = default;

2
Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h
View File

@ -19,7 +19,7 @@ namespace InputCommon::DynamicInputTextures
class Configuration class Configuration
{ {
public: public:
explicit Configuration(const std::string& json_file); explicit Configuration(const std::string& json_path);
~Configuration(); ~Configuration();
bool GenerateTextures(const Common::IniFile& file, bool GenerateTextures(const Common::IniFile& file,
const std::vector<std::string>& controller_names) const; const std::vector<std::string>& controller_names) const;