FileUtil: implement optional parameter DirAttr for FindAllFiles.

git-svn-id: trunk@47144 -
This commit is contained in:
bart 2014-12-08 21:51:43 +00:00
parent c66cfdb9b2
commit f78f0d056d
2 changed files with 6 additions and 5 deletions

View File

@ -955,11 +955,12 @@ begin
end; end;
procedure FindAllFiles(AList: TStrings; const SearchPath: String; procedure FindAllFiles(AList: TStrings; const SearchPath: String;
SearchMask: String; SearchSubDirs: Boolean); SearchMask: String; SearchSubDirs: Boolean; DirAttr: Word);
var var
Searcher: TListFileSearcher; Searcher: TListFileSearcher;
begin begin
Searcher := TListFileSearcher.Create(AList); Searcher := TListFileSearcher.Create(AList);
Searcher.DirectoryAttribute := DirAttr;
try try
Searcher.Search(SearchPath, SearchMask, SearchSubDirs); Searcher.Search(SearchPath, SearchMask, SearchSubDirs);
finally finally
@ -968,10 +969,10 @@ begin
end; end;
function FindAllFiles(const SearchPath: String; SearchMask: String; function FindAllFiles(const SearchPath: String; SearchMask: String;
SearchSubDirs: Boolean): TStringList; SearchSubDirs: Boolean; DirAttr: Word): TStringList;
begin begin
Result := TStringList.Create; Result := TStringList.Create;
FindAllFiles(Result, SearchPath, SearchMask, SearchSubDirs); FindAllFiles(Result, SearchPath, SearchMask, SearchSubDirs, DirAttr);
end; end;
{ TListDirectoriesSearcher } { TListDirectoriesSearcher }

View File

@ -202,9 +202,9 @@ type
end; end;
function FindAllFiles(const SearchPath: String; SearchMask: String = ''; function FindAllFiles(const SearchPath: String; SearchMask: String = '';
SearchSubDirs: Boolean = True): TStringList; overload; SearchSubDirs: Boolean = True; DirAttr: Word = faDirectory): TStringList; overload;
procedure FindAllFiles(AList: TStrings; const SearchPath: String; procedure FindAllFiles(AList: TStrings; const SearchPath: String;
SearchMask: String = ''; SearchSubDirs: Boolean = True); overload; SearchMask: String = ''; SearchSubDirs: Boolean = True; DirAttr: Word = faDirectory); overload;
function FindAllDirectories(const SearchPath: string; function FindAllDirectories(const SearchPath: string;
SearchSubDirs: Boolean = True): TStringList; overload; SearchSubDirs: Boolean = True): TStringList; overload;