[fix] Added missing FindClose, [+] SubdirectoryCount

jackdp · Aug 14, 2020 · a20c063 · a20c063
1 parent aceca00
commit a20c063
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/Base/JPL.Files.pas b/Base/JPL.Files.pas
@@ -117,6 +117,7 @@ function GetUniqueFileName(Prefix: string = ''; Len: BYTE = 10; Ext: string = ''
 
 function GetFiles(const Directory: string; SearchPattern: string = '*'; RecurseDepth: Word = 0): TStringDynArray;
 function GetDirectories(const Directory: string; SearchPattern: string = '*'; RecurseDepth: Word = 0): TStringDynArray;
+function SubdirectoryCount(const Directory: string; SearchPattern: string = '*'; RecurseDepth: Word = 0): integer;
 
 
 implementation
@@ -162,6 +163,11 @@ function GetDirectories(const Directory: string; SearchPattern: string = '*'; Re
   end;
 end;
 
+function SubdirectoryCount(const Directory: string; SearchPattern: string = '*'; RecurseDepth: Word = 0): integer;
+begin
+  Result := Length(GetDirectories(Directory, SearchPattern, RecurseDepth));
+end;
+
 function GetIncFileName(const fName: string; NumPrefix: string = '_'; xpad: integer = 3): string;
 var
   i: integer;
@@ -319,6 +325,7 @@ function FileGetCreationTime(const FileName: string): TDateTime;
     FileTimeToLocalFileTime(SearchRec.FindData.ftCreationTime, FileTime);
     FileTimeToSystemTime(FileTime, SysTime);
     Result := SystemTimeToDateTime(SysTime);
+    SysUtils.FindClose(SearchRec);
   end
   else Result := 0;
 end;
@@ -343,6 +350,7 @@ function FileGetTimes(const FileName: string; out CreationTime, LastAccessTime,
     FileTimeToSystemTime(FileTime, SysTime);
     LastWriteTime := SystemTimeToDateTime(SysTime);
 
+    SysUtils.FindClose(SearchRec);
     Result := True;
   end
   else Result := False;