Wrappers must declare isSeekable() to enable listing optimizations in…

… fsAccessDriver.
pydio · Dec 29, 2015 · c3f0f34 · c3f0f34
1 parent 86c2fb0
commit c3f0f34
Show file tree

Hide file tree

Showing 11 changed files with 122 additions and 9 deletions.
diff --git a/core/src/core/classes/class.AJXP_MetaStreamWrapper.php b/core/src/core/classes/class.AJXP_MetaStreamWrapper.php
@@ -185,6 +185,17 @@ public static function isRemote()
         throw new Exception("Do not call this method directly, but AJXP_MetaStreamWrapper::wrapperIsRemote() instead");
     }
 
+    /**
+     * Describe whether the current wrapper operates on a remote server or not.
+     * @static
+     * @return boolean
+     * @throws Exception
+     */
+    public static function isSeekable()
+    {
+        throw new Exception("Do not call this method directly, but AJXP_MetaStreamWrapper::wrapperIsSeekable() instead");
+    }
+
     /**
      * @param string $url
      * @return boolean
@@ -194,6 +205,15 @@ public static function wrapperIsRemote($url){
         return call_user_func(array(self::actualRepositoryWrapperClass($repositoryId), "isRemote"));
     }
 
+    /**
+     * @param string $url
+     * @return boolean
+     */
+    public static function wrapperIsSeekable($url){
+        $repositoryId = parse_url($url, PHP_URL_HOST);
+        return call_user_func(array(self::actualRepositoryWrapperClass($repositoryId), "isSeekable"));
+    }
+
     public static function nodesUseSameWrappers($url1, $url2){
         $w1 = self::actualRepositoryWrapperClass(parse_url($url1, PHP_URL_HOST));
         $w2 = self::actualRepositoryWrapperClass(parse_url($url2, PHP_URL_HOST));

diff --git a/core/src/core/classes/interface.AjxpWrapper.php b/core/src/core/classes/interface.AjxpWrapper.php
@@ -60,6 +60,14 @@ public static function changeMode($path, $chmodValue);
      */
     public static function isRemote();
 
+    /**
+     * Describe whether the current wrapper can rewind a stream or not.
+     * @static
+     * @abstract
+     * @return boolean
+     */
+    public static function isSeekable();
+
     /**
      *
      *

diff --git a/core/src/plugins/access.dropbox/class.dropboxWrapper.php b/core/src/plugins/access.dropbox/class.dropboxWrapper.php
@@ -288,4 +288,14 @@ public function stream_open($path, $mode, $options, &$opened_path)
         self::$crtHandle = fopen(self::$crtTmpFile, $mode);
         return true;
     }
+
+    /**
+     * Describe whether the current wrapper can rewind a stream or not.
+     * @static
+     * @return boolean
+     */
+    public static function isSeekable()
+    {
+        return true;
+    }
 }
diff --git a/core/src/plugins/access.fs/class.fsAccessDriver.php b/core/src/plugins/access.fs/class.fsAccessDriver.php
@@ -943,7 +943,17 @@ public function switchAction($action, $httpVars, $fileVars)
                     break;
                 }
 
-                $countFiles = $this->countFiles($path, !$lsOptions["f"]);
+                $streamIsSeekable = AJXP_MetaStreamWrapper::wrapperIsSeekable($path);
+
+                $sharedHandle = null;
+                if($streamIsSeekable){
+                    $handle = opendir($path);
+                    $sharedHandle = $handle;
+                }
+                $countFiles = $this->countFiles($path, !$lsOptions["f"], false, $sharedHandle);
+                if(isSet($sharedHandle)){
+                    rewind($handle);
+                }
                 if(isSet($crt_nodes)){
                     $crt_nodes += $countFiles;
                 }
@@ -981,28 +991,43 @@ public function switchAction($action, $httpVars, $fileVars)
                             "currentOrderDir"=> isSet($orderDirection)?$orderDirection:$defaultDirection
                         );
                     }
+                    $foldersCounts = $this->countFiles($path, TRUE, false, $sharedHandle);
+                    if(isSet($sharedHandle)) {
+                        rewind($sharedHandle);
+                    }
                     AJXP_XMLWriter::renderPaginationData(
                         $countFiles,
                         $crtPage,
                         $totalPages,
-                        $this->countFiles($path, TRUE),
+                        $foldersCounts,
                         $remoteOptions
                     );
                     if (!$lsOptions["f"]) {
                         AJXP_XMLWriter::close();
+                        if(isSet($sharedHandle)) {
+                            closedir($sharedHandle);
+                        }
                         break;
                     }
                 }
 
                 $cursor = 0;
-                $handle = opendir($path);
+                if(isSet($sharedHandle)){
+                    $handle = $sharedHandle;
+                }else{
+                    $handle = opendir($path);
+                }
                 if (!$handle) {
                     throw new AJXP_Exception("Cannot open dir ".$nonPatchedPath);
                 }
+                $nodes = array();
+                while(strlen($file = readdir($handle))>0){
+                    $nodes[] = $file;
+                }
                 closedir($handle);
                 $fullList = array("d" => array(), "z" => array(), "f" => array());
 
-                $nodes = scandir($path);
+                //$nodes = scandir($path);
                 $nodes = $this->orderNodes($nodes, $nonPatchedPath, $orderField, $orderDirection);
 
                 foreach ($nodes as $nodeName) {
@@ -1523,14 +1548,20 @@ public function readFile($filePathOrData, $headerType="plain", $localName="", $d
         }
     }
 
-    public function countFiles($dirName, $foldersOnly = false, $nonEmptyCheckOnly = false)
+    public function countFiles($dirName, $foldersOnly = false, $nonEmptyCheckOnly = false, $dirHANDLE = null)
     {
-        $handle=@opendir($dirName);
+        if(is_resource($dirHANDLE)){
+            $handle = $dirHANDLE;
+        }else{
+            $handle=@opendir($dirName);
+        }
         if ($handle === false) {
             throw new Exception("Error while trying to open directory ".$dirName);
         }
         if ($foldersOnly && !AJXP_MetaStreamWrapper::wrapperIsRemote($dirName)) {
-            closedir($handle);
+            if($dirHANDLE == null || !is_resource($dirHANDLE)){
+                closedir($handle);
+            }
             $path = AJXP_MetaStreamWrapper::getRealFSReference($dirName, true);
             $dirs = glob($path."/*", GLOB_ONLYDIR|GLOB_NOSORT);
             if($dirs === false) return 0;
@@ -1546,7 +1577,9 @@ public function countFiles($dirName, $foldersOnly = false, $nonEmptyCheckOnly =
                 if($nonEmptyCheckOnly) break;
             }
         }
-        closedir($handle);
+        if($dirHANDLE == null || !is_resource($dirHANDLE)){
+            closedir($handle);
+        }
         return $count;
     }
 

diff --git a/core/src/plugins/access.fs/class.fsAccessWrapper.php b/core/src/plugins/access.fs/class.fsAccessWrapper.php
@@ -246,6 +246,11 @@ public static function isRemote()
         return false;
     }
 
+    public static function isSeekable()
+    {
+        return true;
+    }
+
     public static function copyFileInStream($path, $stream)
     {
         $fp = fopen(self::getRealFSReference($path), "rb");

diff --git a/core/src/plugins/access.imap/class.imapAccessWrapper.php b/core/src/plugins/access.imap/class.imapAccessWrapper.php
@@ -522,5 +522,13 @@ public function stream_flush()
     }
 
 
-
+    /**
+     * Describe whether the current wrapper can rewind a stream or not.
+     * @static
+     * @return boolean
+     */
+    public static function isSeekable()
+    {
+        return false;
+    }
 }
diff --git a/core/src/plugins/access.remote_fs/class.remote_fsAccessWrapper.php b/core/src/plugins/access.remote_fs/class.remote_fsAccessWrapper.php
@@ -285,4 +285,13 @@ protected function createHttpClient()
     }
 
 
+    /**
+     * Describe whether the current wrapper can rewind a stream or not.
+     * @static
+     * @return boolean
+     */
+    public static function isSeekable()
+    {
+        return false;
+    }
 }
diff --git a/core/src/plugins/access.sftp/class.sftpAccessWrapper.php b/core/src/plugins/access.sftp/class.sftpAccessWrapper.php
@@ -253,6 +253,11 @@ public static function isRemote()
         return true;
     }
 
+    public static function isSeekable()
+    {
+        return false;
+    }
+
     /**
      * Override parent function, testing feof() does not seem to work.
      * We may have performance problems on big files here.

diff --git a/core/src/plugins/access.sftp_psl/class.sftpPSLAccessWrapper.php b/core/src/plugins/access.sftp_psl/class.sftpPSLAccessWrapper.php
@@ -39,6 +39,11 @@ public static function isRemote()
         return true;
     }
 
+    public static function isSeekable()
+    {
+        return false;
+    }
+
     /**
      * Initialize the stream from the given path.
      */

diff --git a/core/src/plugins/access.swift/class.swiftAccessWrapper.php b/core/src/plugins/access.swift/class.swiftAccessWrapper.php
@@ -237,6 +237,11 @@ public static function isRemote()
         return true;
     }
 
+    public static function isSeekable()
+    {
+        return false;
+    }
+
     public static function copyFileInStream($path, $stream)
     {
         $fp = fopen($path, "r", null, self::$cloudContext);

diff --git a/core/src/plugins/access.webdav/class.webdavAccessWrapper.php b/core/src/plugins/access.webdav/class.webdavAccessWrapper.php
@@ -207,6 +207,11 @@ public static function isRemote()
         return true;
     }
 
+    public static function isSeekable()
+    {
+        return true;
+    }
+
     public static function copyFileInStream($path, $stream)
     {
         $fp = fopen(self::getRealFSReference($path), "rb");