Changeset 895 for trunk/Packages/Common/AppModule.php

Timestamp:

Jan 12, 2021, 10:29:50 PM (4 years ago)

Author:

chronos

Message:

• Modified: Setup is now AppModule and it is installed and stated as first module.
• Modified: Improved modular system.

File:

• trunk/Packages/Common/AppModule.php (modified) (21 diffs)

trunk/Packages/Common/AppModule.php

@@ -32 +32 @@
   const Running = 5;
   const NotRunning = 6;
+  const System = 7;
+  const User = 8;
 }
 
@@ -55 +57 @@
   public $OnChange;
   public array $Models;
+  public bool $SystemModule;
 
   function __construct(Application $System)
@@ -71 +74 @@
     $this->Type = ModuleType::Normal;
     $this->Models = array();
+    $this->SystemModule = false;
   }
 
@@ -84 +88 @@
     $this->Manager->EnumDependenciesCascade($this, $List, array(ModuleCondition::NotInstalled));
     $this->Manager->Perform($List, array(ModuleAction::Install), array(ModuleCondition::NotInstalled));
+    $this->DoBeforeInstall();
     $this->InstallModels();
     $this->DoInstall();
     $this->Installed = true;
+    $this->Enabled = true; // Automatically enable installed module
     $this->InstalledVersion = $this->Version;
     $this->Manager->Modules[$this->Name] = $this;
@@ -101 +107 @@
     $this->DoUninstall();
     $this->UninstallModels();
+    $this->DoAfterUninstall();
   }
 
@@ -175 +182 @@
   }
 
+  protected function DoBeforeInstall(): void
+  {
+  }
+
   protected function DoInstall(): void
   {
@@ -183 +194 @@
   }
 
-  protected function DoUpgrade(): void
-  {
+  protected function DoAfterUninstall(): void
+  {
+  }
+
+  protected function DoUpgrade(): string
+  {
+    return '';
   }
 
@@ -194 +210 @@
   function InstallModels(): void
   {
-    foreach ($this->GetModels() as $Model)
-    {
-      $this->InstallModel($Model::GetDesc());
+    if ($this->Manager->OnInstallModel != null)
+    {
+      foreach ($this->GetModels() as $Model)
+      {
+        call_user_func($this->Manager->OnInstallModel, $Model::GetDesc());
+      }
     }
   }
@@ -202 +221 @@
   function UninstallModels(): void
   {
-    foreach (array_reverse($this->GetModels()) as $Model)
-    {
-      $this->UninstallModel($Model::GetDesc());
-    }
-  }
-
-  function InstallModel(ModelDesc $ModelDesc)
-  {
-    $Query = "CREATE TABLE IF NOT EXISTS `".$ModelDesc->Name."` (\n";
-    $Query .= '  `'.$ModelDesc->PrimaryKey.'` int(11) NOT NULL AUTO_INCREMENT,'."\n";
-    foreach ($ModelDesc->Columns as $Column)
-    {
-      $Query .= "  `".$Column->Name."` ";
-      if ($Column->Type == ModelColumnType::Integer) $Query .= 'int(11)';
-      else if ($Column->Type == ModelColumnType::String) $Query .= 'varchar(255)';
-      else if ($Column->Type == ModelColumnType::Float) $Query .= 'varchar(255)';
-      else if ($Column->Type == ModelColumnType::Text) $Query .= 'text';
-      else if ($Column->Type == ModelColumnType::DateTime) $Query .= 'datetime';
-      else if ($Column->Type == ModelColumnType::Reference) $Query .= 'int(11)';
-      else if ($Column->Type == ModelColumnType::Boolean) $Query .= 'tinyint(1)';
-      else if ($Column->Type == ModelColumnType::Date) $Query .= 'date';
-      else if ($Column->Type == ModelColumnType::BigInt) $Query .= 'bigint(20)';
-      else if ($Column->Type == ModelColumnType::Enum)
-      {
-        $Query .= 'enum("'.implode('", "', $Column->States).'")';
-      }
-
-      if ($Column->Nullable) $Query .= '';
-        else $Query .= ' NOT NULL';
-
-      $Query .= ' COLLATE utf8_general_ci';
-
-      if ($Column->HasDefault)
-      {
-        if ($Column->Default == null)
-          $Query .= ' DEFAULT NULL';
-        $Query .= ' DEFAULT '.$Column->GetDefault();
-      }
-      $Query .= ",\n";
-    }
-    $Query .= '  PRIMARY KEY (`'.$ModelDesc->PrimaryKey.'`)';
-    foreach ($ModelDesc->Columns as $Column)
-    {
-      if ($Column->Type == ModelColumnType::Reference)
-        $Query .= ','."\n".'  KEY `'.$Column->Name.'` (`'.$Column->Name.'`)';
-      else if ($Column->Unique)
-        $Query .= ','."\n".'  UNIQUE KEY `'.$Column->Name.'` (`'.$Column->Name.'`)';
-    }
-    $Query .= "\n";
-
-    if ($ModelDesc->Memory) $Engine = 'MEMORY';
-      else $Engine = 'InnoDB';
-    $Query .= ') ENGINE='.$Engine.' DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;';
-    $I = 1;
-    foreach ($ModelDesc->Columns as $Column)
-    {
-      if ($Column->Type == ModelColumnType::Reference)
-        $Query .= "ALTER TABLE `".$ModelDesc->Name."` ".
-        "ADD CONSTRAINT `".$ModelDesc->Name."_ibfk_".$I."` FOREIGN KEY (`".$Column->Name."`) REFERENCES `".$Column->RefTable."` (`Id`);";
-      $I++;
-    }
-    $this->Database->query($Query);
-  }
-
-  function UninstallModel(ModelDesc $ModelDesc)
-  {
-    $this->Database->query('DROP TABLE IF EXISTS `'.$ModelDesc->Name.'`');
+    if ($this->Manager->OnUninstallModel != null)
+    {
+      foreach (array_reverse($this->GetModels()) as $Model)
+      {
+        call_user_func($this->Manager->OnUninstallModel, $Model::GetDesc());
+      }
+    }
   }
 }
@@ -280 +239 @@
   public string $ModulesDir;
   public $OnLoadModules;
+  public $OnInstallModel;
+  public $OnUninstsallModel;
 
   function __construct(System $System)
@@ -287 +248 @@
     $this->FileName = dirname(__FILE__).'/../../Config/ModulesConfig.php';
     $this->ModulesDir = dirname(__FILE__).'/../../Modules';
+    $this->OnInstallModel = null;
+    $this->OnUninstallModel = null;
   }
 
   function Perform(array $List, array $Actions, array $Conditions = array(ModuleCondition::All)): void
   {
-    foreach ($List as $Index => $Module)
+    foreach ($List as $Module)
     {
       if (in_array(ModuleCondition::All, $Conditions) or
@@ -299 +262 @@
         (!$Module->Installed and in_array(ModuleCondition::NotInstalled, $Conditions)) or
         ($Module->Enabled and in_array(ModuleCondition::Enabled, $Conditions)) or
-        (!$Module->Enabled and in_array(ModuleCondition::NotEnabled, $Conditions)))
+        (!$Module->Enabled and in_array(ModuleCondition::NotEnabled, $Conditions)) or
+        ($Module->SystemModule and in_array(ModuleCondition::System, $Conditions)) or
+        (!$Module->SystemModule and in_array(ModuleCondition::User, $Conditions)))
       {
         foreach ($Actions as $Action)
@@ -328 +293 @@
         (!$DepModule->Enabled and in_array(ModuleCondition::NotEnabled, $Conditions)) or
         ($DepModule->Installed and in_array(ModuleCondition::Installed, $Conditions)) or
-        (!$DepModule->Installed and in_array(ModuleCondition::NotInstalled, $Conditions)))
+        (!$DepModule->Installed and in_array(ModuleCondition::NotInstalled, $Conditions)) or
+        ($DepModule->SystemModule and in_array(ModuleCondition::System, $Conditions)) or
+        (!$DepModule->SystemModule and in_array(ModuleCondition::User, $Conditions)))
       {
         array_push($List, $DepModule);
@@ -347 +314 @@
           (!$RefModule->Enabled and in_array(ModuleCondition::NotEnabled, $Conditions)) or
           ($RefModule->Installed and in_array(ModuleCondition::Installed, $Conditions)) or
-          (!$RefModule->Installed and in_array(ModuleCondition::NotInstalled, $Conditions))))
-      {
+          (!$RefModule->Installed and in_array(ModuleCondition::NotInstalled, $Conditions)) or
+          ($RefModule->SystemModule and in_array(ModuleCondition::System, $Conditions)) or
+          (!$RefModule->SystemModule and in_array(ModuleCondition::User, $Conditions))))
+        {
         array_push($List, $RefModule);
         $this->EnumSuperiorDependenciesCascade($RefModule, $List, $Conditions);
@@ -357 +326 @@
   function Start(): void
   {
-    $this->LoadModules();
-    if (file_exists($this->FileName)) $this->LoadState();
-    $this->StartEnabled();
+    $ModuleSetup = $this->LoadModule(dirname(__FILE__).'/Setup.php');
+    $this->LoadState();
+    if (!$ModuleSetup->Installed)
+    {
+      $ModuleSetup->Install();
+      $this->SaveState();
+    }
+    $ModuleSetup->Start();
+    if (ModuleSetup::Cast($ModuleSetup)->CheckState())
+    {
+      $this->LoadModules();
+      if (file_exists($this->FileName)) $this->LoadState();
+      $this->InstallSystem();
+      $this->StartSystem();
+      $this->StartEnabled();
+    }
   }
 
@@ -370 +352 @@
   {
     $this->Perform($this->Modules, array(ModuleAction::Start), array(ModuleCondition::Enabled));
+  }
+
+  function StartSystem(): void
+  {
+    $this->Perform($this->Modules, array(ModuleAction::Start), array(ModuleCondition::System));
   }
 
@@ -383 +370 @@
   }
 
+  function InstallSystem(): void
+  {
+    $this->Perform($this->Modules, array(ModuleAction::Install), array(ModuleCondition::System));
+    $this->SaveState();
+  }
+
   function UninstallAll(): void
   {
@@ -425 +418 @@
     foreach ($this->Modules as $Module)
     {
-      //DebugLog($Module->Name.' '.$Module->Id);
       if ($Module->Id == $Id) return $Module->Name;
     }
@@ -452 +444 @@
     foreach ($this->Modules as $Module)
     {
-      $Data[] = array('Name' => $Module->Name, 'Enabled' => $Module->Enabled,
-        'Version' => $Module->Version, 'Installed' => $Module->Installed);
+      $Data[] = array(
+        'Name' => $Module->Name,
+        'Enabled' => $Module->Enabled,
+        'Version' => $Module->Version,
+        'Installed' => $Module->Installed
+      );
     }
     if (file_put_contents($this->FileName, "<?php \n\n\$ConfigModules = ".var_export($Data, true).";\n") === FALSE)
@@ -473 +469 @@
   }
 
+  function LoadModule(string $FileName): AppModule
+  {
+    include_once($FileName);
+    $ModuleName = 'Module'.pathinfo($FileName, PATHINFO_FILENAME);
+    $Module = new $ModuleName($this->System);
+    $this->RegisterModule($Module);
+    return $Module;
+  }
+
   function LoadModulesFromDir(string $Directory): void
   {
@@ -480 +485 @@
       if (is_dir($Directory.'/'.$Item) and ($Item != '.') and ($Item != '..') and ($Item != '.svn'))
       {
-        include_once($Directory.'/'.$Item.'/'.$Item.'.php');
-        $ModuleName = 'Module'.$Item;
-        $this->RegisterModule(new $ModuleName($this->System));
+        $this->LoadModule($Directory.'/'.$Item.'/'.$Item.'.php');
       }
     }