Changeset 520 for Common/UCommon.pas

Timestamp:

Mar 7, 2019, 4:34:53 PM (6 years ago)

Author:

chronos

Message:

• Modified: Removed dependency on TemplateGenerics and used fgl unit as replacement.

File:

• Common/UCommon.pas (modified) (7 diffs)

Common/UCommon.pas

@@ -28 +28 @@
     unfDNSDomainName = 11);
 
-  TFilterMethodMethod = function (FileName: string): Boolean of object;
+  TFilterMethod = function (FileName: string): Boolean of object;
+  TFileNameMethod = procedure (FileName: string) of object;
+
 var
   ExceptionHandler: TExceptionEvent;
@@ -74 +76 @@
 procedure SaveStringToFile(S, FileName: string);
 procedure SearchFiles(AList: TStrings; Dir: string;
-  FilterMethod: TFilterMethodMethod = nil);
+  FilterMethod: TFilterMethod = nil; FileNameMethod: TFileNameMethod = nil);
 function GetStringPart(var Text: string; Separator: string): string;
 function StripTags(const S: string): string;
@@ -81 +83 @@
 function PosFromIndexReverse(SubStr: string; Text: string;
   StartIndex: Integer): Integer;
+procedure CopyStringArray(Dest: TStringArray; Source: array of string);
 
 
@@ -108 +111 @@
   I: Integer;
 begin
+  Result := '';
   for I := 1 to Length(Source) do begin
     Result := Result + LowerCase(IntToHex(Ord(Source[I]), 2));
@@ -543 +547 @@
 
 procedure SearchFiles(AList: TStrings; Dir: string;
-  FilterMethod: TFilterMethodMethod = nil);
+  FilterMethod: TFilterMethod = nil; FileNameMethod: TFileNameMethod = nil);
 var
   SR: TSearchRec;
@@ -553 +557 @@
         if (SR.Name = '.') or (SR.Name = '..') or (Assigned(FilterMethod) and (not FilterMethod(SR.Name) or
           not FilterMethod(Copy(Dir, 3, Length(Dir)) + SR.Name))) then Continue;
+        if Assigned(FileNameMethod) then
+          FileNameMethod(Dir + SR.Name);
         AList.Add(Dir + SR.Name);
         if (SR.Attr and faDirectory) <> 0 then
@@ -654 +660 @@
 end;
 
+procedure CopyStringArray(Dest: TStringArray; Source: array of string);
+var
+  I: Integer;
+begin
+  SetLength(Dest, Length(Source));
+  for I := 0 to Length(Dest) - 1 do
+    Dest[I] := Source[I];
+end;
+
 
 initialization