diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-03-03 18:02:07 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-03-03 21:23:35 +0100 |
| commit | 2e365658c856e1dffd1ee748db40158fdda0edc3 (patch) | |
| tree | 7b43b4a6057796fbc65a0dce9af13e062fb9497d /lib/filecache.php | |
| parent | 4c45483ad3acd5b675e54893686f912a32f10a12 (diff) | |
| download | nextcloud-server-2e365658c856e1dffd1ee748db40158fdda0edc3.tar.gz nextcloud-server-2e365658c856e1dffd1ee748db40158fdda0edc3.zip | |
better handeling of files that can behave like folder (e.g. archives)
Diffstat (limited to 'lib/filecache.php')
| -rw-r--r-- | lib/filecache.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/filecache.php b/lib/filecache.php index 732160c216a..e94ae49c73a 100644 --- a/lib/filecache.php +++ b/lib/filecache.php @@ -323,10 +323,11 @@ class OC_FileCache{ $path=$params['path']; $fullPath=$view->getRoot().$path; $mimetype=$view->getMimeType($path); + $dir=$view->is_dir($path.'/'); //dont use self::get here, we don't want inifinte loops when a file has changed $cachedSize=self::getCachedSize($path,$root); $size=0; - if($mimetype=='httpd/unix-directory'){ + if($dir){ if(self::inCache($path,$root)){ $parent=self::getFileId($fullPath); $query=OC_DB::prepare('SELECT size FROM *PREFIX*fscache WHERE parent=?'); @@ -465,13 +466,13 @@ class OC_FileCache{ $view=new OC_FilesystemView(($root=='/')?'':$root); } self::scanFile($path,$root); - $dh=$view->opendir($path); + $dh=$view->opendir($path.'/'); $totalSize=0; if($dh){ while (($filename = readdir($dh)) !== false) { if($filename != '.' and $filename != '..'){ $file=$path.'/'.$filename; - if($view->is_dir($file)){ + if($view->is_dir($file.'/')){ if($eventSource){ $eventSource->send('scanning',array('file'=>$file,'count'=>$count)); } |