Implemented new properties selection.dir.count and selection.dir.empty for issue #90.

Author: end2endzone

src/Context.cpp

@@ -75,6 +75,8 @@ namespace shellanything
 
     std::string selection_path           ;
     std::string selection_dir            ;
+    std::string selection_dir_count      ;
+    std::string selection_dir_empty      ;
     std::string selection_parent_path    ;
     std::string selection_parent_filename;
     std::string selection_filename       ;
@@ -109,7 +111,7 @@ namespace shellanything
       //${selection.filename_noext} is selection.filename without file extension
       //${selection.filename.extension} is the file extension of the clicked element.
 
-      //build properties for this specific element
+      // Build properties for this specific element
       std::string element_selection_path            = element;
       std::string element_selection_dir             = isFile ? ra::filesystem::GetParentPath(element_selection_path) : element;
       std::string element_selection_parent_path     = ra::filesystem::GetParentPath(element_selection_path);
@@ -155,8 +157,27 @@ namespace shellanything
       selection_charset        .append( element_selection_charset         );
     }
 
+    // Directory based properties
+    if (elements.size() == 1)
+    {
+      const std::string & element = elements[0];
+      bool isDir = ra::filesystem::DirectoryExistsUtf8(element.c_str());
+      if (isDir)
+      {
+        ra::strings::StringVector files;
+        bool files_found = ra::filesystem::FindFilesUtf8(files, element.c_str(), 0);
+        if (files_found)
+        {
+          selection_dir_count = ra::strings::ToString(files.size());
+          selection_dir_empty = (files.size() == 0 ? "true" : "false");
+        }
+      }
+    }
+
     pmgr.SetProperty("selection.path"               , selection_path           );
     pmgr.SetProperty("selection.dir"                , selection_dir            );
+    pmgr.SetProperty("selection.dir.count"          , selection_dir_count      );
+    pmgr.SetProperty("selection.dir.empty"          , selection_dir_empty      );
     pmgr.SetProperty("selection.parent.path"        , selection_parent_path    );
     pmgr.SetProperty("selection.parent.filename"    , selection_parent_filename);
     pmgr.SetProperty("selection.filename"           , selection_filename       );

test/TestContext.cpp

@@ -26,6 +26,8 @@
 #include "shellanything/Context.h"
 #include "PropertyManager.h"
 #include "rapidassist/process.h"
+#include "rapidassist/filesystem.h"
+#include "rapidassist/testing.h"
 
 namespace shellanything { namespace test
 {
@@ -217,6 +219,76 @@ namespace shellanything { namespace test
     context.UnregisterProperties();
   }
   //--------------------------------------------------------------------------------------------------
+  TEST_F(TestContext, testRegisterPropertiesSingleDirectory)
+  {
+    PropertyManager & pmgr = PropertyManager::GetInstance();
+   
+    Context context;
+#ifdef _WIN32
+    {
+      Context::ElementList elements;
+      elements.push_back("C:\\" );
+      context.SetElements(elements);
+    }
+#else
+    //TODO: complete with known path to files
+#endif
+ 
+    ASSERT_FALSE( pmgr.HasProperty("selection.dir.count") );
+    ASSERT_FALSE( pmgr.HasProperty("selection.dir.empty") );
+ 
+    //act
+    context.RegisterProperties();
+ 
+    //assert
+    ASSERT_TRUE( pmgr.HasProperty("selection.dir.count") );
+    ASSERT_TRUE( pmgr.HasProperty("selection.dir.empty") );
+ 
+    std::string selection_dir_count = pmgr.Expand("${selection.dir.count}");
+    std::string selection_dir_empty = pmgr.Expand("${selection.dir.empty}");
+ 
+    ASSERT_TRUE(ra::strings::IsNumeric(selection_dir_count.c_str()));
+    ASSERT_EQ( std::string("false"), selection_dir_empty);
+
+    context.UnregisterProperties();
+  }
+  //--------------------------------------------------------------------------------------------------
+  TEST_F(TestContext, testRegisterPropertiesEmptyDirectory)
+  {
+    PropertyManager & pmgr = PropertyManager::GetInstance();
+   
+    //create an empty directory
+    std::string temp_dir = ra::filesystem::GetTemporaryDirectory();
+    std::string empty_dir = temp_dir + ra::testing::GetTestQualifiedName();
+    ASSERT_TRUE(ra::filesystem::CreateDirectory(empty_dir.c_str()));
+
+    Context context;
+    Context::ElementList elements;
+    elements.push_back(empty_dir);
+    context.SetElements(elements);
+ 
+    ASSERT_FALSE( pmgr.HasProperty("selection.dir.count") );
+    ASSERT_FALSE( pmgr.HasProperty("selection.dir.empty") );
+ 
+    //act
+    context.RegisterProperties();
+ 
+    //assert
+    ASSERT_TRUE( pmgr.HasProperty("selection.dir.count") );
+    ASSERT_TRUE( pmgr.HasProperty("selection.dir.empty") );
+ 
+    std::string selection_dir_count = pmgr.Expand("${selection.dir.count}");
+    std::string selection_dir_empty = pmgr.Expand("${selection.dir.empty}");
+ 
+    ASSERT_EQ( std::string("0"), selection_dir_count);
+    ASSERT_EQ( std::string("true"), selection_dir_empty);
+
+    context.UnregisterProperties();
+
+    //cleanup
+    ra::filesystem::DeleteDirectory(empty_dir.c_str());
+  }
+  //--------------------------------------------------------------------------------------------------
   TEST_F(TestContext, testRegisterPropertiesMultipleFiles)
   {
     PropertyManager & pmgr = PropertyManager::GetInstance();