ENH: refs #0377. Add a non-filtered getSize method to folder model

This will allow the quota module to find out how much space is actually
being used under a given root folder.

Author: zachmullen

core/models/base/FolderModelBase.php

@@ -67,6 +67,7 @@ abstract function getByUuid($uuid);
   abstract function getRoot($folder);
   abstract function getAll();
   abstract function isDeleteable($folder);
+  abstract function getSize($folder);
 
   /** Increment the view count */
   function incrementViewCount($folder)

core/models/pdo/FolderModel.php

@@ -103,7 +103,7 @@ function policyCheck($folderDao, $userDao = null, $policy = 0)
     return true;
     }//end policyCheck
 
-/** get the size and the number of item in a folder*/
+  /** get the size and the number of item in a folder*/
   public function getSizeFiltered($folders, $userDao = null, $policy = 0)
     {
     $isAdmin = false;
@@ -214,6 +214,37 @@ public function getSizeFiltered($folders, $userDao = null, $policy = 0)
     return $folders;
     }
 
+  /** get the total size for a folder (with no filtered results) */
+  public function getSize($folder)
+    {
+    if(!$folder instanceof FolderDao)
+      {
+      throw new Zend_Exception("Should be a folder");
+      }
+    $folders = $this->database->select()
+                    ->setIntegrityCheck(false)
+                    ->from(array('f' => 'folder'), array('folder_id'))
+                    ->where('left_indice > ?', $folder->getLeftIndice())
+                    ->where('right_indice < ?', $folder->getRightIndice());
+
+    $sql = $this->database->select()
+                ->distinct()
+                ->setIntegrityCheck(false)
+                ->from(array('i' => 'item'))
+                ->join(array('i2f' => 'item2folder'),
+                  '( '.$this->database->getDB()->quoteInto('i2f.folder_id IN (?)', $folders).'
+                  OR i2f.folder_id = '.$folder->getKey().'
+                  )
+                  AND i2f.item_id = i.item_id', array());
+
+    $sql = $this->database->select()
+                ->setIntegrityCheck(false)
+                ->from(array('i' => $sql), array('sum' => 'sum(i.sizebytes)'));
+
+    $row = $this->database->fetchRow($sql);
+    return $row['sum'];
+    }
+
   /** Get the root folder */
   function getRoot($folder)
     {

modules/sizequota/Notification.php

@@ -87,8 +87,7 @@ public function getSimpleuploadExtraHtml($args)
       }
     else
       {
-      $usedSpace = $folderModel->getSizeFiltered($rootFolder, $this->userSession->Dao, MIDAS_POLICY_READ);
-      $freeSpace = $quota->getQuota() - $usedSpace[0]->size;
+      $freeSpace = $quota->getQuota() - $folderModel->getSize($rootFolder);
       return '<div id="sizequotaFreeSpace" style="display:none;">'.$freeSpace.'</div>';
       }
     }

modules/sizequota/controllers/ConfigController.php

@@ -117,7 +117,7 @@ public function folderAction()
       $formArray['quota']->setValue($currentQuota->getQuota());
       $this->view->quota = $currentQuota->getQuota();
       }
-    $usedSpace = $this->Folder->getSizeFiltered($folder, $this->userSession->Dao);
+    $usedSpace = $this->Folder->getSize($folder);
     $this->view->usedSpace = $usedSpace[0]->size;
     $this->view->hUsedSpace = UtilityComponent::formatSize($this->view->usedSpace);
     if($this->view->quota == '')
@@ -189,8 +189,7 @@ public function getfreespaceAction()
       }
     else
       {
-      $usedSpace = $this->Folder->getSizeFiltered($rootFolder, $this->userSession->Dao, MIDAS_POLICY_READ);
-      $freeSpace = $quota->getQuota() - $usedSpace[0]->size;
+      $freeSpace = $quota->getQuota() - $this->Folder->getSize($rootFolder);
       }
     echo JsonComponent::encode(array('status' => true, 'freeSpace' => $freeSpace));
     }

modules/sizequota/controllers/components/ApiComponent.php

@@ -78,7 +78,7 @@ public function userGet($args)
       }
     $quotaModel = $modelLoader->loadModel('FolderQuota', 'sizequota');
     $quota = $quotaModel->getUserQuota($user);
-    $used = $folderModel->getSizeFiltered($user->getFolder(), $requestUser, MIDAS_POLICY_READ);
+    $used = $folderModel->getSize($user->getFolder());
     return array('quota' => $quota, 'used' => $used[0]->size);
     }
 
@@ -110,7 +110,7 @@ public function communityGet($args)
       }
     $quotaModel = $modelLoader->loadModel('FolderQuota', 'sizequota');
     $quota = $quotaModel->getCommunityQuota($comm);
-    $used = $folderModel->getSizeFiltered($comm->getFolder(), $requestUser, MIDAS_POLICY_READ);
+    $used = $folderModel->getSize($comm->getFolder());
     return array('quota' => $quota, 'used' => $used[0]->size);
     }
 

modules/sizequota/public/js/common/common.notify.js

@@ -42,7 +42,7 @@ midas.sizequota.resetTotal = function()
 midas.sizequota.folderChanged = function(args)
 {
   $.ajax({
-    type: "POST",
+    type: 'POST',
     url: json.global.webroot+'/sizequota/config/getfreespace',
     data: {folderId: args.folderId},
     success: function(jsonContent) {