Changeset 593 for trunk/Common/AppModule.php

Timestamp:

Nov 2, 2013, 11:00:41 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Nastavení modulů je uloženo v adresáři Config, který musí povolen být pro zápis.
• Upraveno: Instalace modulů nebude probíhat složitě z repozitáře, ale bude se udržovat jeden seznam modulů a nastavovat přímo příznak Installed.
• Přidáno: Zprovozněno ruční ovládání instalace, odinstalace, povolení, zákázání a povýšení jednotlivých modulů.

File:

• trunk/Common/AppModule.php (modified) (14 diffs)

trunk/Common/AppModule.php

@@ -1 +1 @@
 <?php
+
+/* This implementation will not support installation from remote source. Just 
+ * installation of already presented modules mainly to persistence preparation.
+ */
 
 class ModuleType
@@ -37 +41 @@
   var $License; 
   var $Creator;
+  var $HomePage;
   var $Description;
+  var $Running;
+  var $Enabled;
   var $Installed;
   var $InstalledVersion;
-  var $Running;
-  var $Enabled;
   /** @var ModuleType */
   var $Type;
@@ -49 +54 @@
   /** @var System */
   var $System;
-  /** @var ModularSystem */
+  /** @var AppModuleManager */
   var $Manager;
   var $OnChange;
   
-  function __construct($System)
+  function __construct(System $System)
   {
     $this->System = &$System;
     $this->Database = &$System->Database;
     $this->Installed = false;
+    $this->Enabled = false;
+    $this->Running = false;
     $this->Dependencies = array();
     $this->Type = ModuleType::Normal;
@@ -70 +77 @@
     $this->DoInstall();
         $this->Installed = true;
+        $this->InstalledVersion = $this->Version;
         $this->Manager->Modules[$this->Name] = $this;
   }
@@ -78 +86 @@
     $this->Stop();
     $this->Installed = false;
-    unset($this->Manager->Modules[$this->Name]);
     $List = array();
     $this->Manager->EnumSuperiorDependenciesCascade($this, $List, array(ModuleCondition::Installed));
     $this->Manager->Perform($List, array(ModuleAction::Uninstall), array(ModuleCondition::Installed));
     $this->DoUninstall();
+  }
+  
+  function Upgrade()
+  {
+    if(!$this->Installed) return;
+    $List = array();
+    $this->Manager->EnumSuperiorDependenciesCascade($this, $List, array(ModuleCondition::Installed));
+    $this->Manager->Perform($List, array(ModuleAction::Upgrade), array(ModuleCondition::Installed));
+    $this->DoUpgrade();
   }
   
@@ -161 +177 @@
   var $Modules;
   var $System;
-  var $Repository;
   var $FileName;
-  
-  function __construct($System)
+  var $OnLoadModules;
+  
+  function __construct(System $System)
   {
     $this->Modules = array();
     $this->System = &$System;
-    $this->Repository = new AppModuleRepository($System); 
-    $this->Repository->Manager = $this;
-    $this->FileName = 'Config.php';     
+    $this->FileName = 'Config/Modules.php';     
   }
   
@@ -203 +217 @@
     {
       $DepModule = $this->Modules[$Dependency];
-       if(in_array(ModuleCondition::All, $Conditions) or
+      if(in_array(ModuleCondition::All, $Conditions) or
         ($Module->Running and in_array(ModuleCondition::Running, $Conditions)) or
         (!$Module->Running and in_array(ModuleCondition::NotRunning, $Conditions)) or
+        ($Module->Enabled and in_array(ModuleCondition::Enabled, $Conditions)) or
+        (!$Module->Enabled and in_array(ModuleCondition::NotEnabled, $Conditions)) or
         ($Module->Installed and in_array(ModuleCondition::Installed, $Conditions)) or
         (!$Module->Installed and in_array(ModuleCondition::NotInstalled, $Conditions)))
@@ -224 +240 @@
           ($Module->Running and in_array(ModuleCondition::Running, $Conditions)) or
           (!$Module->Running and in_array(ModuleCondition::NotRunning, $Conditions)) or
+          ($Module->Enabled and in_array(ModuleCondition::Enabled, $Conditions)) or
+          (!$Module->Enabled and in_array(ModuleCondition::NotEnabled, $Conditions)) or
           ($Module->Installed and in_array(ModuleCondition::Installed, $Conditions)) or
           (!$Module->Installed and in_array(ModuleCondition::NotInstalled, $Conditions))))
@@ -235 +253 @@
   function Start()
   {
-    $this->Repository->LoadModules();
-    $this->Load();
+    $this->LoadModules();
+    if(file_exists($this->FileName)) $this->LoadState();
     $this->StartEnabled();
   }
@@ -271 +289 @@
   }
   
-  function Load()
+  function LoadState()
   {
     include($this->FileName);
-    $this->Modules = array();
     foreach($ConfigModules as $Mod)
     {
-      if(array_key_exists($Mod['Name'], $this->Repository->Modules))
-      {
-        $this->Modules[$Mod['Name']] = $this->Repository->Modules[$Mod['Name']];
+      if(array_key_exists($Mod['Name'], $this->Modules))
+      {
+        $this->Modules[$Mod['Name']] = $this->Modules[$Mod['Name']];
         $this->Modules[$Mod['Name']]->Enabled = $Mod['Enabled'];
-        $this->Modules[$Mod['Name']]->Version = $Mod['Version'];
+        $this->Modules[$Mod['Name']]->Installed = $Mod['Installed'];
+        $this->Modules[$Mod['Name']]->InstalledVersion = $Mod['Version'];
       }  
     }
   }
   
-  function Save()
+  function SaveState()
   {
     $Data = array();
@@ -292 +310 @@
     {
       $Data[] = array('Name' => $Module->Name, 'Enabled' => $Module->Enabled, 
-        'Version' => $Module->Version);
-    }
-    file_put_contents($this->FileName, "<?php \n\n\$ConfigModules = ".var_export($Data).";\n");
-  }
-}
-
-/* Manager available modules for installation */
-class AppModuleRepository
-{
-  var $Modules;
-  var $System;
-  var $Manager;
-  var $OnLoadModules;
-  
-  function __construct($System)
-  {
-    $this->Modules = array();
-    $this->System = &$System;      
+        'Version' => $Module->Version, 'Installed' => $Module->Installed);
+    }
+    file_put_contents($this->FileName, "<?php \n\n\$ConfigModules = ".var_export($Data, true).";\n");
   }
   
   function RegisterModule(AppModule $Module)
   {
-    $this->Modules[$Module->Name] = &$Module;  
-    $Module->Manager = &$this->Manager;
+    $this->Modules[$Module->Name] = &$Module;
+    $Module->Manager = &$this;
     $Module->OnChange = &$this->OnModuleChange;
   }
@@ -321 +324 @@
   function UnregisterModule($Module)
   {
-    unset($this->Modules[array_search($Module, $this->Modules)]);  
-  }
-
+    unset($this->Modules[array_search($Module, $this->Modules)]);
+  }
+  
   function LoadModulesFromDir($Directory)
   {
@@ -331 +334 @@
       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));
+        include_once($Directory.'/'.$Item.'/'.$Item.'.php');
+        $ModuleName = 'Module'.$Item;
+        $this->RegisterModule(new $ModuleName($this->System));
       }
     }
@@ -341 +344 @@
   {
     if(method_exists($this->OnLoadModules[0], $this->OnLoadModules[1]))
-                $this->OnLoadModules();
+      $this->OnLoadModules();
     else $this->LoadModulesFromDir(dirname(__FILE__).'/../Modules');
   }