Changeset 238 for trunk/Library/FileUtilsUnit.pas

Timestamp:

Sep 16, 2007, 9:44:46 AM (18 years ago)

Author:

RBRi

Message:

improved directory flag handling (see #31)

File:

• trunk/Library/FileUtilsUnit.pas (modified) (7 diffs)

trunk/Library/FileUtilsUnit.pas

@@ -94 +94 @@
 
   // searches for all directories in aDirectory and add them to aList
-  Procedure ListSubDirectories(const aDirectory: String; var aList: TStrings);
+  Procedure ListSubDirectories(const aDirectory: String; const anIncludeSystemAndHiddenFlag: boolean; var aList: TStrings);
 
   Procedure ListFilesInDirectoryRecursiveWithTermination(const aDirectory : String;
                                                          const aFilter : String;
                                                          const aWithDirectoryFlag : boolean;
+                                                         const anIncludeSystemAndHiddenFlag: boolean;
                                                          var aList : TStrings;
                                                          const aTerminateCheck : TTerminateCheck;
@@ -112 +113 @@
 
 
-
+  // Checks if a directory exists
   Function DirectoryExists(const aDirectory : String) : boolean;
 
@@ -502 +503 @@
 
 
-  Procedure ListSubDirectories(const aDirectory: String; var aList: TStrings);
+  Procedure ListSubDirectories(const aDirectory: String; const anIncludeSystemAndHiddenFlag: boolean; var aList: TStrings);
   var
     tmpRC : APIRET;
     tmpSearchResults: TSearchRec;
     tmpName : String;
-  begin
-
-    tmpRC := FindFirst(AddDirectorySeparator(aDirectory) + '*', faDirectory or faMustDirectory, tmpSearchResults);
+    tmpFileAttributes : ULONG;
+  begin
+
+    if anIncludeSystemAndHiddenFlag then
+    begin
+      tmpFileAttributes := faArchive or faReadonly or faHidden or faSysFile or faDirectory or faMustDirectory;
+    end
+    else
+    begin
+      tmpFileAttributes := faArchive or faReadonly or faDirectory or faMustDirectory;
+    end;
+
+    tmpRC := FindFirst(AddDirectorySeparator(aDirectory) + '*', tmpFileAttributes, tmpSearchResults);
     if (tmpRC <> 0) then
     begin
@@ -531 +542 @@
                                                          const aFilter : String;
                                                          const aWithDirectoryFlag : boolean;
+                                                         const anIncludeSystemAndHiddenFlag: boolean;
                                                          var aList : TStrings;
                                                          const aTerminateCheck : TTerminateCheck;
@@ -544 +556 @@
     // now determine all subdirectories
     tmpSubDirectories := TStringList.Create;
-    ListSubDirectories(aDirectory, tmpSubDirectories);
+    ListSubDirectories(aDirectory, anIncludeSystemAndHiddenFlag, tmpSubDirectories);
 
     for i := 0 to tmpSubDirectories.Count - 1 do
@@ -555 +567 @@
       tmpSubDirectory := tmpSubDirectories[i];
 
-      ListFilesInDirectoryRecursiveWithTermination(tmpSubDirectory, aFilter, aWithDirectoryFlag, aList, aTerminateCheck, aUseTerminateCheck);
+      ListFilesInDirectoryRecursiveWithTermination(     tmpSubDirectory,
+                                                        aFilter,
+                                                        aWithDirectoryFlag,
+                                                        anIncludeSystemAndHiddenFlag,
+                                                        aList,
+                                                        aTerminateCheck,
+                                                        aUseTerminateCheck);
     end;
     tmpSubDirectories.Destroy;
@@ -653 +671 @@
     end;
 
-    tmpRC := FindFirst(tmpDirectory, faDirectory or faMustDirectory, tmpSearchResults);
+    tmpRC := FindFirst( tmpDirectory,
+                        faArchive or faReadonly or faHidden or faSysFile or faDirectory or faMustDirectory,
+                        tmpSearchResults);
     if tmpRC = 0 then
     begin