feat(util): 1.12.10, 添加GetFileStem()与GetFileSuffix()两个函数

Author: hevake

modules/util/fs.cpp

@@ -440,6 +440,51 @@ std::string Dirname(const std::string &full_path)
     return full_path.substr(start_pos, end_pos - start_pos);
 }
 
+/**
+ * 目标:
+ * "a" -> "a"
+ * "a.txt" -> "a"
+ * "/some/a.txt" -> "a"
+ * "/some/a.b/c" -> "c"
+ * "" -> ""
+ */
+std::string GetFileStem(const std::string &filepath)
+{
+    std::string::size_type start_pos = 0;
+
+    auto last_backslash_pos = filepath.find_last_of('/');
+    if (last_backslash_pos != std::string::npos)
+        start_pos = last_backslash_pos + 1;
+
+    auto last_dot_pos = filepath.find_last_of('.');
+    if (last_dot_pos != std::string::npos && last_dot_pos > start_pos)
+        return filepath.substr(start_pos, last_dot_pos - start_pos);
+    else
+        return filepath.substr(start_pos);
+}
+
+/**
+ * 目标：
+ * "a.b" -> "b"
+ * "a" -> ""
+ * "a." -> ""
+ * "/w/a.b" -> "b"
+ * "" -> ""
+ */
+std::string GetFileSuffix(const std::string &filepath)
+{
+    auto last_dot_pos = filepath.find_last_of('.');
+    if (last_dot_pos == std::string::npos)
+        return "";
+
+    //! 防止 "a.b/c" -> "a/c" 的情况
+    auto last_backslash_pos = filepath.find_last_of('/');
+    if (last_backslash_pos != std::string::npos && last_backslash_pos > last_dot_pos)
+        return "";
+
+    return filepath.substr(last_dot_pos + 1);
+}
+
 bool Rename(const std::string &old_name, const std::string &new_name)
 {
     int ret = ::rename(old_name.c_str(), new_name.c_str());

modules/util/fs.h

@@ -275,6 +275,16 @@ const char* Basename(const char *full_path);
  */
 std::string Dirname(const std::string &full_path);
 
+/**
+ * 获取文件名的主体，如："config.json" -> "config"
+ */
+std::string GetFileStem(const std::string &file_path);
+
+/**
+ * 获取文件名的后缀，如："config.json" -> "json"
+ */
+std::string GetFileSuffix(const std::string &file_path);
+
 /**
  * 重命名
  *

modules/util/fs_test.cpp

@@ -228,6 +228,24 @@ TEST(fs, Basename) {
     EXPECT_EQ(Basename(std::string()), "");
 }
 
+TEST(fs, GetFileStem) {
+    EXPECT_EQ(GetFileStem("a.b"), "a");
+    EXPECT_EQ(GetFileStem("a"), "a");
+    EXPECT_EQ(GetFileStem("a."), "a");
+    EXPECT_EQ(GetFileStem("/w/a.b"), "a");
+    EXPECT_EQ(GetFileStem("/w.x/a"), "a");
+    EXPECT_EQ(GetFileStem(""), "");
+}
+
+TEST(fs, GetFileSuffix) {
+    EXPECT_EQ(GetFileSuffix("a.b"), "b");
+    EXPECT_EQ(GetFileSuffix("a"), "");
+    EXPECT_EQ(GetFileSuffix("a."), "");
+    EXPECT_EQ(GetFileSuffix("/w/a.b"), "b");
+    EXPECT_EQ(GetFileSuffix("/w.x/a"), "");
+    EXPECT_EQ(GetFileSuffix(""), "");
+}
+
 TEST(fs, RemoveDirectory) {
     //! 绝对路径测试
     int ret = 0;

version.mk

@@ -21,4 +21,4 @@
 # TBOX版本号
 TBOX_VERSION_MAJOR := 1
 TBOX_VERSION_MINOR := 12
-TBOX_VERSION_REVISION := 9
+TBOX_VERSION_REVISION := 10