Remove Util::dirname and finally the util files
Luis Díaz Más
3 years ago
committed by
Luis Diaz
parent
1b912fa887
commit
405f4b5f1b
@ -1,48 +0,0 @@
|
||||
// ***************************************************************** -*- C++ -*-
|
||||
/*
|
||||
* Copyright (C) 2004-2021 Exiv2 authors
|
||||
* This program is part of the Exiv2 distribution.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
// *****************************************************************************
|
||||
|
||||
#include "utils.hpp"
|
||||
|
||||
#include <filesystem>
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
namespace Util {
|
||||
|
||||
// *****************************************************************************
|
||||
// free functions
|
||||
|
||||
std::string dirname(const std::string& path)
|
||||
{
|
||||
auto p = fs::path(path).parent_path();
|
||||
if (p.empty())
|
||||
return ".";
|
||||
return p.string();
|
||||
}
|
||||
|
||||
std::string basename(const std::string& path, bool delsuffix)
|
||||
{
|
||||
auto p = fs::path(path);
|
||||
if (delsuffix)
|
||||
return p.stem().string();
|
||||
return p.filename().string();
|
||||
}
|
||||
} // namespace Util
|
||||
@ -1,62 +0,0 @@
|
||||
// ***************************************************************** -*- C++ -*-
|
||||
/*
|
||||
* Copyright (C) 2004-2021 Exiv2 authors
|
||||
* This program is part of the Exiv2 distribution.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
#ifndef UTILS_HPP_
|
||||
#define UTILS_HPP_
|
||||
|
||||
// *********************************************************************
|
||||
// included header files
|
||||
|
||||
// + standard includes
|
||||
#include <string>
|
||||
|
||||
// *********************************************************************
|
||||
// namespace extensions
|
||||
/*!
|
||||
@brief Contains utility classes and functions. Most of these are
|
||||
wrappers for common C functions that do not require pointers
|
||||
and memory considerations.
|
||||
*/
|
||||
namespace Util {
|
||||
|
||||
// *********************************************************************
|
||||
// free functions
|
||||
|
||||
/*!
|
||||
@brief Get the directory component from the \em path string.
|
||||
See %dirname(3).
|
||||
|
||||
This function can handle Windows paths to some extent: c:\\bar should
|
||||
be fine, \\\\bigsrv\\foo also, but \\\\bigsrv alone doesn't work.
|
||||
*/
|
||||
std::string dirname(const std::string& path);
|
||||
|
||||
/*!
|
||||
@brief Get the filename component from the \em path string.
|
||||
See %basename(3). If the \em delsuffix parameter is true,
|
||||
the suffix will be removed.
|
||||
|
||||
This function can handle Windows paths to some extent: c:\\bar should
|
||||
be fine, \\\\bigsrv\\foo also, but \\\\bigsrv alone doesn't work.
|
||||
*/
|
||||
std::string basename(const std::string& path, bool delsuffix =false);
|
||||
|
||||
} // namespace Util
|
||||
|
||||
#endif // #ifndef UTILS_HPP_
|
||||
@ -1,62 +0,0 @@
|
||||
#include <utils.hpp>
|
||||
|
||||
// Auxiliary headers
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
namespace {
|
||||
const std::string pathLinux("/home/luis/file.txt");
|
||||
const std::string pathWindows("c:/luis/file.txt");
|
||||
}
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
TEST(dirname, returnsDirNameWithValidPathOnWindows)
|
||||
{
|
||||
ASSERT_EQ("c:\\luis", Util::dirname(pathWindows));
|
||||
}
|
||||
TEST(basename, returnsStemWithExtensionWithValidPathOnWindows)
|
||||
{
|
||||
const bool delSuffix = false;
|
||||
ASSERT_EQ("file.txt", Util::basename(pathWindows, delSuffix));
|
||||
}
|
||||
|
||||
TEST(basename, returnsStemWithoutExtensionWithValidPathOnWindows)
|
||||
{
|
||||
const bool delSuffix = true;
|
||||
ASSERT_EQ("file", Util::basename(pathWindows, delSuffix));
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
TEST(dirname, returnsDirNameWithValidPathOnLinux)
|
||||
{
|
||||
ASSERT_EQ("/home/luis", Util::dirname(pathLinux));
|
||||
ASSERT_EQ("/tmp", Util::dirname("/tmp/file.jpg"));
|
||||
}
|
||||
|
||||
|
||||
TEST(dirname, returnsDotWithRelativePath)
|
||||
{
|
||||
ASSERT_EQ(".", Util::dirname("file.txt"));
|
||||
}
|
||||
|
||||
TEST(dirname, returnsDotEmptyString)
|
||||
{
|
||||
ASSERT_EQ(".", Util::dirname(""));
|
||||
}
|
||||
|
||||
/// \bug the logic for delsuffix is actually reverted
|
||||
TEST(basename, returnsStemWithExtensionWithValidPathOnLinux)
|
||||
{
|
||||
const bool delSuffix = false;
|
||||
ASSERT_EQ("file.txt", Util::basename(pathLinux, delSuffix));
|
||||
}
|
||||
|
||||
TEST(basename, returnsStemWithoutExtensionWithValidPathOnLinux)
|
||||
{
|
||||
const bool delSuffix = true;
|
||||
ASSERT_EQ("file", Util::basename(pathLinux, delSuffix));
|
||||
}
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue