Changeset 75 for trunk/Packages/ModularSystem/ModularSystem.pas

Timestamp:

Jun 4, 2024, 12:22:49 AM (5 months ago)

Author:

chronos

Message:

• Modified: Removed U prefix from unit names.
• Modified: Updated Common package.

File:

• trunk/Packages/ModularSystem/ModularSystem.pas (moved) (moved from trunk/Packages/ModularSystem/UModularSystem.pas ) (30 diffs)

trunk/Packages/ModularSystem/ModularSystem.pas

@@ -1 @@
-unit UModularSystem;
-
-{$mode Delphi}{$H+}
+unit ModularSystem;
 
 interface
 
 uses
-  Classes, SysUtils, URegistry, SpecializedList;
+  Classes, SysUtils, RegistryEx, Generics.Collections;
 
 type
   TModuleManager = class;
   TModule = class;
-  TListModule = class;
+  TModules = class;
 
   TAPI = class(TComponent)
-
   end;
 
@@ -39 +36 @@
     FLicense: string;
     FAuthor: string;
-    FDependencies: TListString;
-    FDescription: TListString;
+    FDependencies: TStringList;
+    FDescription: TStringList;
     FFileName: string;
     FWebSite: string;
@@ -65 +62 @@
     procedure Reinstall;
     procedure Upgrade;
-    procedure EnumDependenciesCascade(ModuleList: TListModule;
+    procedure EnumDependenciesCascade(ModuleList: TModules;
       Conditions: TModuleConditions = [mcAll]);
-    procedure EnumSuperiorDependenciesCascade(ModuleList: TListModule;
+    procedure EnumSuperiorDependenciesCascade(ModuleList: TModules;
       Conditions: TModuleConditions = [mcAll]);
     procedure SetInstalledState(Value: Boolean);
@@ -84 +81 @@
     property License: string read FLicense write FLicense;
     property Author: string read FAuthor write FAuthor;
-    property Dependencies: TListString read FDependencies write FDependencies;
-    property Description: TListString read FDescription write FDescription;
+    property Dependencies: TStringList read FDependencies write FDependencies;
+    property Description: TStringList read FDescription write FDescription;
     property FileName: string read FFileName write FFileName;
     property Category: string read FCategory write FCategory;
@@ -92 +89 @@
   end;
 
-  { TListModule }
-
-  TListModule = class(TListObject)
-  private
+  { TModules }
+
+  TModules = class(TObjectList<TModule>)
   public
     procedure Perform(Actions: array of TModuleAction; Conditions: TModuleConditions = [mcAll]);
     function FindByName(Name: string): TModule;
+    function GetNames: string;
   end;
 
   TModuleManagerOption = (moAutoInstallOnRun, moAuto);
   TModuleManagerOptions = set of TModuleManagerOption;
+
   { TModuleManager }
 
@@ -114 +112 @@
     procedure DoUpdate(Sender: TObject);
   public
-    Modules: TListModule; // TObjectList<TModule>
+    Modules: TModules;
     function ModuleRunning(Name: string): Boolean;
-    procedure EnumDependenciesCascade(Module: TModule; ModuleList: TListModule;
+    procedure EnumDependenciesCascade(Module: TModule; ModuleList: TModules;
       Conditions: TModuleConditions = [mcAll]);
     procedure EnumSuperiorDependenciesCascade(Module: TModule;
-      ModuleList: TListModule; Conditions: TModuleConditions = [mcAll]);
+      ModuleList: TModules; Conditions: TModuleConditions = [mcAll]);
     procedure RegisterModule(Module: TModule);
     procedure UnregisterModule(Module: TModule);
@@ -145 +143 @@
 end;
 
-{ TListModule }
-
-procedure TListModule.Perform(Actions:  array of TModuleAction;
+{ TModules }
+
+procedure TModules.Perform(Actions:  array of TModuleAction;
   Conditions: TModuleConditions = [mcAll]);
 var
@@ -153 +151 @@
   A: Integer;
 begin
-  try
-    BeginUpdate;
   for I := 0 to Count - 1 do
   with TModule(Items[I]) do
@@ -173 +169 @@
       if Actions[A] = maDisable then Disable;
     end;
-  finally
-    EndUpdate;
-  end;
-end;
-
-function TListModule.FindByName(Name: string): TModule;
+end;
+
+function TModules.FindByName(Name: string): TModule;
 var
   I: Integer;
@@ -188 +181 @@
 end;
 
+function TModules.GetNames: string;
+var
+  I: Integer;
+begin
+  Result := '';
+  for I := 0 to Count - 1 do
+    Result := Result + ', ' + Items[I].Identification;
+  Result := Copy(Result, 3, MaxInt);
+end;
+
 { TModuleManager }
 
@@ -216 +219 @@
 
 procedure TModuleManager.EnumDependenciesCascade(Module: TModule;
-  ModuleList: TListModule; Conditions: TModuleConditions = [mcAll]);
+  ModuleList: TModules; Conditions: TModuleConditions = [mcAll]);
 var
   DepModule: TModule;
+  DepModuleName: string;
   I: Integer;
 begin
   for I := 0 to Module.Dependencies.Count - 1 do begin
-    DepModule := Modules.FindByName(Module.Dependencies[I]);
+    DepModuleName := Module.Dependencies[I];
+    DepModule := Modules.FindByName(DepModuleName);
     if Assigned(DepModule) then
     with DepModule do begin
@@ -236 +241 @@
           Self.EnumDependenciesCascade(DepModule, ModuleList);
         end;
-    end else raise Exception.CreateFmt(SModuleNotFound, [DepModule.Identification]);
+    end else raise Exception.CreateFmt(SModuleNotFound, [Module.Dependencies[I], Module.Identification]);
   end;
 end;
 
 procedure TModuleManager.EnumSuperiorDependenciesCascade(Module: TModule;
-  ModuleList: TListModule; Conditions: TModuleConditions = [mcAll]);
+  ModuleList: TModules; Conditions: TModuleConditions = [mcAll]);
 var
   I: Integer;
@@ -267 +272 @@
   Module.FManager := Self;
   Module.API := API;
-  Modules.Update;
+  //Modules.Update;
 end;
 
@@ -273 +278 @@
 begin
   Modules.Remove(Module);
-  Modules.Update;
+  //Modules.Update;
 end;
 
@@ -279 +284 @@
 begin
   inherited;
-  Modules := TListModule.Create;
+  Modules := TModules.Create;
   Modules.OwnsObjects := False;
-  Modules.OnUpdate := DoUpdate;
+  //Modules.OnUpdate := DoUpdate;
 end;
 
@@ -362 +367 @@
 procedure TModule.Enable;
 var
-  List: TListModule;
+  List: TModules;
 begin
   if Enabled then Exit;
   FEnabled := True;
   try
-    List := TListModule.Create;
+    List := TModules.Create;
     List.OwnsObjects := False;
     EnumDependenciesCascade(List, [mcNotEnabled]);
@@ -380 +385 @@
 procedure TModule.Disable;
 var
-  List: TListModule;
+  List: TModules;
 begin
   if not Enabled then Exit;
@@ -386 +391 @@
   FEnabled := False;
   try
-    List := TListModule.Create;
+    List := TModules.Create;
     List.OwnsObjects := False;
     EnumSuperiorDependenciesCascade(List, [mcEnabled]);
@@ -393 +398 @@
     List.Free;
   end;
-  Manager.Modules.Update;
+  //Manager.Modules.Update;
 end;
 
@@ -418 +423 @@
 procedure TModule.Start;
 var
-  List: TListModule;
+  List: TModules;
   StartTime: TDateTime;
 begin
@@ -424 +429 @@
   if not Installed then Install;  // Auto install not installed modules
   try
-    List := TListModule.Create;
+    List := TModules.Create;
     List.OwnsObjects := False;
     EnumDependenciesCascade(List, [mcNotRunning]);
@@ -435 +440 @@
   FStartUpTime := Now - StartTime;
   FRunning := True;
-  Manager.Modules.Update;
+  //Manager.Modules.Update;
 end;
 
 procedure TModule.Stop;
 var
-  List: TListModule;
+  List: TModules;
 begin
   if not Running then Exit;
   FRunning := False;
   try
-    List := TListModule.Create;
+    List := TModules.Create;
     List.OwnsObjects := False;
     EnumSuperiorDependenciesCascade(List, [mcRunning]);
@@ -453 +458 @@
   end;
   DoStop;
-  Manager.Modules.Update;
+  //Manager.Modules.Update;
 end;
 
@@ -464 +469 @@
 procedure TModule.Install;
 var
-  List: TListModule;
+  List: TModules;
 begin
   if Installed then Exit;
   try
-    List := TListModule.Create;
+    List := TModules.Create;
     List.OwnsObjects := False;
     EnumDependenciesCascade(List, [mcNotInstalled]);
@@ -478 +483 @@
   DoInstall;
   //Enable; // Auto enable installed module
-  Manager.Modules.Update;
+  //Manager.Modules.Update;
 end;
 
 procedure TModule.Uninstall;
 var
-  List: TListModule;
+  List: TModules;
 begin
   if not Installed then Exit;
   if Enabled then Disable; // Auto disable uninstalled module
   try
-    List := TListModule.Create;
+    List := TModules.Create;
     List.OwnsObjects := False;
     EnumSuperiorDependenciesCascade(List, [mcInstalled]);
@@ -497 +502 @@
   FInstalled := False;
   DoUninstall;
-  Manager.Modules.Update;
+  //Manager.Modules.Update;
 end;
 
@@ -515 +520 @@
     Start;
   end else DoUpgrade;
-  Manager.Modules.Update;
-end;
-
-procedure TModule.EnumDependenciesCascade(ModuleList: TListModule;
+  //Manager.Modules.Update;
+end;
+
+procedure TModule.EnumDependenciesCascade(ModuleList: TModules;
   Conditions: TModuleConditions = [mcAll]);
 begin
@@ -525 +530 @@
 end;
 
-procedure TModule.EnumSuperiorDependenciesCascade(ModuleList: TListModule;
+procedure TModule.EnumSuperiorDependenciesCascade(ModuleList: TModules;
   Conditions: TModuleConditions = [mcAll]);
 begin
@@ -535 +540 @@
 begin
   FInstalled := Value;
-  Manager.Modules.Update;
+  //Manager.Modules.Update;
 end;
 
@@ -541 +546 @@
 begin
   inherited;
-  Dependencies := TListString.Create;
-  Description := TListString.Create;
+  Dependencies := TStringList.Create;
+  Description := TStringList.Create;
 end;