Moved Validator::GetDriveLetter() and Validator::GetDrivePath() to DriveClass.h.

Author: end2endzone

include/shellanything/Validator.h

@@ -135,24 +135,6 @@ namespace shellanything
     /// <returns>Returns true if the given context is valid against the set of constraints. Returns false otherwise.</returns>
     bool Validate(const Context & iContext) const;
 
-  public:
-
-    /// <summary>
-    /// Returns the drive letter of the given path.
-    /// Returns an empty string if the element is not mapped to a drive.
-    /// </summary>
-    /// <param name="element">The path to an element.</param>
-    /// <returns>Returns the drive letter of the given path. Returns an empty string if the element is not mapped to a drive.</returns>
-    static std::string GetDriveLetter(const std::string & element);
-
-    /// <summary>
-    /// Returns the drive path of the given path. The drive path is returned as 3 characters path. For example "C:\".
-    /// Returns an empty string if the element is not mapped to a drive.
-    /// </summary>
-    /// <param name="element">The path to an element.</param>
-    /// <returns>Returns the drive path of the given path. Returns an empty string if the element is not mapped to a drive.</returns>
-    static std::string GetDrivePath(const std::string & element);
-
   private:
     bool ValidateProperties(const Context & context, const std::string & properties, bool inversed) const;
     bool ValidateFileExtensions(const Context & context, const std::string & file_extensions, bool inversed) const;

src/Context.cpp

@@ -25,6 +25,7 @@
 #include "shellanything/Context.h"
 #include "shellanything/Validator.h"
 #include "PropertyManager.h"
+#include "DriveClass.h"
 
 #include "rapidassist/filesystem_utf8.h"
 #include "rapidassist/environment_utf8.h"
@@ -100,8 +101,8 @@ namespace shellanything
       std::string element_selection_filename        = ra::filesystem::GetFilename(element_selection_path.c_str());
       std::string element_selection_filename_noext  = ra::filesystem::GetFilenameWithoutExtension(element_selection_path.c_str());
       std::string element_selection_filename_ext    = ra::filesystem::GetFileExtention(element_selection_filename);
-      std::string element_selection_drive_letter    = Validator::GetDriveLetter(element);
-      std::string element_selection_drive_path      = Validator::GetDrivePath(element);
+      std::string element_selection_drive_letter    = GetDriveLetter(element);
+      std::string element_selection_drive_path      = GetDrivePath(element);
 
       // Add a separator between values
       if (!selection_path           .empty()) selection_path            .append( selection_multi_separator );

src/DriveClass.cpp

@@ -30,6 +30,30 @@
 namespace shellanything
 {
 
+  inline bool IsDriveLetter(char c)
+  {
+    if (  (c >= 'a' && c <= 'z') ||
+          (c >= 'A' && c <= 'Z')    )
+      return true;
+    return false;
+  }
+
+  std::string GetDriveLetter(const std::string & element)
+  {
+    std::string letter;
+    if (element.size() >= 2 && element[1] == ':' && IsDriveLetter(element[0]))
+      letter.append(1, element[0]);
+    return letter;
+  }
+
+  std::string GetDrivePath(const std::string & element)
+  {
+    std::string letter;
+    if (element.size() >= 3 && element[1] == ':' && IsDriveLetter(element[0]) && element[2] == '\\')
+      letter.append(element.c_str(), 3);
+    return letter;
+  }
+
   bool IsNetworkPath(const std::string & path)
   {
     if (path.size() >= 2 && path.substr(0, 2) == "\\\\")
@@ -73,7 +97,7 @@ namespace shellanything
         // The functions returns DRIVE_NO_ROOT_DIR even if the drive letter, of the given non-existing path, is a CD-ROM or DVD-Drive.
         // However, the function will return DRIVE_CDROM is the root path of the same path is used, even if there are no disk in the optical drive.
         // To work around these issues, try to resolve with the root path of the drive.
-        std::string root_path = Validator::GetDrivePath(path);
+        std::string root_path = GetDrivePath(path);
         if (root_path.empty() || // We may be dealing with a network path
             root_path == path  ) // We are already using a root drive path
         {

src/DriveClass.h

@@ -40,6 +40,22 @@ namespace shellanything
     DRIVE_CLASS_RAMDISK
   };
 
+  /// <summary>
+  /// Returns the drive letter of the given path.
+  /// Returns an empty string if the element is not mapped to a drive.
+  /// </summary>
+  /// <param name="element">The path to an element.</param>
+  /// <returns>Returns the drive letter of the given path. Returns an empty string if the element is not mapped to a drive.</returns>
+  std::string GetDriveLetter(const std::string & element);
+
+  /// <summary>
+  /// Returns the drive path of the given path. The drive path is returned as 3 characters path. For example "C:\".
+  /// Returns an empty string if the element is not mapped to a drive.
+  /// </summary>
+  /// <param name="element">The path to an element.</param>
+  /// <returns>Returns the drive path of the given path. Returns an empty string if the element is not mapped to a drive.</returns>
+  std::string GetDrivePath(const std::string & element);
+
   /// <summary>
   /// Define if the given path is a network path.
   /// The given path do not need to exist to be identified as a network path.

src/Validator.cpp

@@ -272,30 +272,6 @@ namespace shellanything
     return true;
   }
 
-  inline bool IsDriveLetter(char c)
-  {
-    if (  (c >= 'a' && c <= 'z') ||
-          (c >= 'A' && c <= 'Z')    )
-      return true;
-    return false;
-  }
-
-  std::string Validator::GetDriveLetter(const std::string & element)
-  {
-    std::string letter;
-    if (element.size() >= 2 && element[1] == ':' && IsDriveLetter(element[0]))
-      letter.append(1, element[0]);
-    return letter;
-  }
-
-  std::string Validator::GetDrivePath(const std::string & element)
-  {
-    std::string letter;
-    if (element.size() >= 3 && element[1] == ':' && IsDriveLetter(element[0]) && element[2] == '\\')
-      letter.append(element.c_str(), 3);
-    return letter;
-  }
-
   bool Validator::ValidateProperties(const Context & context, const std::string & properties, bool inversed) const
   {
     if (properties.empty())