admin/Studio-42-elFinder
1
0
Fork 0
mirror of https://github.com/Studio-42/elFinder synced 2026-06-08 12:37:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[VD:abstract] performance tune - caching "has subdirs"

Browse Source 
revert 7a623bf726 ( [VD:LocalFileSystem]
performance tune - caching "has subdirs" )
This commit is contained in:
nao-pon
2015-10-14 14:37:47 +09:00
parent 7a623bf726
commit a8d0815ffc
2 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeLocalFileSystem.class.php
+5 -20
View File
@@ -24,13 +24,6 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
**/
protected $archiveSize = 0;
/**
* Cache for _subdirs()
*
* @var array
*/
protected $subdirsCache = array();
/**
* Constructor
* Extend options with required fields
@@ -376,10 +369,7 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
}
$dir = is_dir($path);
if ($dir && $path !== $this->root) {
$this->subdirsCache[basename($path)] = true;
}
if (!isset($stat['mime'])) {
$stat['mime'] = $dir ? 'directory' : $this->mimetype($path);
}
@@ -452,12 +442,11 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
* @author Dmitry (dio) Levashov
**/
protected function _subdirs($path) {
if (isset($this->subdirsCache[$path])) {
return $this->subdirsCache[$path];
if (is_dir($path)) {
return (bool)glob(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '*', GLOB_ONLYDIR);
}
$this->subdirsCache[$path] = (is_dir($path) && glob(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '*', GLOB_ONLYDIR));
return $this->subdirsCache[$path];
return false;
}
/**
@@ -516,7 +505,6 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
$dirItr = new DirectoryIterator($path);
} catch (UnexpectedValueException $e) {}
$this->subdirsCache[$path] = false;
foreach ($dirItr as $file) {
try {
if ($file->isDot()) { continue; }
@@ -579,9 +567,6 @@ class elFinderVolumeLocalFileSystem extends elFinderVolumeDriver {
$stat['size'] = $dir ? 0 : $size;
}
if ($dir) {
$this->subdirsCache[$path] = true;
}
}
$cache[] = array($fpath, $stat);