monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-22 11:39:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

epee: string_tools: keep full path in cut_off_extension

Browse source
This commit is contained in:
tobtoht 2024-08-14 19:45:55 +02:00
parent c51ca53daa
commit 89ad8ac8b1
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/epee/src/string_tools.cpp
View file

@ -189,7 +189,7 @@ namespace string_tools
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::string cut_off_extension(const std::string& str) std::string cut_off_extension(const std::string& str)
{ {
return boost::filesystem::path(str).stem().string(); return boost::filesystem::path(str).replace_extension("").string();
} }
#ifdef _WIN32 #ifdef _WIN32

7
tests/unit_tests/epee_utils.cpp
View file

@ -1451,6 +1451,13 @@ TEST(StringTools, GetExtension)
EXPECT_EQ(std::string{"3"}, epee::string_tools::get_extension("1.2.3")); EXPECT_EQ(std::string{"3"}, epee::string_tools::get_extension("1.2.3"));
} }
TEST(StringTools, CutOffExtension)
{
EXPECT_EQ(std::string{}, epee::string_tools::cut_off_extension(""));
EXPECT_EQ(std::string{"/home/user/Monero/wallets/wallet"}, epee::string_tools::cut_off_extension("/home/user/Monero/wallets/wallet"));
EXPECT_EQ(std::string{"/home/user/Monero/wallets/wallet"}, epee::string_tools::cut_off_extension("/home/user/Monero/wallets/wallet.keys"));
}
TEST(NetUtils, IPv4NetworkAddress) TEST(NetUtils, IPv4NetworkAddress)
{ {
static_assert(epee::net_utils::ipv4_network_address::get_type_id() == epee::net_utils::address_type::ipv4, "bad ipv4 type id"); static_assert(epee::net_utils::ipv4_network_address::get_type_id() == epee::net_utils::address_type::ipv4, "bad ipv4 type id");