Added WsjcppCore::extractDirpath

Author: sea5kg

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Added test case for replace all
 - Added build_simple.bat for windows
 - Added WsjcppCore::makeDirsPath
+- Added WsjcppCore::extractDirpath
 
 ### Changed
 

README.md

@@ -84,9 +84,21 @@ std::string sPath = WsjcppCore::doNormalizePath(".//../bin/some/../");
 Extract base filename from fullpath.
 
 ```
-std::string sFilename = WsjcppCore::doNormalizePath(".//../bin/some/../file.txt");
+std::string sFilename = WsjcppCore::extractFilename(".//../bin/some/../file.txt");
 ```
 
+Variable `sFilename` will has value `file.txt`
+
+### extractDirpath
+
+Extract base dir path from fullpath.
+
+```
+std::string sDirpath = WsjcppCore::extractDirpath(".//../bin/some/../file.txt");
+```
+
+Variable `sDirpath` will has value `.//../bin/some/..`
+
 ### getCurrentDirectory
 
 ```

src/wsjcpp_core.cpp

@@ -362,7 +362,11 @@ std::string WsjcppCore::extractFilename(const std::string &sPath) {
     return sRet;
 }
 
-// ---------------------------------------------------------------------
+std::string WsjcppCore::extractDirpath(const std::string &sFullPath) {
+    std::vector<std::string> vDirs = WsjcppCore::split(sFullPath, "/");
+    vDirs.pop_back();
+    return WsjcppCore::join(vDirs, "/");
+}
 
 std::string WsjcppCore::getCurrentDirectory() {
     char cwd[PATH_MAX];
@@ -372,8 +376,6 @@ std::string WsjcppCore::getCurrentDirectory() {
     return std::string(cwd) + "/";
 }
 
-// ---------------------------------------------------------------------
-
 long WsjcppCore::getCurrentTimeInMilliseconds() {
     long nTimeStart = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
     return nTimeStart;
@@ -423,8 +425,6 @@ std::string WsjcppCore::getThreadId() {
     return std::string(stream.str());
 }
 
-// ---------------------------------------------------------------------
-
 std::string WsjcppCore::formatTimeForWeb(long nTimeInSec) {
     std::time_t tm_ = long(nTimeInSec);
     // struct tm tstruct = *localtime(&tm_);
@@ -439,10 +439,6 @@ std::string WsjcppCore::formatTimeForWeb(long nTimeInSec) {
     return std::string(buf);
 }
 
-
-
-// ---------------------------------------------------------------------
-
 std::string WsjcppCore::formatTimeForFilename(long nTimeInSec) {
     std::time_t tm_ = long(nTimeInSec);
     // struct tm tstruct = *localtime(&tm_);

src/wsjcpp_core.h

@@ -72,6 +72,7 @@ class WsjcppCore {
 
         static std::string doNormalizePath(const std::string &sPath);
         static std::string extractFilename(const std::string &sPath);
+        static std::string extractDirpath(const std::string &sFullPath);
         static std::string getCurrentDirectory();
 
         static long getCurrentTimeInMilliseconds();

unit-tests.wsjcpp/CMakeLists.txt

@@ -50,6 +50,8 @@ list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_file_permissions
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_string_padding.cpp")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_date_time_format.cpp")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_make_dirs_path.cpp")
+list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_extract_dirpath.cpp")
+list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_extract_filepath.cpp")
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.user-custom.txt)
 

unit-tests.wsjcpp/src/unit_test_extract_dirpath.cpp

@@ -0,0 +1,61 @@
+
+#include <wsjcpp_core.h>
+#include <wsjcpp_unit_tests.h>
+
+// ---------------------------------------------------------------------
+// UnitTestExtractDirpath
+
+class UnitTestExtractDirpath : public WsjcppUnitTestBase {
+    public:
+        UnitTestExtractDirpath();
+        virtual bool doBeforeTest() override;
+        virtual void executeTest() override;
+        virtual bool doAfterTest() override;
+};
+
+REGISTRY_WSJCPP_UNIT_TEST(UnitTestExtractDirpath)
+
+UnitTestExtractDirpath::UnitTestExtractDirpath()
+    : WsjcppUnitTestBase("UnitTestExtractDirpath") {
+}
+
+// ---------------------------------------------------------------------
+
+bool UnitTestExtractDirpath::doBeforeTest() {
+    // do something before test
+    return true;
+}
+
+// ---------------------------------------------------------------------
+
+void UnitTestExtractDirpath::executeTest() {
+    struct LTest {
+        LTest(
+            const std::string &sFullpath,
+            const std::string &sDirpath
+        ) {
+            this->sFullpath = sFullpath;
+            this->sDirpath = sDirpath;
+        };
+        std::string sFullpath;
+        std::string sDirpath;
+    };
+    std::vector<LTest> tests;
+    tests.push_back(LTest(".//../bin/some/../file.txt", ".//../bin/some/.."));
+
+    for (int i = 0; i < tests.size(); i++) {
+        LTest t = tests[i];
+        std::string sTestId = "test" + std::to_string(i);
+        
+        compare(sTestId, WsjcppCore::extractDirpath(t.sFullpath), t.sDirpath);
+    }
+}
+
+// ---------------------------------------------------------------------
+
+bool UnitTestExtractDirpath::doAfterTest() {
+    // do somethig after test
+    return true;
+}
+
+

unit-tests.wsjcpp/src/unit_test_extract_filepath.cpp

@@ -0,0 +1,61 @@
+
+#include <wsjcpp_core.h>
+#include <wsjcpp_unit_tests.h>
+
+// ---------------------------------------------------------------------
+// UnitTestExtractFilepath
+
+class UnitTestExtractFilepath : public WsjcppUnitTestBase {
+    public:
+        UnitTestExtractFilepath();
+        virtual bool doBeforeTest() override;
+        virtual void executeTest() override;
+        virtual bool doAfterTest() override;
+};
+
+REGISTRY_WSJCPP_UNIT_TEST(UnitTestExtractFilepath)
+
+UnitTestExtractFilepath::UnitTestExtractFilepath()
+    : WsjcppUnitTestBase("UnitTestExtractFilepath") {
+}
+
+// ---------------------------------------------------------------------
+
+bool UnitTestExtractFilepath::doBeforeTest() {
+    // do something before test
+    return true;
+}
+
+// ---------------------------------------------------------------------
+
+void UnitTestExtractFilepath::executeTest() {
+    struct LTest {
+        LTest(
+            const std::string &sFullpath,
+            const std::string &sFilename
+        ) {
+            this->sFullpath = sFullpath;
+            this->sFilename = sFilename;
+        };
+        std::string sFullpath;
+        std::string sFilename;
+    };
+    std::vector<LTest> tests;
+    tests.push_back(LTest(".//../bin/some/../file.txt", "file.txt"));
+
+    for (int i = 0; i < tests.size(); i++) {
+        LTest t = tests[i];
+        std::string sTestId = "test" + std::to_string(i);
+        
+        compare(sTestId, WsjcppCore::extractFilename(t.sFullpath), t.sFilename);
+    }
+}
+
+// ---------------------------------------------------------------------
+
+bool UnitTestExtractFilepath::doAfterTest() {
+    // do somethig after test
+    return true;
+}
+
+

wsjcpp.yml

@@ -84,3 +84,7 @@ unit-tests:
       description: ""
     - name: "MakeDirsPath"
       description: ""
+    - name: "ExtractDirpath"
+      description: ""
+    - name: "ExtractFilepath"
+      description: ""