Changeset 38 for trunk/Packages/Common/UCommon.pas

Timestamp:

May 10, 2018, 9:39:53 AM (7 years ago)

Author:

chronos

Message:

• Modified: Updated Common package.

File:

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

trunk/Packages/Common/UCommon.pas

@@ -28 +28 @@
     unfDNSDomainName = 11);
 
+  TFilterMethodMethod = function (FileName: string): Boolean of object;
 var
   ExceptionHandler: TExceptionEvent;
@@ -63 +64 @@
 procedure OpenWebPage(URL: string);
 procedure OpenFileInShell(FileName: string);
-procedure ExecuteProgram(CommandLine: string);
+procedure ExecuteProgram(Executable: string; Parameters: array of string);
 procedure FreeThenNil(var Obj);
 function RemoveQuotes(Text: string): string;
@@ -71 +72 @@
 function MergeArray(A, B: array of string): TArrayOfString;
 function LoadFileToStr(const FileName: TFileName): AnsiString;
+procedure SearchFiles(AList: TStrings; Dir: string;
+  FilterMethod: TFilterMethodMethod);
+function GetStringPart(var Text: string; Separator: string): string;
 
 
@@ -112 +116 @@
   Path := IncludeTrailingPathDelimiter(APath);
 
-  Find := FindFirst(UTF8Decode(Path + AFileSpec), faAnyFile xor faDirectory, SearchRec);
+  Find := FindFirst(Path + AFileSpec, faAnyFile xor faDirectory, SearchRec);
   while Find = 0 do begin
-    DeleteFile(Path + UTF8Encode(SearchRec.Name));
+    DeleteFile(Path + SearchRec.Name);
 
     Find := SysUtils.FindNext(SearchRec);
@@ -429 +433 @@
 end;
 
-procedure ExecuteProgram(CommandLine: string);
+procedure ExecuteProgram(Executable: string; Parameters: array of string);
 var
   Process: TProcess;
+  I: Integer;
 begin
   try
     Process := TProcess.Create(nil);
-    Process.CommandLine := CommandLine;
+    Process.Executable := Executable;
+    for I := 0 to Length(Parameters) - 1 do
+      Process.Parameters.Add(Parameters[I]);
     Process.Options := [poNoConsole];
     Process.Execute;
@@ -456 +463 @@
 procedure OpenFileInShell(FileName: string);
 begin
-  ExecuteProgram('cmd.exe /c start "' + FileName + '"');
+  ExecuteProgram('cmd.exe', ['/c', 'start', FileName]);
 end;
 
@@ -511 +518 @@
 end;
 
+function DefaultSearchFilter(const FileName: string): Boolean;
+begin
+  Result := True;
+end;
+
+procedure SearchFiles(AList: TStrings; Dir: string;
+  FilterMethod: TFilterMethodMethod);
+var
+  SR: TSearchRec;
+begin
+  Dir := IncludeTrailingPathDelimiter(Dir);
+  if FindFirst(Dir + '*', faAnyFile, SR) = 0 then
+    try
+      repeat
+        if (SR.Name = '.') or (SR.Name = '..') or not FilterMethod(SR.Name) or
+          not FilterMethod(Copy(Dir, 3, Length(Dir)) + SR.Name) then Continue;
+        AList.Add(Dir + SR.Name);
+        if (SR.Attr and faDirectory) <> 0 then
+          SearchFiles(AList, Dir + SR.Name, FilterMethod);
+      until FindNext(SR) <> 0;
+    finally
+      FindClose(SR);
+    end;
+end;
+
+function GetStringPart(var Text: string; Separator: string): string;
+var
+  P: Integer;
+begin
+  P := Pos(Separator, Text);
+  if P > 0 then begin
+    Result := Copy(Text, 1, P - 1);
+    Delete(Text, 1, P - 1 + Length(Separator));
+  end else begin
+    Result := Text;
+    Text := '';
+  end;
+  Result := Trim(Result);
+  Text := Trim(Text);
+end;
+