* Fixed issue #97: Files and folders together do not start MENU.

Author: end2endzone

CHANGES

@@ -6,6 +6,7 @@ Changes for 0.7.0
 * Deprecated support for 32-bit Windows.
 * Fixed issue #91: String encoding in source code.
 * Fixed issue #96: Problems with Files > 2Gb
+* Fixed issue #97: Files and folders together do not start MENU.
 
 
 Changes for 0.6.1

UserManual.md

@@ -259,11 +259,11 @@ The `class` attribute validates a menu based on type (class) of the selected fil
 
 If `class` attribute is specified, the classes of the files selected by the user must match for the validation to be successful. To specify multiple classes, one must separate each class with the `;` character. If multiple classes are specified, **at least one** class must match for the validation to be successful.
 
-If multiple files are selected, the class of **each file** must match **at least one** allowed classes for the validation to be successful.
+If multiple files are selected, **each file** must match **at least one** allowed class for the validation to be successful.
 
 If `class` attribute is not specified, then the validation is successful.
 
-The `class` attribute supports the following values which are explained in the following table:
+The `class` attribute supported values are explained in the following table:
 
 | Values          | Meaning                                                                                                                                                |
 |-----------------|--------------------------------------------------------------------------------------------------------------------------------------------------------|
@@ -312,9 +312,9 @@ For example, the following set a menu visible only when the user right-click on
 
 The `fileextensions` attribute validates a menu based on the file's extension selected by the user.
 
-If `fileextensions` attribute is specified, the file's extension selected by the user must match for the validation to be successful. To specify multiple file extension, one must separate each extensions with the `;` character. If multiple file extensions are specified, **at least one** extension must match for the validation to be successful.
+If `fileextensions` attribute is specified, the file's extension selected by the user must match for the validation to be successful. To specify multiple file extensions, one must separate each extension with the `;` character. If multiple file extensions are specified, **at least one** extension must match for the validation to be successful.
 
-If multiple files are selected, the file extension of each element must match **at least one** allowed file extension for the validation to be successful.
+If multiple files are selected, ***each file*** must match **at least one** allowed file extension for the validation to be successful.
 
 If `fileextensions` attribute is not specified, then the validation is successful.
 
@@ -333,7 +333,7 @@ The `pattern` attribute validates a menu based on a wildcard pattern matching al
 
 If `pattern` attribute is specified, the files selected by the user must match the wildcard pattern for the validation to be successful. To specify multiple patterns, one must separate each pattern value with the `;` character. If multiple patterns are specified, **at least one** pattern must match for the validation to be successful.
 
-If multiple files are selected, the path of each file must match **at least one** pattern for the validation to be successful.
+If multiple files are selected, ***each file*** must match **at least one** pattern for the validation to be successful.
 
 If `pattern` attribute is not specified, then the validation is successful.
 

include/shellanything/Validator.h

@@ -166,7 +166,8 @@ namespace shellanything
     bool ValidateFileExtensions(const Context & context, const std::string & file_extensions, bool inversed) const;
     bool ValidateExists(const Context & context, const std::string & file_exists, bool inversed) const;
     bool ValidateClass(const Context & context, const std::string & class_, bool inversed) const;
-    bool ValidateClassSingle(const Context & context, const std::string & class_, bool inversed) const;
+    bool ValidateSingleFileMultipleClasses(const std::string & path, const std::string & class_, bool inversed) const;
+    bool ValidateSingleFileSingleClass(const std::string & path, const std::string & class_, bool inversed) const;
     bool ValidatePattern(const Context & context, const std::string & pattern, bool inversed) const;
     bool ValidateExprtk(const Context & context, const std::string & exprtk, bool inversed) const;
 

src/Validator.cpp

@@ -349,11 +349,11 @@ namespace shellanything
     Uppercase(accepted_file_extensions);
 
     //for each file selected
-    const Context::ElementList & elements = context.GetElements();
-    for(size_t i=0; i<elements.size(); i++) 
+    const Context::ElementList & context_elements = context.GetElements();
+    for(size_t i=0; i<context_elements.size(); i++) 
     {
-      const std::string & element = elements[i];
-      std::string current_file_extension = ra::strings::Uppercase(ra::filesystem::GetFileExtention(element));
+      const std::string & path = context_elements[i];
+      std::string current_file_extension = ra::strings::Uppercase(ra::filesystem::GetFileExtention(path));
 
       //each file extension must be part of accepted_file_extensions
       bool found = HasValue(accepted_file_extensions, current_file_extension);
@@ -392,65 +392,46 @@ namespace shellanything
     return true;
   }
 
-  bool Validator::ValidateClassSingle(const Context & context, const std::string & class_, bool inversed) const
+  bool Validator::ValidateSingleFileSingleClass(const std::string & path, const std::string & class_, bool inversed) const
   {
-    if (class_.empty())
-      return true;
-
     PropertyManager & pmgr = PropertyManager::GetInstance();
 
     if (class_ == "file")
     {
-      // Selected elements must be files
-      bool valid = false;
-      valid |= (!inversed && context.GetNumFiles() > 0 && context.GetNumDirectories() == 0);
-      valid |= (inversed && context.GetNumFiles() == 0 && context.GetNumDirectories() > 0);
-      if (!valid)
+      // Selected element must be a file
+      bool is_file = ra::filesystem::FileExistsUtf8(path.c_str());
+      if (!inversed && !is_file)
+        return false;
+      if (inversed && is_file)
         return false;
     }
     else if (class_ == "folder" || class_ == "directory")
     {
-      // Selected elements must be folders
-      bool valid = false;
-      valid |= (!inversed && context.GetNumDirectories() > 0 && context.GetNumFiles() == 0);
-      valid |= (inversed && context.GetNumDirectories() == 0 && context.GetNumFiles() > 0);
-      if (!valid)
+      // Selected elements must be a directory
+      bool is_directory = ra::filesystem::DirectoryExistsUtf8(path.c_str());
+      if (!inversed && !is_directory)
+        return false;
+      if (inversed && is_directory)
         return false;
     }
     else if (class_ == "drive")
     {
       // Selected elements must be mapped to a drive
-      bool valid = true;
-      const Context::ElementList & elements = context.GetElements();
-      for(size_t i=0; i<elements.size() && valid == true; i++)
-      {
-        const std::string & element = elements[i];
-        std::string drive = GetDriveLetter(element);
-        if (!inversed && drive.empty())  // All elements must be mapped to a drive
-          valid = false;
-        if (inversed && !drive.empty())  // All elements must NOT be mapped to a drive.
-          valid = false;
-      }
-      if (!valid)
+      std::string drive = GetDriveLetter(path);
+      if (!inversed && drive.empty())  // All elements must be mapped to a drive
+        return false;
+      if (inversed && !drive.empty())  // All elements must NOT be mapped to a drive.
         return false;
     }
     else if (GetDriveClassFromString(class_.c_str()) != DRIVE_CLASS_UNKNOWN)
     {
       DRIVE_CLASS required_class = GetDriveClassFromString(class_.c_str());
 
       // Selected elements must be of the same drive class
-      bool valid = true;
-      const Context::ElementList & elements = context.GetElements();
-      for(size_t i=0; i<elements.size() && valid == true; i++)
-      {
-        const std::string & element = elements[i];
-        DRIVE_CLASS element_class = GetDriveClassFromPath(element);
-        if (!inversed && element_class != required_class)
-          valid = false;
-        if (inversed && element_class == required_class)
-          valid = false;
-      }
-      if (!valid)
+      DRIVE_CLASS element_class = GetDriveClassFromPath(path);
+      if (!inversed && element_class != required_class)
+        return false;
+      if (inversed && element_class == required_class)
         return false;
     }
     else
@@ -461,6 +442,24 @@ namespace shellanything
     return true;
   }
 
+  bool Validator::ValidateSingleFileMultipleClasses(const std::string & path, const std::string & class_, bool inversed) const
+  {
+    if (class_.empty())
+      return true;
+
+    //split
+    ra::strings::StringVector classes = ra::strings::Split(class_, ";");
+
+    bool valid = false;
+    for (size_t i = 0; i < classes.size(); i++)
+    {
+      const std::string & class_ = classes[i];
+      valid |= ValidateSingleFileSingleClass(path, class_, inversed);
+    }
+
+    return valid;
+  }
+
   bool Validator::ValidateClass(const Context & context, const std::string & class_, bool inversed) const
   {
     if (class_.empty())
@@ -525,14 +524,22 @@ namespace shellanything
     // Continue validation for the remaining class elements
     if (!classes.empty())
     {
-      bool valid = false;
-      for(size_t i=0; i<classes.size(); i++)
+      //join remaining classes into a single string
+      std::string classes_str = ra::strings::Join(classes, ";");
+
+      //for each file selected
+      const Context::ElementList & context_elements = context.GetElements();
+      for (size_t i = 0; i < context_elements.size(); i++)
       {
-        const std::string & element = classes[i];
-        valid |= ValidateClassSingle(context, element, inversed);
+        const std::string & path = context_elements[i];
+
+        //each element must match one of the classes
+        bool valid = ValidateSingleFileMultipleClasses(path, classes_str, inversed);
+        if (!inversed && !valid)
+          return false; //current file extension is not accepted
+        if (inversed && valid)
+          return false; //current file extension is not accepted
       }
-      if (!valid)
-        return false;
     }
 
     return true;
@@ -562,14 +569,14 @@ namespace shellanything
     Uppercase(patterns);
 
     //for each file selected
-    const Context::ElementList & elements = context.GetElements();
-    for(size_t i=0; i<elements.size(); i++) 
+    const Context::ElementList & context_elements = context.GetElements();
+    for(size_t i=0; i<context_elements.size(); i++) 
     {
-      const std::string & element = elements[i];
-      std::string element_uppercase = ra::strings::Uppercase(element);
+      const std::string & path = context_elements[i];
+      std::string path_uppercase = ra::strings::Uppercase(path);
 
       //each element must match one of the patterns
-      bool match = WildcardMatch(patterns, element_uppercase.c_str());
+      bool match = WildcardMatch(patterns, path_uppercase.c_str());
       if (!inversed && !match)
         return false; //current file does not match any patterns
       if (inversed && match)

test/TestValidator.cpp

@@ -302,6 +302,7 @@ namespace shellanything { namespace test
     ASSERT_FALSE( v.Validate(c) );
 
     //assert 'at least one' class must match
+    //If multiple classes are specified, at least one class must match for the validation to be successful.
     v.SetClass("folder;drive:network;drive:fixed"); // folder and drive:network fails but drive:fixed matches
     ASSERT_TRUE( v.Validate(c) );
 
@@ -361,6 +362,23 @@ namespace shellanything { namespace test
     v.SetClass("drive:network");
     ASSERT_TRUE( v.Validate(c) );
 
+    //Set a mix of files and folders (issue #97, issue97)
+    //If multiple files are selected, the class of each file must match at least one allowed classes for the validation to be successful.
+#ifdef _WIN32
+    {
+      Context::ElementList elements;
+      elements.push_back("C:\\Windows\\System32");
+      elements.push_back("C:\\Windows\\notepad.exe");
+      c.SetElements(elements);
+    }
+#else
+    //TODO: complete with known path to files
+#endif
+
+    //assert success when using 'file' or 'folder'
+    v.SetClass("file;directory");
+    ASSERT_TRUE(v.Validate(c));
+
   }
   //--------------------------------------------------------------------------------------------------
   TEST_F(TestValidator, testPattern)