From 1007013833486dbf72b35ba8167944bd495da05b Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 16 Nov 2012 17:54:58 +0100 Subject: [PATCH] stop increasing folder sizes once we hit a non folder fixes #234 --- lib/filecache.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/filecache.php b/lib/filecache.php index 1a6100481ad..a74d7cbc390 100644 --- a/lib/filecache.php +++ b/lib/filecache.php @@ -350,12 +350,25 @@ class OC_FileCache{ */ public static function increaseSize($path, $sizeDiff, $root=false) { if($sizeDiff==0) return; - $id=self::getId($path, $root); + $item = OC_FileCache_Cached::get($path); + //stop walking up the filetree if we hit a non-folder + if($item['mimetype'] !== 'httpd/unix-directory'){ + return; + } + $id = $item['id']; while($id!=-1) {//walk up the filetree increasing the size of all parent folders $query=OC_DB::prepare('UPDATE `*PREFIX*fscache` SET `size`=`size`+? WHERE `id`=?'); $query->execute(array($sizeDiff, $id)); - $id=self::getParentId($path); + if($path == '' or $path =='/'){ + return; + } $path=dirname($path); + $parent = OC_FileCache_Cached::get($path); + $id = $parent['id']; + //stop walking up the filetree if we hit a non-folder + if($parent['mimetype'] !== 'httpd/unix-directory'){ + return; + } } }