Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a notification when failing to load .7z/.zip #320

Closed
wants to merge 1 commit into from
Closed

Add a notification when failing to load .7z/.zip #320

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions Source/Core/DolphinLibretro/Boot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,30 @@ bool retro_load_game(const struct retro_game_info* game)
Libretro::environ_cb(RETRO_ENVIRONMENT_GET_CORE_ASSETS_DIRECTORY, &core_assets_dir);
Libretro::InitDiskControlInterface();

std::vector<std::string> normalized_game_paths;
normalized_game_paths.push_back(Libretro::NormalizePath(game->path));
std::string folder_path;
std::string filename;
std::string extension;
SplitPath(normalized_game_paths.front(), &folder_path, &filename, &extension);
std::transform(filename.begin(), filename.end(), filename.begin(), ::tolower);
std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower);

// Check if the extension is '.7z' or '.zip' or if the file was loaded from an archive,
// for the latter we check if the filename contains '.7z#' or '.zip#'
if (extension == ".7z" || extension == ".zip" ||
filename.find(".7z#") != std::string::npos ||
filename.find(".zip#") != std::string::npos)
{
struct retro_message msg = {
".7z and .zip files not supported, please extract content and retry",
180
};
Libretro::environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE, &msg);

return false;
}

if (save_dir && *save_dir)
user_dir = std::string(save_dir) + DIR_SEP "User";
else if (system_dir && *system_dir)
Expand Down Expand Up @@ -178,13 +202,6 @@ bool retro_load_game(const struct retro_game_info* game)

WindowSystemInfo wsi(WindowSystemType::Libretro, nullptr, nullptr, nullptr);

std::vector<std::string> normalized_game_paths;
normalized_game_paths.push_back(Libretro::NormalizePath(game->path));
std::string folder_path;
std::string extension;
SplitPath(normalized_game_paths.front(), &folder_path, nullptr, &extension);
std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower);

if (extension == ".m3u" || extension == ".m3u8")
{
normalized_game_paths = ReadM3UFile(normalized_game_paths.front(), folder_path);
Expand Down