0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fs: Consider platform differences when enumerating alternate save paths

Browse source 
The original code by octalot only works correctly on X11 when using the
recommended fdo layout. Windows and macOS need their own logic to build
candidate paths.

The code is still very optimistic about this whole thing -- see the
comment. Ideally we need to refactor the system to determine user data
path defaults so we can do it as many times as necessary even if we've
already determined our current user data path, but that seems like a lot
of work for a worst-case scenario that's not gonna crop up very often.

Also, I have no idea if the macOS alternative works, or what will happen
on iOS for that matter. It should at least compile.
This commit is contained in:
Iris Morelle 2019-11-05 12:16:40 -03:00
parent b24f755c28
commit e15a611a9c
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/filesystem.cpp
View file

@ -827,6 +827,10 @@ std::string get_cache_dir()
std::vector<other_version_dir> find_other_version_saves_dirs()
{
#if !defined(_WIN32) && !defined(_X11) && !defined(__APPLE__)
// By all means, this situation doesn't make sense
return {};
#else
const auto& w_ver = game_config::wesnoth_version;
const auto& ms_ver = game_config::min_savegame_version;
@ -846,13 +850,32 @@ std::vector<other_version_dir> find_other_version_saves_dirs()
version.set_major_version(w_ver.major_version());
version.set_minor_version(minor);
auto suffix = get_version_path_suffix(version);
auto path = get_user_data_path().parent_path() / suffix / "saves";
bfs::path path;
//
// NOTE:
// This is a bit of a naive approach. We assume on all platforms that
// get_user_data_path() will return something resembling the default
// configuration and that --user-data-dir wasn't used. We will get
// false negatives when any of these conditions don't hold true.
//
#if defined(_WIN32)
path = get_user_data_path().parent_path() / ("Wesnoth" + suffix) / "saves";
#elif defined(_X11)
path = get_user_data_path().parent_path() / suffix / "saves";
#elif defined(__APPLE__)
path = get_user_data_path().parent_path() / ("Wesnoth_" + suffix) / "saves";
#endif
if(bfs::exists(path)) {
result.emplace_back(suffix, path.generic_string());
}
}
return result;
#endif
}
std::string get_cwd()