Changeset 899 for trunk/Packages/Common/Modules

Timestamp:

Feb 17, 2021, 12:30:23 PM (4 years ago)

Author:

chronos

Message:

• Modified: AppModule renamed to Module. AppModuleManger renamed to ModuleManager.
• Fixed: Keep Modules Id in ModulesConfig.php in sync with database list of modules.

Location:

trunk/Packages/Common/Modules

Files:

• ModuleManager.php (modified) (9 diffs)
• Setup.php (modified) (4 diffs)

trunk/Packages/Common/Modules/ModuleManager.php

@@ -1 +1 @@
 <?php
 
-class ModuleModuleManager extends AppModule
+class ModuleModuleManager extends Module
 {
   public UpdateManager $UpdateManager;
@@ -13 +13 @@
     $this->License = 'GNU/GPLv3';
     $this->Description = 'User interface for module management.';
-    $this->Dependencies = array('Setup');
+    $this->Dependencies = array(ModuleSetup::GetName());
     $this->Revision = 1;
     $this->Type = ModuleType::System;
+    $this->Models = array(ModelField::GetClassName(), ModuleDependency::GetClassName());
   }
 
@@ -142 +143 @@
   function DoBeforeInstall(): void
   {
-    $this->AddModelDatabase(Module::GetDesc());
+    $this->AddModelDatabase(Module::GetModelDesc());
     $this->Manager->OnInstallModule = array($this, 'InstallModule');
     $this->Manager->OnUninstallModule = array($this, 'UninstallModule');
-    $this->AddModelDatabase(ModuleModel::GetDesc());
+    $this->AddModelDatabase(Model::GetModelDesc());
     $this->Manager->OnInstallModel = array($this, 'InstallModel');
     $this->Manager->OnUninstallModel = array($this, 'UninstallModel');
@@ -154 +155 @@
     $this->Manager->OnInstallModel = null;
     $this->Manager->OnUninstallModel = null;
-    $this->RemoveModelDatabase(ModuleModel::GetDesc());
+    $this->RemoveModelDatabase(Model::GetModelDesc());
     $this->Manager->OnInstallModule = null;
     $this->Manager->OnUninstallModule = null;
-    $this->RemoveModelDatabase(Module::GetDesc());
-  }
-
-  function GetModels(): array
-  {
-    return array(ModuleModelField::GetClassName(), ModuleDependency::GetClassName());
+    $this->RemoveModelDatabase(Module::GetModelDesc());
+  }
+
+  function DoInstall(): void
+  {
+    $this->InstallModel(Module::GetModelDesc(), $this->System->GetModule($this::GetName()));
+    $this->InstallModel(Model::GetModelDesc(), $this->System->GetModule($this::GetName()));
   }
 
@@ -238 +240 @@
   }
 
-  function InstallModel(ModelDesc $ModelDesc, AppModule $Module)
+  function InstallModel(ModelDesc $ModelDesc, Module $Module)
   {
     $this->AddModelDatabase($ModelDesc);
-    $this->Database->insert('ModuleModel', array('Name' => $ModelDesc->Name, 'Module' => $Module->Id));
+    $this->Database->insert('Model', array('Name' => $ModelDesc->Name, 'Module' => $Module->Id));
     $ModelId = $this->Database->insert_id;
     foreach ($ModelDesc->Columns as $Field)
     {
-      $this->Database->insert('ModuleModelField', array('Name' => $Field->Name, 'Model' => $ModelId,
+      $this->Database->insert('ModelField', array('Name' => $Field->Name, 'Model' => $ModelId,
         'Type' => ModelColumnType::GetName($Field->Type), 'Nullable' => (int)$Field->Nullable));
     }
   }
 
-  function UninstallModel(ModelDesc $ModelDesc, AppModule $Module)
-  {
-    $this->Database->delete('ModuleModel', '(Name='.$ModelDesc->Name.') AND (Module='.$Module->Id.')');
+  function UninstallModel(ModelDesc $ModelDesc, Module $Module)
+  {
+    $DbResult = $this->Database->select('Model', 'Id', '(Name="'.$ModelDesc->Name.'") AND (Module='.$Module->Id.')');
+    if ($DbResult->num_rows > 0)
+    {
+      $DbRow = $DbResult->fetch_assoc();
+      $ModelId = $DbRow['Id'];
+      $DbResult = $this->Database->delete('ModelField', '(Model='.$ModelId.')');
+    }
+    $this->Database->delete('Model', '(Id='.$ModelId.')');
     $this->RemoveModelDatabase($ModelDesc);
   }
 
-  function InstallModule(AppModule $Module)
-  {
-    echo('Install module '.$Module->Name);
+  function InstallModule(Module $Module)
+  {
     $this->Database->insert('Module', array(
+      'Id' => $Module->Id,
       'Name' => $Module->Name,
       'Title' => $Module->Title,
@@ -269 +278 @@
       'InstalledVersion' => $Module->InstalledVersion
     ));
-    $Module->Id = $this->Database->insert_id;
-  }
-
-  function UninstallModule(AppModule $Module)
-  {
-    echo('Uninstall module '.$Module->Name);
-    $this->Database->delete('Module', 'Name='.$Module->Name);
-  }
-
-  function ModuleChange(AppModule $Module): void
+  }
+
+  function UninstallModule(Module $Module)
+  {
+    $this->Database->delete('Module', 'Name="'.$Module->Name.'"');
+  }
+
+  function ModuleChange(Module $Module): void
   {
     if ($Module->Installed) $Installed = 1;
@@ -293 +300 @@
     while ($Module = $DbResult->fetch_array())
     {
-      //echo($Module['Name'].',');
       include_once('Modules/'.$Module['Name'].'/'.$Module['Name'].'.php');
       $ModuleClassName = 'Module'.$Module['Name'];
@@ -534 +540 @@
 }
 
-class Module extends Model
+class ModelField extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
     $Desc->AddString('Name');
-    $Desc->AddString('Title');
-    $Desc->AddString('Creator');
-    $Desc->AddString('Version');
-    $Desc->AddString('License');
-    $Desc->AddBoolean('Installed');
-    $Desc->AddString('InstalledVersion');
-    $Desc->AddString('Description');
-    return $Desc;
-  }
-}
-
-class ModuleModel extends Model
-{
-  static function GetDesc(): ModelDesc
-  {
-    $Desc = new ModelDesc(self::GetClassName());
-    $Desc->AddString('Name');
-    $Desc->AddReference('Module', Module::GetClassName());
-    return $Desc;
-  }
-}
-
-class ModuleModelField extends Model
-{
-  static function GetDesc(): ModelDesc
-  {
-    $Desc = new ModelDesc(self::GetClassName());
-    $Desc->AddString('Name');
-    $Desc->AddReference('Model', ModuleModel::GetClassName());
+    $Desc->AddReference('Model', Model::GetClassName());
     $Desc->AddString('Type');
     $Desc->AddBoolean('Nullable');
@@ -577 +555 @@
 class ModuleDependency extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());

trunk/Packages/Common/Modules/Setup.php

@@ -1 +1 @@
 <?php
+
+class ModuleSetup extends Module
+{
+  public UpdateManager $UpdateManager;
+
+  function __construct(System $System)
+  {
+    global $DatabaseRevision;
+
+    parent::__construct($System);
+    $this->Name = 'Setup';
+    $this->Version = '1.0';
+    $this->Creator = 'Chronos';
+    $this->License = 'GNU/GPLv3';
+    $this->Description = 'Base setup module';
+    $this->Revision = 1;
+    $this->Type = ModuleType::System;
+
+    // Check database persistence structure
+    $this->UpdateManager = new UpdateManager();
+    $this->UpdateManager->Database = &$this->Database;
+    $this->UpdateManager->Revision = $DatabaseRevision;
+    $this->UpdateManager->InstallMethod = 'FullInstall';
+  }
+
+  static function Cast(Module $Module): ModuleSetup
+  {
+    if ($Module instanceof ModuleSetup)
+    {
+      return $Module;
+    }
+    throw new Exception('Expected ModuleSetup type but '.gettype($Module));
+  }
+
+  function DoStart(): void
+  {
+    Core::Cast($this->System)->RegisterPage([''], 'PageSetupRedirect');
+    Core::Cast($this->System)->RegisterPage(['setup'], 'PageSetup');
+  }
+
+  function DoStop(): void
+  {
+    unset($this->UpdateManager);
+    Core::Cast($this->System)->UnregisterPage(['']);
+    Core::Cast($this->System)->UnregisterPage(['setup']);
+  }
+
+  function CheckState(): bool
+  {
+    return $this->Database->Connected() and $this->UpdateManager->IsInstalled() and
+      $this->UpdateManager->IsUpToDate();
+  }
+
+  function DoUpgrade(): string
+  {
+    $Updates = new Updates();
+    $this->UpdateManager->Trace = $Updates->Get();
+    $Output = $this->UpdateManager->Upgrade();
+    return $Output;
+  }
+
+  function InsertSampleData(): void
+  {
+  }
+}
 
 class PageSetup extends Page
@@ -111 +176 @@
         {
           $Output .= '<h3>Instalace systém</h3>';
+          global $DatabaseRevision;
+
+          $this->Database->query("CREATE TABLE IF NOT EXISTS `".$this->UpdateManager->VersionTable."` (".
+            '`Id` int(11) NOT NULL AUTO_INCREMENT, '.
+            '`Revision` int(11) NOT NULL, '.
+            'PRIMARY KEY (`Id`) '.
+            ') ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+          $DbResult = $this->Database->select($this->UpdateManager->VersionTable, 'Id');
+          if ($DbResult->num_rows == 0)
+          {
+            $this->Database->query("INSERT INTO `".$this->UpdateManager->VersionTable.
+              "` (`Id`, `Revision`) VALUES (1, ".$DatabaseRevision.");");
+          }
           $this->System->ModuleManager->InstallAll(array(ModuleCondition::System));
           $this->System->ModuleManager->LoadModules();
@@ -121 +199 @@
           $Output .= '<h3>Odinstalace vše</h3>';
           $this->System->ModuleManager->UninstallAll(array(ModuleCondition::System));
+          $this->Database->query('DROP TABLE IF EXISTS `'.$this->UpdateManager->VersionTable.'`');
           $Output .= $this->ControlPanel();
         }
@@ -296 +375 @@
   }
 }
-
-class ModuleSetup extends AppModule
-{
-  public UpdateManager $UpdateManager;
-
-  function __construct(System $System)
-  {
-    global $DatabaseRevision;
-
-    parent::__construct($System);
-    $this->Name = 'Setup';
-    $this->Version = '1.0';
-    $this->Creator = 'Chronos';
-    $this->License = 'GNU/GPLv3';
-    $this->Description = 'Base setup module';
-    $this->Dependencies = array();
-    $this->Revision = 1;
-    $this->Type = ModuleType::System;
-
-    // Check database persistence structure
-    $this->UpdateManager = new UpdateManager();
-    $this->UpdateManager->Database = &$this->Database;
-    $this->UpdateManager->Revision = $DatabaseRevision;
-    $this->UpdateManager->InstallMethod = 'FullInstall';
-  }
-
-  static function Cast(AppModule $AppModule): ModuleSetup
-  {
-    if ($AppModule instanceof ModuleSetup)
-    {
-      return $AppModule;
-    }
-    throw new Exception('Expected ModuleSetup type but '.gettype($AppModule));
-  }
-
-  function DoStart(): void
-  {
-    Core::Cast($this->System)->RegisterPage([''], 'PageSetupRedirect');
-    Core::Cast($this->System)->RegisterPage(['setup'], 'PageSetup');
-  }
-
-  function DoStop(): void
-  {
-    unset($this->UpdateManager);
-    Core::Cast($this->System)->UnregisterPage(['']);
-    Core::Cast($this->System)->UnregisterPage(['setup']);
-  }
-
-  function CheckState(): bool
-  {
-    return $this->Database->Connected() and $this->UpdateManager->IsInstalled() and
-      $this->UpdateManager->IsUpToDate();
-  }
-
-  function DoUpgrade(): string
-  {
-    $Updates = new Updates();
-    $this->UpdateManager->Trace = $Updates->Get();
-    $Output = $this->UpdateManager->Upgrade();
-    return $Output;
-  }
-}