Changeset 93 for trunk

Timestamp:

Sep 7, 2012, 10:31:31 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Udržovní inforamce o instalovaných modulech v databázi.

Location:

trunk

Files:

• Modules/System/UModuleSystem.pas (modified) (8 diffs)
• Packages/ModularSystem/UModularSystem.pas (modified) (6 diffs)
• Pages/UPageAdmin.pas (modified) (1 diff)
• UCore.pas (modified) (2 diffs)

trunk/Modules/System/UModuleSystem.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UModularSystem;
+  Classes, SysUtils, UModularSystem, SpecializedDictionary;
 
 type
@@ -13 +13 @@
 
   TModuleSystem = class(TModule)
+  private
+    procedure ModuleChange(Sender: TObject; Module: TModule);
   public
     constructor Create(Owner: TComponent); override;
@@ -21 +23 @@
     procedure Uninstall; override;
     procedure Upgrade; override;
+    procedure UpdateModuleList;
   end;
 
@@ -30 +33 @@
 
 { TModuleSystem }
+
+procedure TModuleSystem.ModuleChange(Sender: TObject; Module: TModule);
+var
+  DbRows: TDbRows;
+  Data: TDictionaryStringString;
+begin
+  try
+    DbRows := TDbRows.Create;
+    Data := TDictionaryStringString.Create;
+    if Module.Installed then Data.Add('Installed', '1')
+      else Data.Add('Installed', '0');
+    Core.CommonDatabase.Update('SystemModule', Data, 'Name="' + Module.Identification + '"');
+  finally
+    Data.Free;
+    DbRows.Free;
+  end;
+end;
 
 constructor TModuleSystem.Create(Owner: TComponent);
@@ -47 +67 @@
 
 procedure TModuleSystem.Start;
+var
+  DbRows: TDbRows;
+  I: Integer;
+  Module: TModule;
 begin
+  try
+    DbRows := TDbRows.Create;
+    Core.CommonDatabase.Select(DbRows, 'SystemModule', 'Name, Installed');
+    for I := 0 to DbRows.Count - 1 do
+    with DbRows[I] do begin
+      Module := Core.ModuleManager.FindModuleByName(Values['Name']);
+      if Assigned(Module) then
+        if Values['Installed'] = '1' then Module.SetInstalledState(True)
+          else Module.SetInstalledState(False);
+    end;
+  finally
+    DbRows.Free;
+  end;
+  Core.ModuleManager.OnModuleChange := ModuleChange;
   inherited Start;
 end;
@@ -54 +92 @@
 begin
   inherited Stop;
+  Core.ModuleManager.OnModuleChange := nil;
 end;
 
@@ -78 +117 @@
     DbRows.Free;
   end;
+  UpdateModuleList;
   inherited Install;
 end;
@@ -99 +139 @@
 end;
 
+procedure TModuleSystem.UpdateModuleList;
+var
+  DbRows: TDbRows;
+  I: Integer;
+  Index: Integer;
+  Data: TDictionaryStringString;
+begin
+  try
+    DbRows := TDbRows.Create;
+    Data := TDictionaryStringString.Create;
+
+    Core.CommonDatabase.Select(DbRows, 'SystemModule', 'Name');
+
+    for I := 0 to Core.ModuleManager.Modules.Count - 1 do
+    with TModule(Core.ModuleManager.Modules[I]) do begin
+      Data.Clear;
+      Data.Add('Name', Identification);
+      Data.Add('Version', Version);
+      Data.Add('License', License);
+      Data.Add('Creator', Author);
+      Data.Add('Description', Description.Text);
+      Data.Add('Title', Title);
+      Data.Add('Dependencies', Dependencies.Text);
+      if Installed then Data.Add('Installed', '1')
+        else Data.Add('Installed', '0');
+
+      Index := 0;
+      while (Index < DbRows.Count) and (DbRows[Index].Values['Name'] <> Identification) do Inc(Index);
+      if Index >= DbRows.Count then Core.CommonDatabase.Insert('SystemModule', Data)
+        else Core.CommonDatabase.Update('SystemModule', Data, 'Name="' + Identification + '"');
+    end;
+  finally
+    Data.Free;
+    DbRows.Free;
+  end;
+end;
+
 end.
 

trunk/Packages/ModularSystem/UModularSystem.pas

@@ -58 +58 @@
   end;
 
+  TModuleEvent = procedure (Sender: TObject; Module: TModule) of object;
+
   { TModuleManager }
 
@@ -63 +65 @@
   private
     FAPI: TAPI;
+    FOnModuleChange: TModuleEvent;
     procedure SetAPI(AValue: TAPI);
   public
@@ -84 +87 @@
     destructor Destroy; override;
     property API: TAPI read FAPI write SetAPI;
+    property OnModuleChange: TModuleEvent read FOnModuleChange write FOnModuleChange;
   end;
 
@@ -328 +332 @@
   Manager.InstallDependencies(Identification, Dependencies);
   FInstalled := True;
+  if Assigned(Manager.FOnModuleChange) then
+    Manager.FOnModuleChange(Manager, Self);
 end;
 
@@ -336 +342 @@
   Manager.UninstallDependencies(Identification);
   FInstalled := False;
+  if Assigned(Manager.FOnModuleChange) then
+    Manager.FOnModuleChange(Manager, Self);
 end;
 
@@ -370 +378 @@
 begin
   FInstalled := Value;
+  if Assigned(Manager.FOnModuleChange) then
+    Manager.FOnModuleChange(Manager, Self);
 end;
 

trunk/Pages/UPageAdmin.pas

@@ -48 +48 @@
       else PageName := '';
     with HtmlDocument.Body do begin
-      LoadUserInfo;
       if PageName = '' then PageName := 'modulelist';
       if PageName = 'modulelist' then HandleModuleList(HandlerData)

trunk/UCore.pas

@@ -192 +192 @@
   //SaveToRegistry;
   FreeAndNil(CommonDatabase);
+  ModuleManager.StopAll;
   FreeAndNil(ModuleManager);
   FreeAndNil(Pages);
@@ -279 +280 @@
   DbRows: TDbRows;
   Module: TModule;
+  I: Integer;
 begin
   try