Changeset 429 for ModularSystem/UModularSystem.pas

Timestamp:

Oct 17, 2012, 1:21:41 PM (12 years ago)

Author:

chronos

Message:

• Modified: ModularSystem now uset DoStart, DoStop, DoInstall, DoUninstall, DoUpgrade methods in place of Before/After methods.

File:

• ModularSystem/UModularSystem.pas (modified) (11 diffs)

ModularSystem/UModularSystem.pas

@@ -22 +22 @@
     FRunning: Boolean;
     FInstalled: Boolean;
-    Manager: TModuleManager;
+    FManager: TModuleManager;
     FVersion: string;
     FIdentification: string;
@@ -34 +34 @@
     procedure SetRunning(AValue: Boolean);
   protected
-    procedure BeforeStart; virtual;
-    procedure AfterStart; virtual;
-    procedure BeforeStop; virtual;
-    procedure AfterStop; virtual;
+    procedure DoStart; virtual;
+    procedure DoStop; virtual;
+    procedure DoInstall; virtual;
+    procedure DoUninstall; virtual;
+    procedure DoUpgrade; virtual;
   public
     API: TAPI;
-    procedure Start; virtual;
-    procedure Stop; virtual;
-    procedure Install; virtual;
-    procedure Uninstall; virtual;
-    procedure Upgrade; virtual;
+    procedure Start;
+    procedure Stop;
+    procedure Install;
+    procedure Uninstall;
+    procedure Upgrade;
     procedure EnumModulesStart(ModuleList: TStringList);
     procedure EnumModulesStop(ModuleList: TStringList);
@@ -56 +57 @@
     property Enabled: Boolean read FEnabled write SetEnabled;
   published
+    property Manager: TModuleManager read FManager;
     property Version: string read FVersion write FVersion;
     property Identification: string read FIdentification write FIdentification;
@@ -260 +262 @@
 begin
   Modules.Add(Module);
-  Module.Manager := Self;
+  Module.FManager := Self;
   Module.API := API;
   Module.Enabled := Enabled;
@@ -310 +312 @@
   inherited;
   Modules := TObjectList.Create;
+  //Modules.OwnsObjects := False;
 end;
 
@@ -316 +319 @@
   StopAll;
   FreeAndNil(Modules);
-  inherited Destroy;
+  inherited;
 end;
 
@@ -344 +347 @@
     RootKey := Context.RootKey;
     for I := 0 to Modules.Count - 1 do
-    with TModule(Modules[I]) do begin
+    with TModule(Modules[I]) do
+    if Enabled then begin
       OpenKey(Context.Key + '\' + Identification, True);
       WriteBool('Run', Running);
@@ -361 +365 @@
 end;
 
-procedure TModule.BeforeStart;
-begin
-  if Running then Exit;
+procedure TModule.DoStart;
+begin
+
+end;
+
+procedure TModule.DoStop;
+begin
+
+end;
+
+procedure TModule.DoInstall;
+begin
+
+end;
+
+procedure TModule.DoUninstall;
+begin
+
+end;
+
+procedure TModule.DoUpgrade;
+begin
+
+end;
+
+procedure TModule.SetInstalled(AValue: Boolean);
+begin
+  if FInstalled = AValue then Exit;
+  if AValue then Install else Uninstall;
+end;
+
+procedure TModule.SetEnabled(AValue: Boolean);
+begin
+  if FEnabled = AValue then Exit;
+  FEnabled := AValue;
+  if not FEnabled and FInstalled then Uninstall;
+end;
+
+procedure TModule.Start;
+begin
+  if not Enabled or Running then Exit;
   if not Installed then Install;
   Manager.StartDependencies(Identification, Dependencies);
-end;
-
-procedure TModule.AfterStart;
-begin
+  DoStart;
   FRunning := True;
 end;
 
-procedure TModule.BeforeStop;
+procedure TModule.Stop;
 begin
   if not Running then Exit;
   FRunning := False;
   Manager.StopDependencies(Identification);
-end;
-
-procedure TModule.AfterStop;
-begin
-end;
-
-procedure TModule.SetInstalled(AValue: Boolean);
-begin
-  if FInstalled = AValue then Exit;
-  if AValue then Install else Uninstall;
-end;
-
-procedure TModule.SetEnabled(AValue: Boolean);
-begin
-  if FEnabled = AValue then Exit;
-  FEnabled := AValue;
-  if not FEnabled and FInstalled then Uninstall;
-end;
-
-procedure TModule.Start;
-begin
-  BeforeStart;
-  AfterStart;
-end;
-
-procedure TModule.Stop;
-begin
-  BeforeStop;
-  AfterStop;
+  DoStop;
 end;
 
 procedure TModule.Install;
 begin
-  if Installed then Exit;
+  if not Enabled or Installed then Exit;
   Manager.InstallDependencies(Identification, Dependencies);
   FInstalled := True;
   if Assigned(Manager.FOnModuleChange) then
     Manager.FOnModuleChange(Manager, Self);
+  DoInstall;
 end;
 
@@ -424 +436 @@
   Manager.UninstallDependencies(Identification);
   FInstalled := False;
+  DoUninstall;
   if Assigned(Manager.FOnModuleChange) then
     Manager.FOnModuleChange(Manager, Self);
@@ -430 +443 @@
 procedure TModule.Upgrade;
 begin
-  if not Running then Exit;
+  if not Enabled or not Installed then Exit;
+  if Running then try
+    Stop;
+    DoUpgrade;
+  finally
+    Start;
+  end else DoUpgrade;
 end;
 
@@ -474 +493 @@
 begin
   Running := False;
-  Description.Free;
-  Dependencies.Free;
-  inherited Destroy;
+  FreeAndNil(FDescription);
+  FreeAndNil(FDependencies);
+  inherited;
 end;