Fix iso integrity log message
This commit is contained in:
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
LOG_CHANNEL(sys_log, "VALIDATION");
|
LOG_CHANNEL(sys_log, "VALIDATION");
|
||||||
|
|
||||||
content_integrity_status content_validation::check_integrity(content_file_type file_type, const std::string& hash, std::string* game_name)
|
content_integrity_status content_validation::check_integrity(content_file_type file_type, std::string_view hash, std::string* game_name)
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
// Check for Redump db
|
// Check for Redump db
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ private:
|
|||||||
content_hash_status m_status = content_hash_status::INITIALIZED;
|
content_hash_status m_status = content_hash_status::INITIALIZED;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static content_integrity_status check_integrity(content_file_type file_type, const std::string& hash, std::string* game_name = nullptr);
|
static content_integrity_status check_integrity(content_file_type file_type, std::string_view hash, std::string* game_name = nullptr);
|
||||||
|
|
||||||
const std::string& get_path() const { return m_path; }
|
const std::string& get_path() const { return m_path; }
|
||||||
const std::string& get_name() const { return m_name; }
|
const std::string& get_name() const { return m_name; }
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ namespace
|
|||||||
|
|
||||||
namespace iso_cache
|
namespace iso_cache
|
||||||
{
|
{
|
||||||
bool load(const std::string& iso_path, const std::string& cache_key, iso_metadata_cache_entry& out_entry)
|
bool load(const std::string& iso_path, std::string_view cache_key, iso_metadata_cache_entry& out_entry)
|
||||||
{
|
{
|
||||||
fs::stat_t iso_stat{};
|
fs::stat_t iso_stat{};
|
||||||
if (!fs::get_stat(iso_path, iso_stat) || iso_stat.is_directory)
|
if (!fs::get_stat(iso_path, iso_stat) || iso_stat.is_directory)
|
||||||
@@ -95,7 +95,7 @@ namespace iso_cache
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void save(const std::string& iso_path, const std::string& cache_key, const iso_metadata_cache_entry& entry)
|
void save(std::string_view iso_path, std::string_view cache_key, const iso_metadata_cache_entry& entry)
|
||||||
{
|
{
|
||||||
const std::string stem = get_cache_stem(cache_key);
|
const std::string stem = get_cache_stem(cache_key);
|
||||||
const std::string dir = get_cache_dir();
|
const std::string dir = get_cache_dir();
|
||||||
|
|||||||
@@ -23,10 +23,10 @@ struct iso_metadata_cache_entry
|
|||||||
namespace iso_cache
|
namespace iso_cache
|
||||||
{
|
{
|
||||||
// Returns false if no valid cache entry exists or mtime has changed.
|
// Returns false if no valid cache entry exists or mtime has changed.
|
||||||
bool load(const std::string& iso_path, const std::string& cache_key, iso_metadata_cache_entry& out_entry);
|
bool load(const std::string& iso_path, std::string_view cache_key, iso_metadata_cache_entry& out_entry);
|
||||||
|
|
||||||
// Persists a populated cache entry to disk.
|
// Persists a populated cache entry to disk.
|
||||||
void save(const std::string& iso_path, const std::string& cache_key, const iso_metadata_cache_entry& entry);
|
void save(std::string_view iso_path, std::string_view cache_key, const iso_metadata_cache_entry& entry);
|
||||||
|
|
||||||
bool load_index(const std::string& iso_path, std::vector<std::string>& out_subdirs);
|
bool load_index(const std::string& iso_path, std::vector<std::string>& out_subdirs);
|
||||||
void save_index(const std::string& iso_path, const std::vector<std::string>& subdirs);
|
void save_index(const std::string& iso_path, const std::vector<std::string>& subdirs);
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ void content_integrity::handle_download_canceled()
|
|||||||
|
|
||||||
void content_integrity::handle_download_error(const QString& error)
|
void content_integrity::handle_download_error(const QString& error)
|
||||||
{
|
{
|
||||||
sys_log.error("", error.toStdString().c_str());
|
sys_log.error("Database download failed: %s", error);
|
||||||
}
|
}
|
||||||
|
|
||||||
QByteArray content_integrity::read_json(const QByteArray& data, bool after_download)
|
QByteArray content_integrity::read_json(const QByteArray& data, bool after_download)
|
||||||
|
|||||||
@@ -605,7 +605,7 @@ void game_list_actions::ShowDiskUsageDialog()
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
bool game_list_actions::IsGameRunning(const std::string& serial)
|
bool game_list_actions::IsGameRunning(std::string_view serial)
|
||||||
{
|
{
|
||||||
return !Emu.IsStopped(true) && (serial == Emu.GetTitleID() || (serial == "vsh.self" && Emu.IsVsh()));
|
return !Emu.IsStopped(true) && (serial == Emu.GetTitleID() || (serial == "vsh.self" && Emu.IsVsh()));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ public:
|
|||||||
std::set<std::string> removed_disc_list; // Filled in by RemoveContentList()
|
std::set<std::string> removed_disc_list; // Filled in by RemoveContentList()
|
||||||
};
|
};
|
||||||
|
|
||||||
static bool IsGameRunning(const std::string& serial);
|
static bool IsGameRunning(std::string_view serial);
|
||||||
|
|
||||||
void CreateShortcuts(const std::vector<game_info>& games, const std::set<gui::utils::shortcut_location>& locations);
|
void CreateShortcuts(const std::vector<game_info>& games, const std::set<gui::utils::shortcut_location>& locations);
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -175,10 +175,10 @@ namespace logs
|
|||||||
void silence();
|
void silence();
|
||||||
|
|
||||||
// Log level control: register channel if necessary, set channel level
|
// Log level control: register channel if necessary, set channel level
|
||||||
void set_level(const std::string&, level);
|
void set_level(const std::string& ch_name, level value);
|
||||||
|
|
||||||
// Log level control: get channel level
|
// Log level control: get channel level
|
||||||
level get_level(const std::string&);
|
level get_level(const std::string& ch_name);
|
||||||
|
|
||||||
// Log level control: set specific channels to level::fatal
|
// Log level control: set specific channels to level::fatal
|
||||||
void set_channel_levels(const std::map<std::string, logs::level, std::less<>>& map);
|
void set_channel_levels(const std::map<std::string, logs::level, std::less<>>& map);
|
||||||
|
|||||||
Reference in New Issue
Block a user