diff --git a/hfs.dproj.local b/hfs.dproj.local index a39cb73..69a829c 100644 --- a/hfs.dproj.local +++ b/hfs.dproj.local @@ -31,11 +31,7 @@ - - - - 2020/05/06 23:30:42.800,=C:\code\mine\hfs\Unit1.pas - 2020/05/06 23:38:14.406,C:\code\mine\hfs\inputDialogs.dfm=C:\code\mine\hfs\Unit1.dfm - 2020/05/06 23:38:14.406,C:\code\mine\hfs\inputDialogs.pas=C:\code\mine\hfs\Unit1.pas + + diff --git a/main.pas b/main.pas index 97ac2a9..f58eee0 100644 --- a/main.pas +++ b/main.pas @@ -2799,6 +2799,19 @@ result:=(filesStayFlaggedForMinutes > 0) and (trunc(abs(now()-t)*24*60) <= filesStayFlaggedForMinutes) end; // isNew +function getFiles(mask:string):TstringList; +var + sr: TSearchRec; +begin +result:=TstringList.create; +result.CaseSensitive:=FALSE; +if findFirst(exePath+'hfs.diff.*.tpl', faAnyFile, sr) = 0 then + try + repeat result.add(sr.name) + until findNext(sr) <> 0; + finally findClose(sr) end; +end; // getFiles + function Tfile.getRecursiveDiffTplAsStr(outInherited:Pboolean=NIL; outFromDisk:Pboolean=NIL):string; var basePath, runPath, s, fn, diff: string; @@ -2816,6 +2829,20 @@ var result:=TRUE; end; // add2diff + procedure loadStar(); + var + list: TstringList; + s: string; + begin + list:=getFiles(exePath+'hfs.diff.*.tpl'); + try + list.sort(); + for s in list do + add2diff(s); + finally list.free + end; + end; + begin result:=''; diff:=''; @@ -2861,6 +2888,7 @@ while assigned(f) do f:=f.parent; first:=FALSE; end; +loadStar(); result:=diff; end; // getRecursiveDiffTplAsStr diff --git a/whatsnew.txt b/whatsnew.txt index f37348e..eee230a 100644 --- a/whatsnew.txt +++ b/whatsnew.txt @@ -18,6 +18,7 @@ propaganda + {.set cfg.} + cache for jquery and template sections + new template commands: base64, base64decode, md5, sha1 ++ hfs.diff.*.tpl in exe's folder - fixed template handling of section names with both '+' and '=' present - fixed LNK files to deleted items - fixed comments files were not updated upon deletion of files @@ -850,7 +851,7 @@ ver: 1.5 rc5 + support for persistent connections (HTTP 1.1) * moved many options to Menu -> "Other options" * when drag&dropping a folder, the dialog for autoupdate is set foreground -- problems with url-encoding for (IE, Opera) +- problems with url-encoding for � � � � � (IE, Opera) - problems saving a template to registry - sometimes "check for update" was not working after a failure - CRITICAL: directory crossing was possible on autoupdating folders @@ -903,7 +904,7 @@ ver: 1.3 beta6 ver: 1.3 beta5 + "Custom ip", now you can use yourowndomain.com - autoupdate folders was not applying the "Folders before" setting -- there were problems with url-encoding for blank-space, and " +- there were problems with url-encoding for blank-space, � and " - some crashes may have been fixed ver: 1.3 beta4