RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-03-01 19:13:54 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ISO: Move code to load psf::registry into iso_archive

Browse source 
- Multiple places end up needing to retrieve a psf::registry from an is
o archive.
- Added a safety check along with this
This commit is contained in:
Functionable 2026-01-07 18:39:05 +00:00 committed by Elad
parent 38daf8d325
commit 4cd75971f0
3 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
rpcs3/Loader/ISO.cpp
View file

@ -340,6 +340,19 @@ iso_file iso_archive::open(const std::string& path)
return iso_file(fs::file(m_path), *retrieve(path));
}
psf::registry iso_archive::open_psf(const std::string& path)
{
auto* archive_file = retrieve(path);
if (!archive_file) return psf::registry();
// HACK: psf does not accept a file_base argument,
// instead we are creating a dummy fs::file and replacing the internal file_base handle with an iso_file
fs::file psf_file(path);
psf_file.reset(std::make_unique<iso_file>(fs::file(m_path), *archive_file));
return psf::load_object(psf_file, path);
}
iso_file::iso_file(fs::file&& iso_handle, const iso_fs_node& node)
: m_file(std::move(iso_handle)), m_meta(node.metadata), m_pos(0)
{

4
rpcs3/Loader/ISO.h
View file

@ -1,5 +1,7 @@
#pragma once
#include "Loader/PSF.h"
#include "Utilities/File.h"
#include "util/types.hpp"
@ -86,6 +88,8 @@ class iso_archive
bool is_file(const std::string& path);
iso_file open(const std::string& path);
psf::registry open_psf(const std::string& path);
};
class iso_device : public fs::device_base

17
rpcs3/rpcs3qt/game_list_frame.cpp
View file

@ -523,19 +523,6 @@ void game_list_frame::OnParsingFinished()
const auto add_game = [this, localized_title, localized_icon, localized_movie, dev_flash, cat_unknown_localized = localized.category.unknown.toStdString(), cat_unknown = cat::cat_unknown.toStdString(), game_icon_path, _hdd, play_hover_movies = m_play_hover_movies, show_custom_icons = m_show_custom_icons](const std::string& dir_or_elf)
{
const auto load_game_psf = [&dir_or_elf](const std::string& sfo_path, const std::unique_ptr<iso_archive>& archive)
{
if (!archive) return psf::load_object(sfo_path);
// HACK: psf does not accept a file_base argument,
// so we are creating a dummy fs:file and replacing the internal file_base handle with an iso_file
// instead.
fs::file psf_file(sfo_path);
psf_file.reset(std::make_unique<iso_file>(fs::file(dir_or_elf), *archive->retrieve(sfo_path)));
return psf::load_object(psf_file, sfo_path);
};
std::unique_ptr<iso_archive> archive;
if (is_file_iso(dir_or_elf))
{
@ -562,7 +549,9 @@ void game_list_frame::OnParsingFinished()
const Localized thread_localized;
const std::string sfo_dir = !archive ? rpcs3::utils::get_sfo_dir_from_game_path(dir_or_elf) : "PS3_GAME";
const psf::registry psf = load_game_psf(sfo_dir + "/PARAM.SFO", archive);
const std::string sfo_path = sfo_dir + "/PARAM.SFO";
const psf::registry psf = !archive ? psf::load_object(sfo_path) : archive->open_psf(sfo_path);
const std::string_view title_id = psf::get_string(psf, "TITLE_ID", "");
if (title_id.empty())