Changeset 75 for trunk/Packages/Common/FindFile.pas

Timestamp:

Jun 4, 2024, 12:22:49 AM (5 months ago)

Author:

chronos

Message:

• Modified: Removed U prefix from unit names.
• Modified: Updated Common package.

File:

• trunk/Packages/Common/FindFile.pas (moved) (moved from trunk/Packages/Common/UFindFile.pas ) (8 diffs)

trunk/Packages/Common/FindFile.pas

@@ -19 +19 @@
 }
 
-unit UFindFile;
+unit FindFile;
 
 interface
 
 uses
-  SysUtils, Classes, Graphics, Controls, Forms, Dialogs, FileCtrl;
+  SysUtils, Classes, Graphics, Controls, Forms, Dialogs;
 
 type
@@ -35 +35 @@
   private
     s : TStringList;
-
     fSubFolder : boolean;
     fAttr: TFileAttrib;
     fPath : string;
     fFileMask : string;
-
     procedure SetPath(Value: string);
     procedure FileSearch(const inPath : string);
@@ -46 +44 @@
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
-
     function SearchForFiles: TStringList;
   published
@@ -55 +52 @@
   end;
 
+const
+{$IFDEF WINDOWS}
+  FilterAll = '*.*';
+{$ENDIF}
+{$IFDEF UNIX}
+  FilterAll = '*';
+{$ENDIF}
+
 procedure Register;
+
 
 implementation
@@ -71 +77 @@
   inherited Create(AOwner);
   Path := IncludeTrailingBackslash(UTF8Encode(GetCurrentDir));
-  FileMask := '*.*';
+  FileMask := FilterAll;
   FileAttr := [ffaAnyFile];
   s := TStringList.Create;
@@ -79 +85 @@
 begin
   s.Free;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -109 +115 @@
   Attr := 0;
   if ffaReadOnly in FileAttr then Attr := Attr + faReadOnly;
-  if ffaHidden in FileAttr then Attr := Attr + faHidden;
-  if ffaSysFile in FileAttr then Attr := Attr + faSysFile;
-  if ffaVolumeID in FileAttr then Attr := Attr + faVolumeID;
+  if ffaHidden in FileAttr then Attr := Attr + 2; //faHidden; use constant to avoid platform warning
+  if ffaSysFile in FileAttr then Attr := Attr + 4; //faSysFile; use constant to avoid platform warning
+  // Deprecated: if ffaVolumeID in FileAttr then Attr := Attr + faVolumeID;
   if ffaDirectory in FileAttr then Attr := Attr + faDirectory;
   if ffaArchive in FileAttr then Attr := Attr + faArchive;
   if ffaAnyFile in FileAttr then Attr := Attr + faAnyFile;
 
-  if SysUtils.FindFirst(UTF8Decode(inPath + FileMask), Attr, Rec) = 0 then
+  if SysUtils.FindFirst(inPath + FileMask, Attr, Rec) = 0 then
   try
     repeat
-      s.Add(inPath + UTF8Encode(Rec.Name));
+      s.Add(inPath + Rec.Name);
     until SysUtils.FindNext(Rec) <> 0;
   finally
@@ -127 +133 @@
   If not InSubFolders then Exit;
 
-  if SysUtils.FindFirst(UTF8Decode(inPath + '*.*'), faDirectory, Rec) = 0 then
+  if SysUtils.FindFirst(inPath + FilterAll, faDirectory, Rec) = 0 then
   try
     repeat
       if ((Rec.Attr and faDirectory) > 0) and (Rec.Name <> '.')
       and (Rec.Name <> '..') then
-        FileSearch(IncludeTrailingBackslash(inPath + UTF8Encode(Rec.Name)));
+        FileSearch(IncludeTrailingBackslash(inPath + Rec.Name));
     until SysUtils.FindNext(Rec) <> 0;
   finally
     SysUtils.FindClose(Rec);
   end;
-end; 
+end;
 
 end.
-