Changes for #160 - Pass 1

GBM/Managers/mgrCommon.vb

@@ -300,7 +300,7 @@ Public Class mgrCommon
 
     Public Shared Function CompareValueToArrayRegEx(ByVal sValue As String, ByVal sValues As String()) As Boolean
         For Each se As String In sValues
-            If Regex.IsMatch(sValue, WildcardToRegex(se)) Then
+            If Regex.IsMatch(sValue, Regex.Escape(WildcardToRegex(se))) Then
                 Return True
             End If
         Next
@@ -318,7 +318,7 @@ Public Class mgrCommon
     End Function
 
     'Calculate the current size of a folder
-    Public Shared Function GetFolderSize(ByVal sPath As String, ByVal sInclude As String(), ByVal sExclude As String()) As Long
+    Public Shared Function GetFolderSize(ByVal sPath As String, ByVal sInclude As String(), ByVal sExclude As String(), Optional ByVal b7zStyleRecurse As Boolean = True) As Long
         Dim oFolder As DirectoryInfo
         Dim bInclude As Boolean
         Dim bExclude As Boolean
@@ -351,16 +351,36 @@ Public Class mgrCommon
             'Sub Folders
             For Each di As DirectoryInfo In oFolder.EnumerateDirectories()
                 If Not ((di.Attributes And FileAttributes.ReparsePoint) = FileAttributes.ReparsePoint) Then
-                    If sExclude.Length > 0 Then
-                        bExclude = CompareValueToArrayRegEx(di.Name, sExclude)
+                    If b7zStyleRecurse Then
+                        If sExclude.Length > 0 Then
+                            bExclude = CompareValueToArrayRegEx(di.FullName, sExclude)
+                        Else
+                            bExclude = False
+                        End If
+
+                        If Not bExclude Then
+                            lSize += GetFolderSize(di.FullName, sInclude, sExclude)
+                        End If
                     Else
-                        bExclude = False
-                    End If
-                    If Not bExclude Then
-                        lSize += GetFolderSize(di.FullName, sInclude, sExclude)
+                        If sInclude.Length > 0 Then
+                            bInclude = CompareValueToArrayRegEx(di.FullName, sInclude)
+                        Else
+                            bInclude = True
+                        End If
+
+                        If sExclude.Length > 0 Then
+                            bExclude = CompareValueToArrayRegEx(di.FullName, sExclude)
+                        Else
+                            bExclude = False
+                        End If
+
+                        If bInclude And Not bExclude Then
+                            lSize += GetFolderSize(di.FullName, sInclude, sExclude)
+                        End If
                     End If
                 End If
             Next
+
         Catch
             'Do Nothing
         End Try