From dda8af0092b55b7afb24f6abeaec05c3fe8766e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 20 Dec 2017 03:43:47 +0100 Subject: [PATCH 1/5] Update version strings to 0.16.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- CMakeLists.txt | 2 +- include/spdlog/spdlog.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad8062ed..f73b4c72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ # cmake_minimum_required(VERSION 3.1) -project(spdlog VERSION 0.14.0) +project(spdlog VERSION 0.16.0) include(CTest) include(CMakeDependentOption) include(GNUInstallDirs) diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h index 7121c31e..7c6ceda6 100644 --- a/include/spdlog/spdlog.h +++ b/include/spdlog/spdlog.h @@ -7,7 +7,7 @@ #pragma once -#define SPDLOG_VERSION "0.14.0" +#define SPDLOG_VERSION "0.16.0" #include "tweakme.h" #include "common.h" From f93277d2713673527393b0a6bd625cc311028484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=CC=8Cubomi=CC=81r=20Carik?= Date: Wed, 20 Dec 2017 04:21:59 +0100 Subject: [PATCH 2/5] Solve compiler warning in tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ľubomír Carik --- tests/errors.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/errors.cpp b/tests/errors.cpp index 83af2051..c8281d63 100644 --- a/tests/errors.cpp +++ b/tests/errors.cpp @@ -15,7 +15,7 @@ class failing_sink: public spdlog::sinks::sink throw std::runtime_error("some error happened during log"); } - void flush() + void flush() override {} }; From 79a3a633c79281712938a26275eb66c81b785736 Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Wed, 20 Dec 2017 10:07:50 +0200 Subject: [PATCH 3/5] uupdate version to 0.16.1 --- include/spdlog/spdlog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h index 7c6ceda6..484a1010 100644 --- a/include/spdlog/spdlog.h +++ b/include/spdlog/spdlog.h @@ -7,7 +7,7 @@ #pragma once -#define SPDLOG_VERSION "0.16.0" +#define SPDLOG_VERSION "0.16.1" #include "tweakme.h" #include "common.h" From c060a10c102a2e25f1d2fcfb46e1148d73b0f7d5 Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Wed, 20 Dec 2017 10:08:49 +0200 Subject: [PATCH 4/5] update to version 0.16.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f73b4c72..e37456d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ # cmake_minimum_required(VERSION 3.1) -project(spdlog VERSION 0.16.0) +project(spdlog VERSION 0.16.1) include(CTest) include(CMakeDependentOption) include(GNUInstallDirs) From 42e5d98a483463493409465f90ce3c52fd842f27 Mon Sep 17 00:00:00 2001 From: Force Charlie Date: Fri, 22 Dec 2017 17:52:50 +0800 Subject: [PATCH 5/5] fix split_by_extenstion parse error extenstion --- include/spdlog/details/file_helper.h | 15 ++++++++------- tests/file_helper.cpp | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/include/spdlog/details/file_helper.h b/include/spdlog/details/file_helper.h index 79150531..3b8df9c1 100644 --- a/include/spdlog/details/file_helper.h +++ b/include/spdlog/details/file_helper.h @@ -118,17 +118,18 @@ public: // // "my_folder/.mylog" => ("my_folder/.mylog") // "my_folder/.mylog.txt" => ("my_folder/.mylog", ".txt") - static std::tuple split_by_extenstion(const filename_t& fname) { auto index = fname.rfind('.'); - bool found_ext = index != filename_t::npos && index !=0 && fname[index - 1] != details::os::folder_sep; - if (found_ext) - return std::make_tuple(fname.substr(0, index), fname.substr(index)); - else - return std::make_tuple(fname, filename_t()); + if (index != filename_t::npos && index != fname.size() - 1 &&index !=0 && fname[index - 1] != details::os::folder_sep) + { + auto index2 = fname.find(details::os::folder_sep, index); + if (index2 == fname.npos) { + return std::make_tuple(fname.substr(0, index), fname.substr(index)); + } + } + return std::make_tuple(fname, std::string()); } - private: FILE* _fd; filename_t _filename; diff --git a/tests/file_helper.cpp b/tests/file_helper.cpp index 62997e3e..6c8ee79f 100644 --- a/tests/file_helper.cpp +++ b/tests/file_helper.cpp @@ -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 == ""); +}