Allow input variable dir to be empty in JoinPath-function in file_name_utils.hpp #9900

New issue

Open

opened 2024-12-18 20:53:04 +00:00 by IsiGebauer · 0 comments

IsiGebauer commented

2024-12-18 20:53:04 +00:00

(Migrated from github.com)

At the end of the maps-generation I run into an assertion in line 53 of file_name_utils.hpp. I run the maps_generator python file from the python/tools folder. My map_generator.ini-file can be found below. I also added the log-file.
I did not investigate any further, as the fix was relatively easy to do: Simply rewrite the JoinPath-Function such that the input variable dir can be empty:
`template <typename... Args>
std::string JoinPath(std::string const & folder, Args &&... args)
{
if (folder.empty())
{
if (sizeof...(args) == 0)
{return {};}
else
{return impl::JoinPath(std::forward(args)...);}
}

return AddSlashIfNeeded(folder) + impl::JoinPath(std::forward(args)...);
}
} // namespace impl

/// Create full path from some folder using native folders separator.
template <typename... Args>
std::string JoinPath(std::string const & dir, std::string const & fileOrDir, Args &&... args)
{
ASSERT(!fileOrDir.empty(), ("JoinPath fileOrDir is empty" + fileOrDir));
return impl::JoinPath(dir, fileOrDir, std::forward(args)...);
}
`
System information:

Ubuntu 24.04.1
Device Model: Lenovo ThinkPad P16s Gen 2
map_generator.txt
Germany_Free State of Bavaria_Upper Bavaria_South.log

PS: I'll open a PR with this as soon as my new map-generation has finished calculating :)

At the end of the maps-generation I run into an assertion in line 53 of `file_name_utils.hpp`. I run the maps_generator python file from the python/tools folder. My `map_generator.ini`-file can be found below. I also added the log-file. I did not investigate any further, as the fix was relatively easy to do: Simply rewrite the JoinPath-Function such that the input variable `dir` can be empty: `template <typename... Args> std::string JoinPath(std::string const & folder, Args &&... args) { if (folder.empty()) { if (sizeof...(args) == 0) {return {};} else {return impl::JoinPath(std::forward<Args>(args)...);} } return AddSlashIfNeeded(folder) + impl::JoinPath(std::forward<Args>(args)...); } } // namespace impl /// Create full path from some folder using native folders separator. template <typename... Args> std::string JoinPath(std::string const & dir, std::string const & fileOrDir, Args &&... args) { ASSERT(!fileOrDir.empty(), ("JoinPath fileOrDir is empty" + fileOrDir)); return impl::JoinPath(dir, fileOrDir, std::forward<Args>(args)...); } ` **System information:** - Ubuntu 24.04.1 - Device Model: Lenovo ThinkPad P16s Gen 2 [map_generator.txt](https://github.com/user-attachments/files/18188640/map_generator.txt) [Germany_Free State of Bavaria_Upper Bavaria_South.log](https://github.com/user-attachments/files/18188678/Germany_Free.State.of.Bavaria_Upper.Bavaria_South.log) PS: I'll open a PR with this as soon as my new map-generation has finished calculating :)

Rows
Columns