aboutsummaryrefslogtreecommitdiffstats
path: root/unicode/src/base/UCommon.pas
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-07-23 20:36:14 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-07-23 20:36:14 +0000
commit3c999bea6a60e6b58dc8e9a70c08898c4efea906 (patch)
tree87c9ae640e5e2943f0aa6f9ad6297f59997a9d01 /unicode/src/base/UCommon.pas
parent483260f11f03502b20d470c416366844f1199927 (diff)
downloadusdx-3c999bea6a60e6b58dc8e9a70c08898c4efea906.tar.gz
usdx-3c999bea6a60e6b58dc8e9a70c08898c4efea906.tar.xz
usdx-3c999bea6a60e6b58dc8e9a70c08898c4efea906.zip
Buggy DirectoryFindFiles() (used by BrowseTXT/XMLFiles) removed and replaced with TSongs.FindFilesByExtension()
- DirectoryFindFiles() was not applicable as: - it found files that contained the extension anywhere in the file, e.g. file.txt.bak - was not recursive (caller had to explore subdirs himself) - was not correct if ReturnAllSubDirs=false, as it also returned matching directories with IsFile=true and IsDirectory=false git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1912 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'unicode/src/base/UCommon.pas')
-rw-r--r--unicode/src/base/UCommon.pas51
1 files changed, 0 insertions, 51 deletions
diff --git a/unicode/src/base/UCommon.pas b/unicode/src/base/UCommon.pas
index 187c21fb..fa0faf3c 100644
--- a/unicode/src/base/UCommon.pas
+++ b/unicode/src/base/UCommon.pas
@@ -82,17 +82,6 @@ procedure ZeroMemory(Destination: pointer; Length: dword);
function MakeLong(a, b: word): longint;
{$ENDIF}
-type
- TDirectoryEntry = record
- Name: IPath;
- IsDirectory: boolean;
- IsFile: boolean;
- end;
-
- TDirectoryEntryArray = array of TDirectoryEntry;
-
-function DirectoryFindFiles(Dir: IPath; Filter: UTF8String; ReturnAllSubDirs: boolean): TDirectoryEntryArray;
-
// A stable alternative to TList.Sort() (use TList.Sort() if applicable, see below)
procedure MergeSort(List: TList; CompareFunc: TListSortCompare);
@@ -298,46 +287,6 @@ end;
{$ENDIF}
-function DirectoryFindFiles(Dir: IPath; Filter: UTF8String; ReturnAllSubDirs: Boolean): TDirectoryEntryArray;
-var
- i: integer;
- Iter: IFileIterator;
- FileInfo: TFileInfo;
- FileName: IPath;
- Attrib: integer;
-begin
- i := 0;
- Filter := UTF8LowerCase(Filter);
-
- // search for all files and directories
- Iter := FileSystem.FileFind(Dir.Append('*'), faAnyFile);
- while (Iter.HasNext) do
- begin
- FileInfo := Iter.Next;
- FileName := FileInfo.Name;
- if (not FileName.Equals('.')) and (not FileName.Equals('..')) then
- begin
- Attrib := Dir.Append(FileName).GetAttr();
- if ReturnAllSubDirs and ((Attrib and faDirectory) <> 0) then
- begin
- SetLength(Result, i + 1);
- Result[i].Name := FileName;
- Result[i].IsDirectory := true;
- Result[i].IsFile := false;
- i := i + 1;
- end
- else if (Filter = '') or (Pos(Filter, LowerCase(FileName.ToUTF8)) > 0) then
- begin
- SetLength(Result, i + 1);
- Result[i].Name := FileName;
- Result[i].IsDirectory := false;
- Result[i].IsFile := true;
- i := i + 1;
- end;
- end;
- end;
-end;
-
{$IFDEF FPC}
function RandomRange(aMin: integer; aMax: integer): integer;
begin