iso: Improve movie and audio path checks

Also reduce need for checking iso files for non-iso games

Author: Megamouse

rpcs3/Emu/GameInfo.h

@@ -27,5 +27,9 @@ struct GameInfo
 	u64 size_on_disk = umax;
 
 	bool has_custom_icon = false;
+
+	bool is_iso_file = false;
 	bool icon_in_archive = false;
+	bool movie_in_archive = false;
+	bool audio_in_archive = false;
 };

rpcs3/Emu/game_enumeration.h

@@ -13,7 +13,6 @@
 #include <set>
 #include <unordered_set>
 #include <vector>
-#include <mutex>
 #include <regex>
 
 LOG_CHANNEL(sys_log, "SYS");
@@ -51,12 +50,12 @@ class game_enumeration
 	std::vector<game_info_type> take_games() { return std::move(m_games); }
 
 private:
-	std::optional<game_info_type> get_game_info(const std::string& dir_or_elf, const std::string& game_dir);
+	std::optional<game_info_type> get_game_info(const std::string& dir_or_elf, const std::string& game_dir, bool is_iso, bool is_raw);
 
 	bool was_canceled() const { return m_canceled_callback && m_canceled_callback(); }
 
 	void push_path(const std::string& path, std::vector<std::string>& legit_paths);
-	void add_game(const std::string& path, const std::string& game_dir = "PS3_GAME");
+	void add_game(const std::string& path, const std::string& game_dir = "PS3_GAME", bool is_iso = false, bool is_raw = false);
 	virtual void add_game_apply_extras([[maybe_unused]] game_info_type& game) {}
 	void add_disc_dir(const std::string& path, std::vector<std::string>& legit_paths);
 
@@ -107,16 +106,18 @@ void game_enumeration<game_info_type>::set_localization(s32 index, std::string&&
 }
 
 template <typename game_info_type>
-std::optional<game_info_type> game_enumeration<game_info_type>::get_game_info(const std::string& dir_or_elf, const std::string& game_dir)
+std::optional<game_info_type> game_enumeration<game_info_type>::get_game_info(const std::string& dir_or_elf, const std::string& game_dir, bool is_iso, bool is_raw)
 {
+	game_info_type info{};
+
 	std::unique_ptr<iso_archive> archive;
 	iso_metadata_cache_entry cache_entry{};
-	bool is_raw_device = false;
-	const bool is_archive = is_iso_file(dir_or_elf, nullptr, &is_raw_device);
+	bool is_raw_device = is_raw;
+	info.is_iso_file = is_iso && is_iso_file(dir_or_elf, nullptr, &is_raw_device);
 	const bool is_ps3_game = game_dir == "PS3_GAME";
 	std::string iso_cache_key;
 
-	if (is_archive)
+	if (info.is_iso_file)
 	{
 		iso_cache_key = is_ps3_game ? dir_or_elf : dir_or_elf + "//" + game_dir;
 		// Only construct iso_archive (which walks the full directory tree) in case of raw device or
@@ -141,7 +142,6 @@ std::optional<game_info_type> game_enumeration<game_info_type>::get_game_info(co
 		return fs::is_file(path);
 	};
 
-	game_info_type info{};
 	info.path = dir_or_elf;
 	info.game_dir = is_ps3_game ? "" : game_dir;
 
@@ -273,14 +273,17 @@ std::optional<game_info_type> game_enumeration<game_info_type>::get_game_info(co
 		{
 			// Cache hit — restore previously resolved movie path.
 			info.movie_path = cache_entry.movie_path;
+			info.movie_in_archive = true;
 		}
 		else if (std::string movie_path = sfo_dir + "/" + m_localized_movie; file_exists(movie_path))
 		{
 			info.movie_path = std::move(movie_path);
+			info.movie_in_archive = archive && archive->exists(info.movie_path);
 		}
 		else if (std::string movie_path = sfo_dir + "/ICON1.PAM"; file_exists(movie_path))
 		{
 			info.movie_path = std::move(movie_path);
+			info.movie_in_archive = archive && archive->exists(info.movie_path);
 		}
 	}
 
@@ -290,16 +293,18 @@ std::optional<game_info_type> game_enumeration<game_info_type>::get_game_info(co
 		{
 			// Cache hit — restore previously resolved audio path.
 			info.audio_path = cache_entry.audio_path;
+			info.audio_in_archive = true;
 		}
 		else if (std::string audio_path = sfo_dir + "/SND0.AT3"; file_exists(audio_path))
 		{
 			info.audio_path = std::move(audio_path);
+			info.audio_in_archive = archive && archive->exists(info.audio_path);
 		}
 	}
 
 	// With the exception of raw device, on cache miss for an ISO, persist the resolved metadata so subsequent
 	// launches skip iso_archive construction entirely
-	if (archive && is_archive && !is_raw_device)
+	if (archive && info.is_iso_file && !is_raw_device)
 	{
 		fs::stat_t iso_stat{};
 		if (fs::get_stat(dir_or_elf, iso_stat))
@@ -343,9 +348,9 @@ void game_enumeration<game_info_type>::push_path(const std::string& path, std::v
 }
 
 template <typename game_info_type>
-void game_enumeration<game_info_type>::add_game(const std::string& path, const std::string& game_dir)
+void game_enumeration<game_info_type>::add_game(const std::string& path, const std::string& game_dir, bool is_iso, bool is_raw)
 {
-	if (std::optional<game_info_type> game = get_game_info(path, game_dir))
+	if (std::optional<game_info_type> game = get_game_info(path, game_dir, is_iso, is_raw))
 	{
 		add_game_apply_extras(*game);
 
@@ -430,7 +435,8 @@ void game_enumeration<game_info_type>::parse_entry(const path_entry& entry)
 
 	if (entry.is_from_yml)
 	{
-		if (is_iso_file(entry.path))
+		bool is_raw_device = false;
+		if (is_iso_file(entry.path, nullptr, &is_raw_device))
 		{
 			std::vector<std::string> subdirs;
 
@@ -439,7 +445,7 @@ void game_enumeration<game_info_type>::parse_entry(const path_entry& entry)
 				for (const std::string& name : subdirs)
 				{
 					if (was_canceled()) break;
-					add_game(entry.path, name);
+					add_game(entry.path, name, true, is_raw_device);
 				}
 
 				return;
@@ -466,13 +472,13 @@ void game_enumeration<game_info_type>::parse_entry(const path_entry& entry)
 				if (name == "PS3_GAME" || std::regex_match(name, ps3_gm_regex))
 				{
 					subdirs.push_back(name);
-					add_game(entry.path, name);
+					add_game(entry.path, name, true, is_raw_device);
 				}
 			}
 			if (subdirs.empty())
 			{
-				add_game(entry.path);
 				subdirs.push_back("PS3_GAME");
+				add_game(entry.path, "PS3_GAME", true, is_raw_device);
 			}
 			if (!was_canceled())
 			{
@@ -551,10 +557,12 @@ void game_enumeration<game_info_type>::apply_patches()
 				if (std::string icon_path = other.path + "/" + m_localized_icon; fs::is_file(icon_path))
 				{
 					info.icon_path = std::move(icon_path);
+					info.icon_in_archive = false;
 				}
 				else if (std::string icon_path = other.path + "/ICON0.PNG"; fs::is_file(icon_path))
 				{
 					info.icon_path = std::move(icon_path);
+					info.icon_in_archive = false;
 				}
 			}
 
@@ -564,10 +572,12 @@ void game_enumeration<game_info_type>::apply_patches()
 				if (std::string movie_path = other.path + "/" + m_localized_icon; fs::is_file(movie_path))
 				{
 					info.movie_path = std::move(movie_path);
+					info.movie_in_archive = false;
 				}
 				else if (std::string movie_path = other.path + "/ICON1.PAM"; fs::is_file(movie_path))
 				{
 					info.movie_path = std::move(movie_path);
+					info.movie_in_archive = false;
 				}
 			}
 		}

rpcs3/rpcs3qt/game_list_context_menu.cpp

@@ -625,7 +625,7 @@ void game_list_context_menu::show_single_selection_context_menu(const game_info&
 	// Check disc game integrity
 	if (QString::fromStdString(current_game.category) == cat::cat_disc_game)
 	{
-		const bool raw_archive = is_iso_file(current_game.path);
+		const bool raw_archive = current_game.is_iso_file && is_iso_file(current_game.path);
 		const iso_type_status iso_type = iso_file_decryption::check_type(current_game.path);
 
 		// If it's an ISO file (e.g. even a decrypted ISO), always provide the entry on the context menu but disable

rpcs3/rpcs3qt/game_list_grid.cpp

@@ -126,16 +126,16 @@ void game_list_grid::populate(
 		if (play_hover_movies && !game->movie_path.empty())
 		{
 			item->set_video_path(game->movie_path);
-			check_iso |= !fs::exists(game->movie_path);
+			check_iso |= game->movie_in_archive;
 		}
 
 		if (play_hover_music && !game->audio_path.empty())
 		{
 			item->set_audio_path(game->audio_path);
-			check_iso |= !fs::exists(game->audio_path);
+			check_iso |= game->audio_in_archive;
 		}
 
-		if (check_iso && is_iso_file(game->path))
+		if (check_iso && game->is_iso_file && is_iso_file(game->path))
 		{
 			item->set_iso_path(game->path);
 		}

rpcs3/rpcs3qt/game_list_table.cpp

@@ -283,10 +283,7 @@ void game_list_table::populate(
 					// Do not report size of apps inside /dev_flash (it does not make sense to do so)
 					game->size_on_disk = 0;
 				}
-				else if (is_iso_file(game->path, &game->size_on_disk)) // If iso file, game->size_on_disk is also set
-				{
-				}
-				else
+				else if (!game->is_iso_file || !is_iso_file(game->path, &game->size_on_disk)) // If iso file, game->size_on_disk is also set
 				{
 					game->size_on_disk = fs::get_dir_size(game->path, 1, cancel.get());
 				}
@@ -304,16 +301,16 @@ void game_list_table::populate(
 		if (play_hover_movies && !game->movie_path.empty())
 		{
 			icon_item->set_video_path(game->movie_path);
-			check_iso |= !fs::exists(game->movie_path);
+			check_iso |= game->movie_in_archive;
 		}
 
 		if (play_hover_music && !game->audio_path.empty())
 		{
 			icon_item->set_audio_path(game->audio_path);
-			check_iso |= !fs::exists(game->audio_path);
+			check_iso |= game->audio_in_archive;
 		}
 
-		if (check_iso && is_iso_file(game->path))
+		if (check_iso && game->is_iso_file && is_iso_file(game->path))
 		{
 			icon_item->set_iso_path(game->path);
 		}

rpcs3/rpcs3qt/shortcut_utils.cpp

@@ -477,7 +477,7 @@ namespace gui::utils
 		if (!game || locations.empty()) return false;
 
 		const std::string dev_flash = g_cfg_vfs.get_dev_flash();
-		const bool is_archive = is_iso_file(game->path);
+		const bool is_archive = game->is_iso_file && is_iso_file(game->path);
 		std::shared_ptr<iso_archive> archive;
 
 		const auto file_exists = [&archive](const std::string& path)