New SRL Updater with form.

Extensions/srl.sex

@@ -4,6 +4,11 @@ var
   started: Boolean;
   Timer : TTimer;
   Updating : boolean;
+  LocalP,LocalS,OnlineP,OnlineS: Integer;
+
+  F: TForm;
+  Memo: TMemo;
+  but: TButton;
 
 
 function GetNumbers(const str : string) : string;
@@ -28,26 +33,17 @@ begin
   SRLVersion := StrToIntDef(Settings.GetKeyValueDef('SRLVersion','-1'),-1);  
 end;
 
-function UpdateSRL : boolean;
+function UpdatePlugins: Boolean;
 var
-  LocalP,LocalS,OnlineP,OnlineS,I : integer;
+  I : integer;
   Contents : String;
   DeContents : string;
   Files : TStringArray;
   Failed,OverWrite : boolean;
 begin
-  Result := false;
+  Memo.Lines.Add('Downloading the plugins...');
-  if Updating then
-    exit;
-  Updating := True;
-  GetLocalVersion(LocalP,LocalS);
-  GetOnlineVersion(OnlineP,OnlineS);
-  Result := True;
-  if (OnlineP > LocalP) then
-  begin
-    Writeln('New plugin(s) are available.');
-    Writeln('Downloading the new plugins now. Please do not close Simba.');
 	Contents := GetPage('http://wizzup.org/static/srl/simba_plugins.tar.bz2');
+  Memo.Lines.Add('Uncompressing the plugins...');
 	Failed := True;
 	if DecompressBZip2(Contents,DeContents,4096) then
 	  if ForceDirectories(IncludePath + 'SRL/SimbaPlugins/') then
@@ -69,21 +65,32 @@ begin
 		    Failed := not UnTarEx(DeContents,PluginPath,false);
 		end;
 	if Failed then
-	  Writeln('Somehow failed to update the plugins')
+  begin
+	  Writeln('Failed to update the plugins');
+    Memo.Lines.Add('Failed to update the plugins');
+  end
 	else
-	  Writeln('Succesfully updated your plugins!');
+  begin
+	  Writeln('Succesfully updated your plugins.');
+    Memo.Lines.Add('Succesfully updated your plugins.');
+  end;
 	DeContents := '';
 	Contents := '';
 	Result := Failed;
 	if not Failed then
 	  Settings.SetKeyValue('PluginsVersion',inttostr(OnlineP));
-  end;
+end;
-  if (OnlineS > LocalS) then
+
-  begin
+function UpdateSRL: boolean;
-    Writeln('SRL is outdated, updating now!');
+var
-    Writeln('Downloading the new SRL now. Please do not close Simba.');
+  Contents : String;
+  DeContents : string;
+  Failed : boolean;
+begin
+  Memo.Lines.Add('Downloading SRL...');
 	Contents := GetPage('http://wizzup.org/static/srl/srl.tar.bz2');
 	Failed := True;
+  Memo.Lines.Add('Uncompressing SRL...');
 	if DecompressBZip2(Contents,DeContents,4096) then
       if UnTarEx(DeContents,IncludePath,true) then
 	    Failed := False;
@@ -92,9 +99,66 @@ begin
 	if Result then
 	  Result := Failed;
 	if not Failed then
+  begin
+    Memo.Lines.Add('Succesfully updated your SRL!');
 	  Writeln('Succesfully updated your SRL!');
-  end;  
+  end;
+end;
+
+procedure DoUpdate(Sender: TObject);
+begin
+  if LocalP < OnlineP then
+  begin
+    Memo.Lines.Add('Plugins update. Old version: ' + IntToStr(LocalP) +
+                   ' New version: ' + IntToStr(OnlineP));
+    UpdatePlugins;
+  end;
+  if LocalS < OnlineS then
+  begin
+    Memo.Lines.Add('SRL update. Old version: ' + IntToStr(LocalS) +
+                   ' New version: ' + IntToStr(OnlineS));
+    UpdateSRL;
+  end;
+  F.ModalResult := mrOk;
+end;
+
+
+function Update : boolean;
+var
+   OpenForm: Boolean;
+begin
+  Result := false;
+  if Updating then
+    Exit;
+  Updating := True;
+
+  GetLocalVersion(LocalP,LocalS);
+  GetOnlineVersion(OnlineP,OnlineS);
+
+  if (LocalP < OnlineP) or (LocalS < OnlineS) then
+  begin
+	   case MessageDlg('SRL Updater', 'Updates are available. '+
+                      'Do you want to open the Updater now?',
+                      mtConfirmation, [mbNo,mbYes],0) of
+		   mrYes : OpenForm := True;
+ 	  else
+	 	   OpenForm := False;
+ 	  end;
+    if not OpenForm then
+    begin
+      Updating := False;
+      Exit;
+    end;
+    Result := True;
+    f.ShowModal;
+  end else
+  begin
+    MessageDlg('SRL Updater', 'No SRL update / Plugins update available!' ,mtConfirmation, [mbYes],0);
+    writeln('No SRL update / Plugins update available!');
+  end;
+
   Updating := False;
+
 end;
 
 procedure OnSRLCheckClick(Sender: TObject);
@@ -104,23 +168,30 @@ begin
   GetLocalVersion(LocalP,LocalS);
   GetOnlineVersion(OnlineP,OnlineS);
   if (OnlineP > LocalP) or (OnlineS > LocalS) then
-    Writeln('A new SRL version is available');  
+  begin;
+    Writeln('A new SRL version is available');
+    Update;
+  end;
 end;
 
 procedure SetAutoUpdate(Sender: TObject);
 begin
   AutoUpdate.Checked := not AutoUpdate.Checked;
   Timer.Enabled := AutoUpdate.Checked;
+  if LowerCase(Settings.GetKeyValueDef('AutoUpdate','True')) = 'true' then
+    Settings.SetKeyValue('AutoUpdate', 'False')
+  else
+    Settings.SetKeyValue('AutoUpdate', 'True');
 end;
 procedure OnSRLUpdateClick(Sender: TObject);
 begin
-  UpdateSRL;
+  Update;
 end;
 
 procedure OnUpdateTimer(Sender: TObject);
 begin;
   Timer.Interval := 30 * 60 * 1000; //Every half hour
-  UpdateSRL; 
+  Update;
 end;
 
 procedure Init;
@@ -138,7 +209,7 @@ begin;
   MenuUpdate.Caption := 'Update SRL';
   MenuUpdate.OnClick := @OnSRLUpdateClick;
   MainMenuItem.Add(MenuUpdate);
-  
+
   AutoUpdate := TMenuItem.Create(MainMenuItem);
   AutoUpdate.Caption := 'Automatically update';
   AutoUpdate.OnClick := @SetAutoUpdate;
@@ -150,14 +221,49 @@ begin;
   Timer.OnTimer := @OnUpdateTimer;
   Timer.Enabled :=AutoUpdate.Checked;
 
+  F := TForm.Create(nil);
+  With F Do
+    begin
+      Visible := False;
+      Width := 300;
+      Height := 300;
+      BorderStyle := bsSingle;
+      Caption := 'SRL Updater - Updates Available';
+    end;
+
+  but := TButton.Create(F);
+
+  with but do
+    begin
+      Parent := F;
+      Left := 10;
+      Top := 10;
+      Caption := 'Update';
+      Width := 280;
+
+      OnClick := @DoUpdate;
+    end;
+
+  Memo := TMemo.Create(F);
+
+  with Memo do
+    begin
+      Parent := F;
+      Left := 10;
+      Top := 40;
+      Width := 280;
+      Height := 250;
+    end;
+
   started := True;
 end;
 
 procedure Free;
 begin
   if (started) then
-    Timer.Enabled := False;//Freeing the components is not needed, as they will be freed upon the freeing of Simba.
+     Timer.Enabled := False;//Freeing the components is not needed, as they will be freed upon the freeing of Simba.
-  
+  if F <> nil then
+    F.Free;
 end;
 
 procedure Attach;
@@ -183,4 +289,4 @@ begin;
   result := '1.0';
 end;
 begin
-end.
+end.