feat:1.10.1, 为util::fs添加Rename()函数

Author: hevake

modules/util/fs.cpp

@@ -211,6 +211,7 @@ bool RemoveFile(const std::string &filename, bool allow_log_print)
 
     if (errno != ENOENT && allow_log_print)
         LogWarn("errno:%d (%s)", errno, strerror(errno));
+
     return false;
 }
 
@@ -429,6 +430,18 @@ std::string Dirname(const std::string &full_path)
     return full_path.substr(start_pos, end_pos - start_pos);
 }
 
+bool Rename(const std::string &old_name, const std::string &new_name)
+{
+    int ret = ::rename(old_name.c_str(), new_name.c_str());
+    if (ret == 0)
+        return true;
+
+    if (errno != ENOENT)
+        LogWarn("errno:%d (%s)", errno, strerror(errno));
+
+    return false;
+}
+
 }
 }
 }

modules/util/fs.h

@@ -255,6 +255,17 @@ const char* Basename(const char *full_path);
  */
 std::string Dirname(const std::string &full_path);
 
+/**
+ * 重命名
+ *
+ * \param old_name  旧文件名
+ * \param new_name  新文件名
+ *
+ * \return true 成功
+ * \return false 失败
+ */
+bool Rename(const std::string &old_name, const std::string &new_name);
+
 }
 }
 }

modules/util/fs_test.cpp

@@ -132,6 +132,27 @@ TEST(fs, BinaryFileReadWrite_Ok) {
     EXPECT_FALSE(IsFileExist(test_filename));
 }
 
+TEST(fs, RenameFile) {
+  auto old_name = "old_file";
+  auto new_name = "new_file";
+  EXPECT_TRUE(WriteStringToTextFile(old_name, ""));
+  EXPECT_TRUE(Rename(old_name, new_name));
+  EXPECT_TRUE(IsFileExist(new_name));
+  EXPECT_FALSE(IsFileExist(old_name));
+  RemoveFile(new_name);
+}
+
+TEST(fs, RenameDirectory) {
+  auto old_name = "old_dir";
+  auto new_name = "new_dir";
+  EXPECT_TRUE(MakeDirectory(old_name));
+  EXPECT_TRUE(Rename(old_name, new_name));
+  EXPECT_TRUE(IsDirectoryExist(new_name));
+  EXPECT_FALSE(IsFileExist(old_name));
+  RemoveDirectory(old_name);
+}
+
+
 TEST(fs, IsDirectoryExist) {
     EXPECT_FALSE(IsDirectoryExist("should/not/exist/directory"));
     EXPECT_TRUE(IsDirectoryExist("/etc/"));

version.mk

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