gitMirror/spdlog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/gabime/spdlog

Browse Source
This commit is contained in:
gabime 2017-12-22 14:38:54 +02:00
commit 0ed3e4cf76
5 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -4,7 +4,7 @@
# #
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.1)
project(spdlog VERSION 0.14.0) project(spdlog VERSION 0.16.1)
include(CTest) include(CTest)
include(CMakeDependentOption) include(CMakeDependentOption)
include(GNUInstallDirs) include(GNUInstallDirs)

15
include/spdlog/details/file_helper.h
View File

@ -118,17 +118,18 @@ public:
// //
// "my_folder/.mylog" => ("my_folder/.mylog") // "my_folder/.mylog" => ("my_folder/.mylog")
// "my_folder/.mylog.txt" => ("my_folder/.mylog", ".txt") // "my_folder/.mylog.txt" => ("my_folder/.mylog", ".txt")
static std::tuple<filename_t, filename_t> split_by_extenstion(const filename_t& fname) static std::tuple<filename_t, filename_t> split_by_extenstion(const filename_t& fname)
{ {
auto index = fname.rfind('.'); auto index = fname.rfind('.');
bool found_ext = index != filename_t::npos && index !=0 && fname[index - 1] != details::os::folder_sep; if (index != filename_t::npos && index != fname.size() - 1 &&index !=0 && fname[index - 1] != details::os::folder_sep)
if (found_ext) {
return std::make_tuple(fname.substr(0, index), fname.substr(index)); auto index2 = fname.find(details::os::folder_sep, index);
else if (index2 == fname.npos) {
return std::make_tuple(fname, filename_t()); return std::make_tuple(fname.substr(0, index), fname.substr(index));
}
}
return std::make_tuple(fname, std::string());
} }
private: private:
FILE* _fd; FILE* _fd;
filename_t _filename; filename_t _filename;

2
include/spdlog/spdlog.h
View File

@ -7,7 +7,7 @@
#pragma once #pragma once
#define SPDLOG_VERSION "0.14.0" #define SPDLOG_VERSION "0.16.1"
#include "tweakme.h" #include "tweakme.h"
#include "common.h" #include "common.h"

2
tests/errors.cpp
View File

@ -15,7 +15,7 @@ class failing_sink: public spdlog::sinks::sink
throw std::runtime_error("some error happened during log"); throw std::runtime_error("some error happened during log");
} }
void flush() void flush() override
{} {}
}; };

14
tests/file_helper.cpp
View File

@ -145,5 +145,19 @@ TEST_CASE("file_helper_split_by_extenstion7", "[file_helper::split_by_extenstion
} }
TEST_CASE("file_helper_split_by_extenstion8", "[file_helper::split_by_extenstion(hidden_file)]]")
{
#ifdef _WIN32
auto filename = "folder.ext\\mylog";
auto expected_basename = "folder.ext\\mylog";
#else
auto filename = "folder.ext/mylog";
auto expected_basename = "folder.ext/mylog";
#endif
std::string basename, ext;
std::tie(basename, ext) = file_helper::split_by_extenstion(filename);
REQUIRE(basename == expected_basename);
REQUIRE(ext == "");
}