EKeyfinder v0.1 Beta 3 release

Finished implementing software update feature.

git-svn-id: svn://svn.code.sf.net/p/ekeyfinder/code/trunk@32 b14f650f-2e60-4330-827c-04cc947f8aee

Author: samrocketman

Main.dfm

@@ -2,7 +2,7 @@ object Form1: TForm1
   Left = 0
   Top = 0
   Caption = 'Enchanted Keyfinder v'
-  ClientHeight = 661
+  ClientHeight = 681
   ClientWidth = 632
   Color = clWhite
   TransparentColorValue = clFuchsia
@@ -27,15 +27,15 @@ object Form1: TForm1
     Left = 230
     Top = 0
     Width = 2
-    Height = 642
+    Height = 662
     ExplicitLeft = 241
     ExplicitHeight = 250
   end
   object ListBox1: TListBox
     Left = 0
     Top = 0
     Width = 230
-    Height = 642
+    Height = 662
     Align = alLeft
     BiDiMode = bdLeftToRight
     Constraints.MinWidth = 100
@@ -54,12 +54,13 @@ object Form1: TForm1
     ShowHint = False
     TabOrder = 0
     OnClick = ListBox1Click
+    ExplicitHeight = 642
   end
   object Memo1: TMemo
     Left = 232
     Top = 0
     Width = 400
-    Height = 642
+    Height = 662
     Align = alClient
     Constraints.MinHeight = 100
     Constraints.MinWidth = 100
@@ -71,10 +72,11 @@ object Form1: TForm1
     ParentFont = False
     ReadOnly = True
     TabOrder = 1
+    ExplicitHeight = 642
   end
   object StatusBar1: TStatusBar
     Left = 0
-    Top = 642
+    Top = 662
     Width = 632
     Height = 19
     Panels = <
@@ -87,12 +89,13 @@ object Form1: TForm1
       item
         Width = 50
       end>
+    ExplicitTop = 642
   end
   object RefreshPanel: TPanel
     Left = 232
     Top = 0
     Width = 400
-    Height = 642
+    Height = 662
     Align = alClient
     Ctl3D = True
     Font.Charset = DEFAULT_CHARSET
@@ -105,6 +108,7 @@ object Form1: TForm1
     ParentFont = False
     TabOrder = 5
     Visible = False
+    ExplicitHeight = 642
     object lblRefresh: TLabel
       Left = 88
       Top = 50
@@ -123,7 +127,7 @@ object Form1: TForm1
     Left = 232
     Top = 0
     Width = 400
-    Height = 642
+    Height = 662
     Align = alClient
     Ctl3D = True
     Font.Charset = DEFAULT_CHARSET
@@ -137,6 +141,7 @@ object Form1: TForm1
     TabOrder = 4
     Visible = False
     OnClick = Panel1Click
+    ExplicitHeight = 642
     object lblVersion: TLabel
       Left = 30
       Top = 300

Main.pas

@@ -180,14 +180,15 @@   TForm1 = class(TForm)
   bWin2k, bWinXP, bVista, bWinNT4: boolean;
 
 const
-  kfVersion   = '0.1 Beta 2';
-  kfDate      = 'January 18th, 2011';
+  kfVersion   = '0.1 Beta 3';
+  kfDate      = 'January 20th, 2011';
   DefDelimCSV = ',';
   DefLogPath  = '.';
   KEY_WOW64_64KEY = $0100;
 
   SE_PRIVILEGE_DISABLED = 0;
   SE_RESTORE_NAME = 'SeRestorePrivilege';
+  sLineBreak = {$IFDEF LINUX} AnsiChar(#10) {$ENDIF} {$IFDEF MSWINDOWS} AnsiString(#13#10) {$ENDIF};
 
 function IsWow64: boolean;
 function BrowseForFolder(var Foldr: string; const Title: string): boolean;
@@ -206,7 +207,7 @@ implementation
 
 uses
   CommDlg, Dlgs, ShlObj, license, options, registration, remote, WinXPKey,
-  update;
+  update, ActnList;
 
 resourcestring
   rsSetPrivUserNotHaveAccess = 'The current user does not have the required ' +
@@ -2117,14 +2118,14 @@ function DoDownload(const rFile: string;const lFile: string): Boolean;
     //downloader.OnDownloadProgress := Form6.URL_OnDownloadProgress;
     try
       ExecuteTarget(nil);
+      //Execute
+      //ExecuteAction(Execute);
     except
       on E : Exception do
       begin
         ShowMessage(E.Message);
         Result := False;
       end;
-          //MessageDlg('Can''t read keyfinder.cfg. Error: ' + E.Message, mtError, [mbOK], 0);
-      //Result := False;
     end;
   finally
     Free;
@@ -2133,77 +2134,79 @@ function DoDownload(const rFile: string;const lFile: string): Boolean;
 
 procedure TForm1.MnuItmWebUpdateClick(Sender: TObject);
 var
-  test : Boolean;
-  CFGVer : string;
-  newCFG : string;
-  newVersion : string;
+  kfUpdate, cfgUpdate : Boolean;
+  CFGVer, newCFG, newVersion, kfURL, cfgURL, Section : string;
   myINI: TINIFile;
-  kfURL : string
+
 begin
   //future update dialog
   //ShellExecute(Handle, nil, PChar('http://sourceforge.net/project/platformdownload.php?group_id=222327'), nil, nil, SW_NORMAL);
   //Form6.Visible := True;
   //Form1.Enabled := False;
 
-  {var
-  myINI: TINIFile;
-begin
-  try
-    myINI := TINIFile.Create(ChangeFileExt(Application.ExeName, '.ini'));
-    myINI.WriteString('Settings', 'LogFilePath', sLogFilePath);
-    myINI.WriteBool('Settings', 'Logging', bLogging);
-    myINI.WriteString('Settings', 'CSVDelim', sDelimCSV);
-    myINI.WriteBool('Settings', 'AppendTop', bAppendTop);
-    myINI.WriteBool('Settings', 'AutoSave', bAutoSave);
-    myINI.WriteBool('Settings', 'LoadHive', bAutoHive);
-    myINI.WriteBool('Settings', 'LogOverwrite', bLogOverwrite);
-    myINI.WriteBool('Settings', 'PrintKeys', bToBePrinted);
-    myINI.WriteString('Settings', 'SavePath', sAutoSaveDir);
-    myINI.WriteString('Settings', 'ReportsPath', sReportsPath);
-    myINI.WriteString('Settings', 'UserHivePath', sUserHivePath);
-    myINI.WriteString('Settings', 'SoftwareHivePath', sSoftwareHivePath);
-    SaveFont(myINI, 'AppListFont', Form1.ListBox1.Font);
-    SaveFont(myINI, 'KeyListFont', Form1.Memo1.Font);
-    myINI.UpdateFile;
-  finally
-    myINI.Free;
-  end;}
-
   //Temporary update dialog
   //yes=6 and no=7
   if MessageDlg('This will connect to the internet to check for any Keyfinder or cfg updates.  Do you want to continue?', mtConfirmation , [mbYes,mbNo], 0) = 6 then
   begin
+    kfUpdate := False;
+    cfgUpdate := False;
+
     //download update.ini to parse version information
     if not DoDownload('http://keyfinder.sourceforge.net/update.ini',GetTempDirectory + 'update.ini') then
       Exit;
     try
+      Section := 'Update Software';
       myINI := TINIFile.Create(GetTempDirectory + 'update.ini');
-      myINI.ReadString('Update Software','CurrentVersion');
+      newVersion := myINI.ReadString(Section,'CurrentVersion','');
+      kfURL := myINI.ReadString(Section,'URL','');
+      newCFG := myINI.ReadString(Section,'ConfigVersion','');
+      cfgURL := myINI.ReadString(Section,'ConfigPath','');
+      CFGVer := RightStr(sCFGVer,Length(sCFGVer) - Pos(' ',sCFGVer));
+      CFGVer := RightStr(CFGVer,Length(CFGVer) - Pos(' ',CFGVer));
     finally
       myINI.Free;
     end;
 
+    //Enchanted Keyfinder update check
+    if not (newVersion = kfVersion) then
+    begin
+      if MessageDlg('There is a new version of Keyfinder: v' + newVersion + sLineBreak + 'Do you want to visit the download page?', mtConfirmation , [mbYes,mbNo], 0) = 6 then
+        ShellExecute(Handle, nil, PChar(kfURL), nil, nil, SW_NORMAL);
+      kfUpdate := True;
+    end;
+
 
-    //keyfinder.cfg update
+    //keyfinder.cfg update check
     if not FileExists(ExtractFilePath(Application.ExeName) + 'keyfinder.cfg') then
     begin
-      if MessageDlg('You don''t appear to have a keyfinder.cfg file.  This will allow you to detect the keys of more software.  Do you want the latest version?', mtConfirmation , [mbYes,mbNo], 0) = 6 then
-        if DoDownload('http://keyfinder.sourceforge.net/keyfinder.cfg',ExtractFilePath(Application.ExeName) + 'keyfinder.cfg') then
+      if MessageDlg('You don''t appear to have a keyfinder.cfg file.  This will allow you to detect the keys of more software.' + sLineBreak + 'Do you want the latest version?', mtConfirmation , [mbYes,mbNo], 0) = 6 then
+        if DoDownload(cfgURL,ExtractFilePath(Application.ExeName) + 'keyfinder.cfg') then
         begin
           MessageDlg( 'Success!' , mtInformation , [mbOK], 0);
           Refresh1Click(nil);
-        end
-        else
-          MessageDlg( 'fail' , mtInformation , [mbOK], 0);
+        end;
+      cfgUpdate := True;
+    end
+    else if not (CFGVer = newCFG) then
+    begin
+      if MessageDlg('There is a new version of keyfinder.cfg: ' + newCFG + '  This will allow you to detect the keys of more software.' + sLineBreak + 'Do you want the latest version?', mtConfirmation , [mbYes,mbNo], 0) = 6 then
+        if DoDownload(cfgURL,ExtractFilePath(Application.ExeName) + 'keyfinder.cfg') then
+        begin
+          MessageDlg( 'Success!' , mtInformation , [mbOK], 0);
+          Refresh1Click(nil);
+        end;
+      cfgUpdate := True;
+    end
+    else
+    begin
+      if kfUpdate then
+        MessageDlg( 'You have the latest keyfinder.cfg.' , mtInformation , [mbOK], 0);
     end;
-    {i := Pos(' ', CurrentLine);
-              s := TrimRight(RightStr(CurrentLine, Length(CurrentLine) - i));
-              i := Pos(' ', s) + 1;
-              CurrentLine := TrimRight(LeftStr(s, +i));}
-    CFGVer := RightStr(sCFGVer,Length(sCFGVer) - Pos(' ',sCFGVer));
-    CFGVer := RightStr(CFGVer,Length(CFGVer) - Pos(' ',CFGVer));
 
-    MessageDlg( CFGVer , mtInformation , [mbOK], 0);
+    if not (kfUpdate or cfgUpdate) then
+      MessageDlg( 'Nothing to update.' , mtInformation , [mbOK], 0);
+    if FileExists(GetTempDirectory + 'update.ini') then
+      DeleteFile( PChar(GetTempDirectory + 'update.ini') );
   end;
 
 

changelog.txt

@@ -1,7 +1,9 @@
 Enchanted Keyfinder (EK) Changelog
-Build 0.1.0.142 Beta 2 -- January 18th, 2011
+Build 0.1.0.209 Beta 3 -- January 20th, 2011
 ----------------------------------
-x.	Added icons to the menus
+1.	Added icons to the menus.
+2.	Implmented online updates to ease the process of checking for a new
+	version.
 
 Build 0.1.0.142 Beta 2 -- January 18th, 2011
 ----------------------------------

keyfinder.bdsproj

@@ -150,7 +150,7 @@
 			<VersionInfo Name="MajorVer">0</VersionInfo>
 			<VersionInfo Name="MinorVer">1</VersionInfo>
 			<VersionInfo Name="Release">0</VersionInfo>
-			<VersionInfo Name="Build">203</VersionInfo>
+			<VersionInfo Name="Build">210</VersionInfo>
 			<VersionInfo Name="Debug">False</VersionInfo>
 			<VersionInfo Name="PreRelease">True</VersionInfo>
 			<VersionInfo Name="Special">False</VersionInfo>
@@ -162,7 +162,7 @@
 		<VersionInfoKeys>
 			<VersionInfoKeys Name="CompanyName">Enchanted Keyfinder Project</VersionInfoKeys>
 			<VersionInfoKeys Name="FileDescription">Enchanted Keyfinder</VersionInfoKeys>
-			<VersionInfoKeys Name="FileVersion">0.1.0.203</VersionInfoKeys>
+			<VersionInfoKeys Name="FileVersion">0.1.0.210</VersionInfoKeys>
 			<VersionInfoKeys Name="InternalName">keyfinder</VersionInfoKeys>
 			<VersionInfoKeys Name="LegalCopyright">GPL</VersionInfoKeys>
 			<VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>