Fix META_SOURCES options inheritance for parent/child workspaces: new…

… AJXP_AbstractMetaSource abstract class from which all meta/index/metastore plugins must extend. Typical case is updating the quota on a workspace and seeing shared folders correctly updated.
pydio · Sep 10, 2014 · bd2f014 · bd2f014
1 parent e44641b
commit bd2f014
Show file tree

Hide file tree

Showing 18 changed files with 101 additions and 108 deletions.
diff --git a/core/src/core/classes/class.AJXP_AbstractMetaSource.php b/core/src/core/classes/class.AJXP_AbstractMetaSource.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <http://pyd.io/>.
+ */
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+abstract class AJXP_AbstractMetaSource extends AJXP_Plugin {
+
+    /**
+     * @var AbstractAccessDriver
+     */
+    protected $accessDriver;
+
+    /**
+     *
+     * @param AbstractAccessDriver $accessDriver
+     */
+    public function initMeta($accessDriver){
+
+        $this->accessDriver = $accessDriver;
+        // Override options with parent META SOURCE options
+        // Could be refined ?
+        if($this->accessDriver->repository->hasParent()){
+            $parentRepo = ConfService::getRepositoryById($this->accessDriver->repository->getParentId());
+            if($parentRepo != null){
+                $sources = $parentRepo->getOption("META_SOURCES");
+                $qParent = $sources["meta.quota"];
+                $this->options = array_merge($this->options, $qParent);
+            }
+        }
+
+    }
+
+} 
diff --git a/core/src/plugins/index.elasticsearch/class.AjxpElasticSearch.php b/core/src/plugins/index.elasticsearch/class.AjxpElasticSearch.php
@@ -47,18 +47,14 @@ function __autoload_elastica ($class)
  * @property Elastica\Index $currentIndex
  * @property Elastica\Type $currentType
  */
-class AjxpElasticSearch extends AJXP_Plugin
+class AjxpElasticSearch extends AJXP_AbstractMetaSource
 {
     private $client;
     private $currentIndex;
     private $currentType;
     private $nextId;
     private $lastIdPath;
 
-    /**
-     * @var AbstractAccessDriver
-     */
-    private $accessDriver;
     private $metaFields = array();
     private $indexContent = false;
     private $specificId = "";
@@ -85,7 +81,7 @@ public function init($options)
 
     public function initMeta($accessDriver)
     {
-        $this->accessDriver = $accessDriver;
+        parent::initMeta($accessDriver);
         if (!empty($this->metaFields) || $this->indexContent) {
             $metaFields = $this->metaFields;
             $el = $this->xPath->query("/indexer")->item(0);

diff --git a/core/src/plugins/index.lucene/class.AjxpLuceneIndexer.php b/core/src/plugins/index.lucene/class.AjxpLuceneIndexer.php
@@ -26,13 +26,9 @@
  * @package AjaXplorer_Plugins
  * @subpackage Index
  */
-class AjxpLuceneIndexer extends AJXP_Plugin
+class AjxpLuceneIndexer extends AJXP_AbstractMetaSource
 {
     private $currentIndex;
-    /**
-     * @var AbstractAccessDriver
-     */
-    private $accessDriver;
     private $metaFields = array();
     private $indexContent = false;
     private $specificId = "";
@@ -55,7 +51,7 @@ public function init($options)
 
     public function initMeta($accessDriver)
     {
-        $this->accessDriver = $accessDriver;
+        parent::initMeta($accessDriver);
         if (!empty($this->metaFields) || $this->indexContent) {
             $metaFields = $this->metaFields;
             $el = $this->xPath->query("/indexer")->item(0);

diff --git a/core/src/plugins/meta.comments/class.CommentsMetaManager.php b/core/src/plugins/meta.comments/class.CommentsMetaManager.php
@@ -1,20 +1,27 @@
 <?php
-/**
- * Created by JetBrains PhpStorm.
- * User: admin
- * Date: 11/09/13
- * Time: 11:14
- * To change this template use File | Settings | File Templates.
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <http://pyd.io/>.
  */
-
 define("AJXP_META_SPACE_COMMENTS", "AJXP_META_SPACE_COMMENTS");
 
-class CommentsMetaManager extends AJXP_Plugin
+class CommentsMetaManager extends AJXP_AbstractMetaSource
 {
-    /**
-     * @var AbstractAccessDriver
-     */
-    private $accessDriver;
     /**
      * @var MetaStoreProvider
      */
@@ -28,7 +35,7 @@ class CommentsMetaManager extends AJXP_Plugin
 
     public function initMeta($accessDriver)
     {
-        $this->accessDriver = $accessDriver;
+        parent::initMeta($accessDriver);
         $feed = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("feed");
         if ($feed) {
             $this->storageMode = "FEED";

diff --git a/core/src/plugins/meta.exif/class.ExifMetaManager.php b/core/src/plugins/meta.exif/class.ExifMetaManager.php
@@ -26,9 +26,8 @@
  * @package AjaXplorer_Plugins
  * @subpackage Meta
  */
-class ExifMetaManager extends AJXP_Plugin
+class ExifMetaManager extends AJXP_AbstractMetaSource
 {
-    protected $accessDriver;
     protected $metaDefinitions;
 
     public function init($options)
@@ -45,7 +44,7 @@ public function performChecks()
 
     public function initMeta($accessDriver)
     {
-        $this->accessDriver = $accessDriver;
+        parent::initMeta($accessDriver);
         if(!function_exists("exif_read_data")) return ;
         //$messages = ConfService::getMessages();
         $def = $this->getMetaDefinition();

diff --git a/core/src/plugins/meta.filehasher/class.FileHasher.php b/core/src/plugins/meta.filehasher/class.FileHasher.php
@@ -26,9 +26,8 @@
  * @package AjaXplorer_Plugins
  * @subpackage Meta
  */
-class FileHasher extends AJXP_Plugin
+class FileHasher extends AJXP_AbstractMetaSource
 {
-    protected $accessDriver;
     const METADATA_HASH_NAMESPACE = "file_hahser";
     /**
     * @var MetaStoreProvider
@@ -83,7 +82,7 @@ public function parseSpecificContributions(&$contribNode)
 
     public function initMeta($accessDriver)
     {
-        $this->accessDriver = $accessDriver;
+        parent::initMeta($accessDriver);
         $store = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("metastore");
         if ($store === false) {
             throw new Exception("The 'meta.simple_lock' plugin requires at least one active 'metastore' plugin");

diff --git a/core/src/plugins/meta.git/class.GitManager.php b/core/src/plugins/meta.git/class.GitManager.php
@@ -26,7 +26,7 @@
  * @package AjaXplorer_Plugins
  * @subpackage Meta
  */
-class GitManager extends AJXP_Plugin
+class GitManager extends AJXP_AbstractMetaSource
 {
 
     private $repoBase;
@@ -45,6 +45,7 @@ public function performChecks()
      */
     public function initMeta($accessDriver)
     {
+        parent::initMeta($accessDriver);
         require_once("VersionControl/Git.php");
         $repo = $accessDriver->repository;
         $this->repoBase = $repo->getOption("PATH");

diff --git a/core/src/plugins/meta.monitor_fs/class.FSMonitoringManager.php b/core/src/plugins/meta.monitor_fs/class.FSMonitoringManager.php
@@ -26,7 +26,7 @@
  * @package AjaXplorer_Plugins
  * @subpackage Meta
  */
-class FSMonitoringManager extends AJXP_Plugin
+class FSMonitoringManager extends AJXP_AbstractMetaSource
 {
     private $repoBase;
 
@@ -35,6 +35,7 @@ class FSMonitoringManager extends AJXP_Plugin
      */
     public function initMeta($accessDriver)
     {
+        parent::initMeta($accessDriver);
         $repo = $accessDriver->repository;
         $this->repoBase = $repo->getOption("PATH");
     }

diff --git a/core/src/plugins/meta.mount/class.FilesystemMounter.php b/core/src/plugins/meta.mount/class.FilesystemMounter.php
@@ -27,13 +27,8 @@
  * @subpackage Meta
  *
  */
-class FilesystemMounter extends AJXP_Plugin
+class FilesystemMounter extends AJXP_AbstractMetaSource
 {
-    /**
-     * @var AbstractAccessDriver
-     */
-    protected $accessDriver;
-
     /**
      * @var Repository
      */
@@ -56,7 +51,7 @@ public function beforeInitMeta($accessDriver, $repository)
      */
     public function initMeta($accessDriver)
     {
-        $this->accessDriver = $accessDriver;
+        parent::initMeta($accessDriver);
         $this->repository = $this->accessDriver->repository;
         /*
         if($this->isAlreadyMounted()) return;

diff --git a/core/src/plugins/meta.quota/class.QuotaComputer.php b/core/src/plugins/meta.quota/class.QuotaComputer.php
@@ -26,7 +26,7 @@
  * @package AjaXplorer_Plugins
  * @subpackage Meta
  */
-class QuotaComputer extends AJXP_Plugin
+class QuotaComputer extends AJXP_AbstractMetaSource
 {
     /**
      * @var AbstractAccessDriver
@@ -41,11 +41,6 @@ class QuotaComputer extends AJXP_Plugin
      */
     protected $mailer;
 
-    public function initMeta($accessDriver)
-    {
-        $this->accessDriver = $accessDriver;
-    }
-
     protected function getWorkingPath()
     {
         $repo = $this->accessDriver->repository;

diff --git a/core/src/plugins/meta.simple_lock/class.SimpleLockManager.php b/core/src/plugins/meta.simple_lock/class.SimpleLockManager.php
@@ -26,24 +26,20 @@
  * @package AjaXplorer_Plugins
  * @subpackage Meta
  */
-class SimpleLockManager extends AJXP_Plugin
+class SimpleLockManager extends AJXP_AbstractMetaSource
 {
-    /**
-     * @var AbstractAccessDriver
-     */
-    protected $accessDriver;
     const METADATA_LOCK_NAMESPACE = "simple_lock";
     /**
     * @var MetaStoreProvider
     */
     protected $metaStore;
 
-       public function initMeta($accessDriver)
-       {
-           $this->accessDriver = $accessDriver;
+    public function initMeta($accessDriver)
+    {
+        parent::initMeta($accessDriver);
         $store = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("metastore");
         if ($store === false) {
-           throw new Exception("The 'meta.simple_lock' plugin requires at least one active 'metastore' plugin");
+            throw new Exception("The 'meta.simple_lock' plugin requires at least one active 'metastore' plugin");
         }
         $this->metaStore = $store;
         $this->metaStore->initMeta($accessDriver);

diff --git a/core/src/plugins/meta.svn/class.SvnManager.php b/core/src/plugins/meta.svn/class.SvnManager.php
@@ -29,14 +29,12 @@
  * @package AjaXplorer_Plugins
  * @subpackage Meta
  */
-class SvnManager extends AJXP_Plugin
+class SvnManager extends AJXP_AbstractMetaSource
 {
     private static $svnListDir;
     private static $svnListCache;
     private $commitMessageParams;
 
-    protected $accessDriver;
-
     public function init($options)
     {
         $this->options = $options;
@@ -46,10 +44,8 @@ public function init($options)
     public function initMeta($accessDriver)
     {
         require_once("svn_lib.inc.php");
-
-        $this->accessDriver = $accessDriver;
+        parent::initMeta($accessDriver);
         parent::init($this->options);
-
     }
 
     protected function initDirAndSelection($httpVars, $additionnalPathes = array(), $testRecycle = false)

diff --git a/core/src/plugins/meta.syncable/class.ChangesTracker.php b/core/src/plugins/meta.syncable/class.ChangesTracker.php
@@ -26,12 +26,8 @@
  * @package AjaXplorer_Plugins
  * @subpackage Meta
  */
-class ChangesTracker extends AJXP_Plugin
+class ChangesTracker extends AJXP_AbstractMetaSource
 {
-    /**
-     * @var AbstractAccessDriver
-     */
-    protected $accessDriver;
     private $sqlDriver;
 
     public function init($options)
@@ -40,11 +36,6 @@ public function init($options)
         parent::init($options);
     }
 
-    public function initMeta($accessDriver)
-    {
-        $this->accessDriver = $accessDriver;
-    }
-
     public function switchActions($actionName, $httpVars, $fileVars)
     {
         if($actionName != "changes" || !isSet($httpVars["seq_id"])) return false;

diff --git a/core/src/plugins/meta.user/class.UserMetaManager.php b/core/src/plugins/meta.user/class.UserMetaManager.php
@@ -27,12 +27,8 @@
  * @package AjaXplorer_Plugins
  * @subpackage Meta
  */
-class UserMetaManager extends AJXP_Plugin
+class UserMetaManager extends AJXP_AbstractMetaSource
 {
-    /**
-     * @var AbstractAccessDriver
-     */
-    protected $accessDriver;
     /**
      * @var MetaStoreProvider
      */
@@ -48,7 +44,7 @@ public function init($options)
 
     public function initMeta($accessDriver)
     {
-        $this->accessDriver = $accessDriver;
+        parent::initMeta($accessDriver);
 
         $store = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("metastore");
         if ($store === false) {