TgBot++: fslib: Use std::filesystem::path for path objects

Royna2544 · Feb 19, 2024 · 112c430 · 112c430
1 parent b4bc275
commit 112c430
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/src/ConfigManager.cpp b/src/ConfigManager.cpp
@@ -33,15 +33,16 @@ struct file_priv {
 };
 
 static void *file_load(void) {
-    std::string home, line;
+    std::filesystem::path home;
+    std::string line;
     static file_priv p{};
     size_t count = 0;
 
     if (!getHomePath(home)) {
         LOG_E("Cannot find HOME");
         return nullptr;
     }
-    const auto confPath = (std::filesystem::path(home) / ".tgbot_config").string();
+    const auto confPath = (home / ".tgbot_config").string();
     std::ifstream ifs(confPath);
     if (ifs.fail()) {
         LOG_E("Opening %s failed", confPath.c_str());

diff --git a/src/fslib/FileSystemLib.cpp b/src/fslib/FileSystemLib.cpp
@@ -6,7 +6,7 @@
 namespace fs = std::filesystem;
 
 __attribute__((weak))
-bool fileExists(const std::string& filename) {
+bool fileExists(const std::filesystem::path& filename) {
     bool rc;
 
     std::error_code ec;
@@ -17,7 +17,7 @@ bool fileExists(const std::string& filename) {
     return rc;
 }
 
-bool canExecute(const std::string& filename)
+bool canExecute(const std::filesystem::path& filename)
 {
     std::error_code ec;
 

diff --git a/src/fslib/FileSystemLib_posix.cpp b/src/fslib/FileSystemLib_posix.cpp
@@ -1,7 +1,7 @@
 #include <cstdlib>
-#include <string>
+#include <filesystem>
 
-bool getHomePath(std::string& buf) {
+bool getHomePath(std::filesystem::path& buf) {
     auto buf_c = getenv("HOME");
     if (buf_c) {
         buf = buf_c;

diff --git a/src/fslib/FileSystemLib_windows.cpp b/src/fslib/FileSystemLib_windows.cpp
@@ -1,9 +1,9 @@
 #include <shlobj.h>
 #include <shlwapi.h>
 
-#include <string>
+#include <filesystem>
 
-bool getHomePath(std::string& buf) {
+bool getHomePath(std::filesystem::path& buf) {
     CHAR userDir[MAX_PATH];
     bool ret = SUCCEEDED(SHGetFolderPathA(NULL, CSIDL_PROFILE, NULL, 0, userDir));
     if (ret) {
@@ -12,7 +12,8 @@ bool getHomePath(std::string& buf) {
     return ret;
 }
 
-bool fileExists(const std::string& path) {
-    auto filepath = path.c_str();
+bool fileExists(const std::filesystem::path& path) {
+    auto pathstr = path.string();
+    auto filepath = pathstr.c_str();
     return PathFileExistsA(filepath) && !PathIsDirectoryA(filepath);
 }
diff --git a/src/include/FileSystemLib.h b/src/include/FileSystemLib.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <string>
+#include <filesystem>
 
 #ifdef __WIN32
 static inline const char path_env_delimiter = ';';
@@ -9,6 +9,6 @@ static inline const char path_env_delimiter = ':';
 #endif
 
 // Implemented sperately by OS
-bool canExecute(const std::string& path);
-bool getHomePath(std::string& buf);
-bool fileExists(const std::string& filename);
+bool canExecute(const std::filesystem::path& path);
+bool getHomePath(std::filesystem::path& buf);
+bool fileExists(const std::filesystem::path& filename);