Changeset 97 for trunk/NewView/FileUtilsUnit.pas

Timestamp:

Mar 17, 2007, 9:47:54 PM (18 years ago)

Author:

RBRi

Message:

file util fix for the last refactoring

File:

• trunk/NewView/FileUtilsUnit.pas (modified) (10 diffs)

trunk/NewView/FileUtilsUnit.pas

@@ -55 +55 @@
 
   // Breaks up specified Env var path
+  // this always clears the list at the beginning
   Procedure GetDirsInPath(const aPathEnvVar: String; var aList: TStrings);
 
@@ -60 +61 @@
   // them to aList
   // it is possible to define different filter if you separate them by semicolon
-  Procedure ListFilesInDirectory(const aDirectory: String; const aFilter: String; var aList: TStrings);
+  Procedure ListFilesInDirectory(       const aDirectory : String;
+                                        const aFilter : String;
+                                        const aWithDirectoryFlag : boolean;
+                                        var aList : TStrings);
 
   // searches for all directories in aDirectory and add them to aList
@@ -67 +71 @@
   Procedure ListFilesInDirectoryRecursiveWithTermination(const aDirectory : String;
                                                          const aFilter : String;
+                                                         const aWithDirectoryFlag : boolean;
                                                          var aList : TStrings;
                                                          const aTerminateCheck : TTerminateCheck;
@@ -352 +357 @@
 
 
-  Procedure ListFilesInDirectory(const aDirectory: String; const aFilter: String; var aList: TStrings);
+  Procedure ListFilesInDirectory(       const aDirectory: String;
+                                        const aFilter: String;
+                                        const aWithDirectoryFlag: boolean;
+                                        var aList: TStrings);
   var
     tmpRC : APIRET;
@@ -358 +366 @@
     tmpMask: String;
     tmpFilterParts : TStringList;
+    tmpDirectory : String;
     i : integer;
   begin
@@ -366 +375 @@
     begin
       tmpMask := tmpFilterParts[i];
-      tmpRC := FindFirst(AddDirectorySeparator(aDirectory) + tmpMask, faAnyFile, tmpSearchResults);
+      tmpDirectory := AddDirectorySeparator(aDirectory);
+      tmpRC := FindFirst(tmpDirectory + tmpMask, faAnyFile, tmpSearchResults);
 
       while tmpRC = 0 do
@@ -372 +382 @@
         if tmpSearchResults.Attr And faDirectory = 0 then
         begin
-          aList.Add(tmpSearchResults.Name);
+          if (aWithDirectoryFlag) then
+          begin
+            aList.Add(tmpDirectory + tmpSearchResults.Name);
+          end
+          else
+          begin
+            aList.Add(tmpSearchResults.Name);
+          end;
         end;
 
@@ -412 +429 @@
   Procedure ListFilesInDirectoryRecursiveWithTermination(const aDirectory : String;
                                                          const aFilter : String;
+                                                         const aWithDirectoryFlag : boolean;
                                                          var aList : TStrings;
                                                          const aTerminateCheck : TTerminateCheck;
@@ -421 +439 @@
   begin
     // at first add all files from the directory itself
-    ListFilesInDirectory(aDirectory, aFilter, aList);
+    ListFilesInDirectory(aDirectory, aFilter, aWithDirectoryFlag, aList);
 
     // now determine all subdirectories
@@ -436 +454 @@
       tmpSubDirectory := tmpSubDirectories[i];
 
-      ListFilesInDirectoryRecursiveWithTermination(tmpSubDirectory, aFilter, aList, aTerminateCheck, aUseTerminateCheck);
+      ListFilesInDirectoryRecursiveWithTermination(tmpSubDirectory, aFilter, aWithDirectoryFlag, aList, aTerminateCheck, aUseTerminateCheck);
     end;
     tmpSubDirectories.Destroy;