diff --git a/audio/audio.cpp b/audio/audio.cpp index 3be2810d1..c9aa56675 100644 --- a/audio/audio.cpp +++ b/audio/audio.cpp @@ -216,9 +216,9 @@ openal_buffer::fetch_caption() { std::string captionfilename { name }; captionfilename.erase( captionfilename.rfind( '.' ) ); // obcięcie rozszerzenia captionfilename += "-" + Global.asLang + ".txt"; // już może być w różnych językach - if( true == FileExists( captionfilename ) ) { + if( auto const casedfilename { FileCased( captionfilename ) }; false == casedfilename.empty() ) { // wczytanie - std::ifstream inputfile( captionfilename ); + std::ifstream inputfile( casedfilename ); caption.assign( std::istreambuf_iterator( inputfile ), std::istreambuf_iterator() ); } } diff --git a/editor/editorPreviews.cpp b/editor/editorPreviews.cpp index 27f84a9fe..68164460c 100644 --- a/editor/editorPreviews.cpp +++ b/editor/editorPreviews.cpp @@ -298,7 +298,9 @@ void image_cache::work() m_queue.pop_front(); } int width{0}, height{0}, components{0}; - auto *pixels{stbi_load(image.path.c_str(), &width, &height, &components, 4)}; + // the file as it's named on the disk, the path stays the key of the cache + auto const file{FileCased(image.path)}; + auto *pixels{file.empty() ? nullptr : stbi_load(file.c_str(), &width, &height, &components, 4)}; if (pixels != nullptr && width > 0 && height > 0) { // scaled down by the average of the pixels which make each one, the longer side to the size of the cache diff --git a/model/Model3d.cpp b/model/Model3d.cpp index 44f5f6255..e3507e216 100644 --- a/model/Model3d.cpp +++ b/model/Model3d.cpp @@ -1702,24 +1702,27 @@ bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic) m_filename = name; asBinary = name + ".e3d"; + // the files as they're named on the disk, the name given is in lowercase + auto const textfile{FileCased(name + ".t3d")}; + auto const binaryfile{FileCased(asBinary)}; // Hirek: Jesli mamy ustawione priorityLoadText3D na yes to wpierw ladujemy t3d - if (Global.priorityLoadText3D && FileExists(name + ".t3d")) + if (Global.priorityLoadText3D && (false == textfile.empty())) { - WriteLog("Forced loading text model \"" + name + ".t3d\""); - LoadFromTextFile(name + ".t3d", dynamic); + WriteLog("Forced loading text model \"" + textfile + "\""); + LoadFromTextFile(textfile, dynamic); if (!dynamic) Init(); } - else if (FileExists(asBinary)) + else if (false == binaryfile.empty()) { - LoadFromBinFile(asBinary, dynamic); + LoadFromBinFile(binaryfile, dynamic); asBinary = ""; Init(); } - else if (FileExists(name + ".t3d")) + else if (false == textfile.empty()) { - LoadFromTextFile(name + ".t3d", dynamic); + LoadFromTextFile(textfile, dynamic); if (!dynamic) Init(); } diff --git a/model/Texture.cpp b/model/Texture.cpp index cd275c9e0..e09e8c8ab 100644 --- a/model/Texture.cpp +++ b/model/Texture.cpp @@ -549,13 +549,15 @@ opengl_texture::load() { data_state = resource_state::loading; - if( type == ".dds" ) { load_DDS(); } - else if( type == ".tga" ) { load_TGA(); } - else if( type == ".png" ) { load_STBI(); } - else if( type == ".ktx" ) { load_KTX(); } - else if( type == ".bmp" ) { load_STBI(); } - else if( type == ".jpg" ) { load_STBI(); } - else if( type == ".tex" ) { load_TEX(); } + // the extension as the file has it on the disk, in any case + auto const format { ToLower( type ) }; + if( format == ".dds" ) { load_DDS(); } + else if( format == ".tga" ) { load_TGA(); } + else if( format == ".png" ) { load_STBI(); } + else if( format == ".ktx" ) { load_KTX(); } + else if( format == ".bmp" ) { load_STBI(); } + else if( format == ".jpg" ) { load_STBI(); } + else if( format == ".tex" ) { load_TEX(); } else { goto fail; } } diff --git a/tests/unit/test_utilities.cpp b/tests/unit/test_utilities.cpp index f04d9e34a..b8ad0b95c 100644 --- a/tests/unit/test_utilities.cpp +++ b/tests/unit/test_utilities.cpp @@ -578,6 +578,38 @@ TEST_CASE("utilities: a file is found by its name in another case") { CHECK(FileCased("eu07_unit_test_no_such_file.xyz").empty()); } +TEST_CASE("utilities: a file is found in folders named in another case, the way the parser gives the names in lowercase") { + test::scratch_folder const folder{"utilities_cased_folders"}; + folder.write("Scenery/Braniewo/rozklady/Os91121.txt", "x"); + folder.write("Textures/Tabl/L101-2m.BMP", "x"); + + // every part of the path in lowercase: the file as it's on the disk where the case matters, the name given where it doesn't + auto const timetable{FileCased(folder.path("scenery/braniewo/rozklady/os91121.txt"))}; + REQUIRE_FALSE(timetable.empty()); + CHECK(FileExists(timetable)); + CHECK(ToLower(timetable) == ToLower(folder.path("Scenery/Braniewo/rozklady/Os91121.txt"))); + CHECK(FileExists(folder.path("scenery/braniewo/rozklady/os91121.txt"))); + // the folders written the Windows way as well + CHECK_FALSE(FileCased(folder.path() + "scenery\\braniewo\\rozklady\\os91121.txt").empty()); + // a folder missing in any case + CHECK(FileCased(folder.path("scenery/nowhere/rozklady/os91121.txt")).empty()); + CHECK_FALSE(FileExists(folder.path("scenery/nowhere/rozklady/os91121.txt"))); + + // among names and extensions: given back as named on the disk, so it's opened by that name, the extension too + auto const texture{FileExists(std::vector{folder.path("textures/tabl/l101-2m")}, std::vector{".dds", ".bmp"})}; + REQUIRE_FALSE(texture.first.empty()); + CHECK(ToLower(texture.second) == ".bmp"); + CHECK(FileExists(texture.first + texture.second)); + CHECK(ToLower(texture.first) == ToLower(folder.path("Textures/Tabl/L101-2m"))); + + // a file written after the folder was gone through is found as well + CHECK(FileCased(folder.path("textures/tabl/l7-2m.bmp")).empty()); + folder.write("Textures/Tabl/L7-2m.bmp", "x"); + auto const added{FileCased(folder.path("textures/tabl/l7-2m.bmp"))}; + REQUIRE_FALSE(added.empty()); + CHECK(FileExists(added)); +} + TEST_CASE("utilities: the time a file was changed is given, zero for a file which isn't there") { test::scratch_folder const folder{"utilities_modified"}; auto const name{folder.write("fresh.txt", "x")}; diff --git a/utilities/utilities.cpp b/utilities/utilities.cpp index 550ad016a..85b40d330 100644 --- a/utilities/utilities.cpp +++ b/utilities/utilities.cpp @@ -513,9 +513,55 @@ template <> bool extract_value(bool &Variable, std::string const &Key, std::stri bool FileExists(std::string const &Filename) { +#ifdef _WIN32 return std::filesystem::exists(Filename); +#else + // the names come in lowercase from the parser, the files of the data are named in any case + return false == FileCased(Filename).empty(); +#endif } +#ifndef _WIN32 +namespace +{ + +// the names in a folder by their lowercase, and the time the folder was changed when they were read +struct cased_folder +{ + std::filesystem::file_time_type changed{}; + std::unordered_map names; +}; + +std::mutex cased_mutex; +std::unordered_map cased_folders; + +// the name in the folder matching the one given in any case, empty when there's none. the folder is read again once it was +// changed, as the editor writes files while it runs. to be called with cased_mutex held +std::string cased_name(std::string const &Folder, std::string const &Name) +{ + std::filesystem::path const folder{Folder.empty() ? std::string{"."} : Folder}; + std::error_code error; + auto const changed{std::filesystem::last_write_time(folder, error)}; + if (error) + return {}; + auto &cached{cased_folders[Folder]}; + if (cached.names.empty() || cached.changed != changed) + { + cached.changed = changed; + cached.names.clear(); + for (std::filesystem::directory_iterator entry{folder, error}, end; (false == bool(error)) && (entry != end); entry.increment(error)) + { + auto const name{entry->path().filename().string()}; + cached.names.try_emplace(ToLower(name), name); + } + } + auto const found{cached.names.find(ToLower(Name))}; + return found != cached.names.end() ? found->second : std::string{}; +} + +} // namespace +#endif + std::string FileCased(std::filesystem::path const &Filename) { std::error_code error; @@ -526,13 +572,40 @@ std::string FileCased(std::filesystem::path const &Filename) // code page to throw on return {}; #else - // only the name of the file itself, a folder named in another case isn't found - auto const directory{Filename.has_parent_path() ? Filename.parent_path() : std::filesystem::path{"."}}; - auto const wanted{ToLower(Filename.filename().string())}; - for (std::filesystem::directory_iterator entry{directory, error}, end; entry != end; entry.increment(error)) - if (ToLower(entry->path().filename().string()) == wanted) - return Filename.has_parent_path() ? (directory / entry->path().filename()).string() : entry->path().filename().string(); - return {}; + // every part of the path in turn, the folders can be named in another case as well as the file + auto const text{Filename.string()}; + std::string cased; + std::size_t start{0}; + if ((false == text.empty()) && (text.front() == '/')) + { + cased = "/"; + start = 1; + } + while (start < text.size()) + { + auto end{text.find_first_of("/\\", start)}; + if (end == std::string::npos) + end = text.size(); + auto const part{text.substr(start, end - start)}; + start = end + 1; + if (part.empty()) + continue; + if ((part == ".") || (part == "..") || std::filesystem::exists(cased + part, error)) + { + cased += part; + } + else + { + std::scoped_lock const lock{cased_mutex}; + auto const name{cased_name(cased, part)}; + if (name.empty()) + return {}; + cased += name; + } + if (end < text.size()) + cased += '/'; + } + return std::filesystem::exists(cased, error) ? cased : std::string{}; #endif } @@ -543,10 +616,19 @@ std::pair FileExists(std::vector const &N { for (auto const &extension : Extensions) { +#ifdef _WIN32 if (FileExists(name + extension)) { return {name, extension}; } +#else + // given back as it's named on the disk, so it's opened by that name + if (auto const cased{FileCased(name + extension)}; cased.size() >= extension.size()) + { + auto const split{cased.size() - extension.size()}; + return {cased.substr(0, split), cased.substr(split)}; + } +#endif } } // nothing found diff --git a/utilities/utilities.h b/utilities/utilities.h index 748c4c8d9..2e347b933 100644 --- a/utilities/utilities.h +++ b/utilities/utilities.h @@ -222,10 +222,11 @@ template bool extract_value(Type_ &Variable, std::string const template <> bool extract_value(bool &Variable, std::string const &Key, std::string const &Input, std::string const &Default); bool FileExists(std::string const &Filename); -// the file as it's named on the disk when only the case of its name differs, as in the sceneries made on Windows; empty when -// there's none. the folders have to be named in their case; on Windows, finding the names in any case itself, the file given or none +// the file as it's named on the disk when only the case of its name or of its folders differs, as in the sceneries made on Windows; +// empty when there's none. on Windows, finding the names in any case itself, the file given or none std::string FileCased(std::filesystem::path const &Filename); +// the first name with one of the extensions which has a file, in the order given, as the file is named on the disk std::pair FileExists(std::vector const &Names, std::vector const &Extensions); // returns time of last modification for specified file diff --git a/world/mtable.cpp b/world/mtable.cpp index 123ae00f6..0ac08bc20 100644 --- a/world/mtable.cpp +++ b/world/mtable.cpp @@ -277,6 +277,15 @@ bool TTrainParameters::LoadTTfile(std::string const &scnpath, int iPlus, double // Ra 2014-09: ustalić zasady wyznaczenia pierwotnego pliku przy przesuniętych rozkładach // (kolejny pociąg dostaje numer +2) fin.open(s.c_str()); // otwieranie pliku + if (false == fin.is_open()) + { + // the name of the train comes in lowercase, the file can be named in another case + if (auto const cased{FileCased(s)}; false == cased.empty()) + { + fin.clear(); + fin.open(cased); + } + } replace_slashes(s); if (!fin.is_open())