From bd834220959bf7edcc4cce4bfe6c77e0a4649b8b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 7 Sep 2012 18:30:48 +0200
Subject: put filestorages in a namespace

---
 lib/files/storage/common.php     | 270 +++++++++++++++++++++++++++++++++++++++
 lib/files/storage/commontest.php |  77 +++++++++++
 lib/files/storage/local.php      | 208 ++++++++++++++++++++++++++++++
 lib/files/storage/storage.php    |  54 ++++++++
 lib/files/storage/temporary.php  |  26 ++++
 5 files changed, 635 insertions(+)
 create mode 100644 lib/files/storage/common.php
 create mode 100644 lib/files/storage/commontest.php
 create mode 100644 lib/files/storage/local.php
 create mode 100644 lib/files/storage/storage.php
 create mode 100644 lib/files/storage/temporary.php

(limited to 'lib/files/storage')

diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
new file mode 100644
index 00000000000..0a60ff757eb
--- /dev/null
+++ b/lib/files/storage/common.php
@@ -0,0 +1,270 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Storage;
+
+/**
+ * Storage backend class for providing common filesystem operation methods
+ * which are not storage-backend specific.
+ *
+ * \OC\Files\Storage\Common is never used directly; it is extended by all other
+ * storage backends, where its methods may be overridden, and additional
+ * (backend-specific) methods are defined.
+ *
+ * Some \OC\Files\Storage\Common methods call functions which are first defined
+ * in classes which extend it, e.g. $this->stat() .
+ */
+
+abstract class Common extends \OC\Files\Storage\Storage {
+
+	public function __construct($parameters) {}
+// 	abstract public function mkdir($path);
+// 	abstract public function rmdir($path);
+// 	abstract public function opendir($path);
+	public function is_dir($path) {
+		return $this->filetype($path)=='dir';
+	}
+	public function is_file($path) {
+		return $this->filetype($path)=='file';
+	}
+// 	abstract public function stat($path);
+// 	abstract public function filetype($path);
+	public function filesize($path) {
+		if($this->is_dir($path)) {
+			return 0;//by definition
+		}else{
+			$stat = $this->stat($path);
+			return $stat['size'];
+		}
+	}
+	public function isCreatable($path) {
+		return $this->isUpdatable($path);
+	}
+// 	abstract public function isReadable($path);
+// 	abstract public function isUpdatable($path);
+	public function isDeletable($path) {
+		return $this->isUpdatable($path);
+	}
+	public function isSharable($path) {
+		return $this->isReadable($path);
+	}
+// 	abstract public function file_exists($path);
+	public function filectime($path) {
+		$stat = $this->stat($path);
+		return $stat['ctime'];
+	}
+	public function filemtime($path) {
+		$stat = $this->stat($path);
+		return $stat['mtime'];
+	}
+	public function fileatime($path) {
+		$stat = $this->stat($path);
+		return $stat['atime'];
+	}
+	public function file_get_contents($path) {
+		$handle = $this->fopen($path, "r");
+		if(!$handle) {
+			return false;
+		}
+		$size=$this->filesize($path);
+		if($size==0) {
+			return '';
+		}
+		return fread($handle, $size);
+	}
+	public function file_put_contents($path,$data) {
+		$handle = $this->fopen($path, "w");
+		return fwrite($handle, $data);
+	}
+// 	abstract public function unlink($path);
+	public function rename($path1,$path2) {
+		if($this->copy($path1,$path2)) {
+			return $this->unlink($path1);
+		}else{
+			return false;
+		}
+	}
+	public function copy($path1,$path2) {
+		$source=$this->fopen($path1,'r');
+		$target=$this->fopen($path2,'w');
+		$count=\OC_Helper::streamCopy($source,$target);
+		return $count>0;
+	}
+// 	abstract public function fopen($path,$mode);
+
+	/**
+	 * @brief Deletes all files and folders recursively within a directory
+	 * @param $directory The directory whose contents will be deleted
+	 * @param $empty Flag indicating whether directory will be emptied
+	 * @returns true/false
+	 *
+	 * @note By default the directory specified by $directory will be
+	 * deleted together with its contents. To avoid this set $empty to true
+	 */
+	public function deleteAll( $directory, $empty = false ) {
+
+		// strip leading slash
+		if( substr( $directory, 0, 1 ) == "/" ) {
+
+			$directory = substr( $directory, 1 );
+
+		}
+
+		// strip trailing slash
+		if( substr( $directory, -1) == "/" ) {
+
+			$directory = substr( $directory, 0, -1 );
+
+		}
+
+		if ( !$this->file_exists( \OCP\USER::getUser() . '/' . $directory ) || !$this->is_dir( \OCP\USER::getUser() . '/' . $directory ) ) {
+
+			return false;
+
+		} elseif( !$this->is_readable( \OCP\USER::getUser() . '/' . $directory ) ) {
+
+			return false;
+
+		} else {
+
+			$directoryHandle = $this->opendir( \OCP\USER::getUser() . '/' . $directory );
+
+			while ( $contents = readdir( $directoryHandle ) ) {
+
+				if ( $contents != '.' && $contents != '..') {
+
+					$path = $directory . "/" . $contents;
+
+					if ( $this->is_dir( $path ) ) {
+
+						deleteAll( $path );
+
+					} else {
+
+						$this->unlink( \OCP\USER::getUser() .'/' . $path ); // TODO: make unlink use same system path as is_dir
+
+					}
+				}
+
+			}
+
+			//$this->closedir( $directoryHandle ); // TODO: implement closedir in OC_FSV
+
+			if ( $empty == false ) {
+
+				if ( !$this->rmdir( $directory ) ) {
+
+					return false;
+
+				}
+
+			}
+
+			return true;
+		}
+
+	}
+	public function getMimeType($path) {
+		if(!$this->file_exists($path)) {
+			return false;
+		}
+		if($this->is_dir($path)) {
+			return 'httpd/unix-directory';
+		}
+		$source=$this->fopen($path,'r');
+		if(!$source) {
+			return false;
+		}
+		$head=fread($source,8192);//8kb should suffice to determine a mimetype
+		if($pos=strrpos($path,'.')) {
+			$extension=substr($path,$pos);
+		}else{
+			$extension='';
+		}
+		$tmpFile=\OC_Helper::tmpFile($extension);
+		file_put_contents($tmpFile,$head);
+		$mime=\OC_Helper::getMimeType($tmpFile);
+		unlink($tmpFile);
+		return $mime;
+	}
+	public function hash($type,$path,$raw = false) {
+		$tmpFile=$this->getLocalFile();
+		$hash=hash($type,$tmpFile,$raw);
+		unlink($tmpFile);
+		return $hash;
+	}
+// 	abstract public function free_space($path);
+	public function search($query) {
+		return $this->searchInDir($query);
+	}
+	public function getLocalFile($path) {
+		return $this->toTmpFile($path);
+	}
+	private function toTmpFile($path) {//no longer in the storage api, still usefull here
+		$source=$this->fopen($path,'r');
+		if(!$source) {
+			return false;
+		}
+		if($pos=strrpos($path,'.')) {
+			$extension=substr($path,$pos);
+		}else{
+			$extension='';
+		}
+		$tmpFile=\OC_Helper::tmpFile($extension);
+		$target=fopen($tmpFile,'w');
+		\OC_Helper::streamCopy($source,$target);
+		return $tmpFile;
+	}
+	public function getLocalFolder($path) {
+		$baseDir=\OC_Helper::tmpFolder();
+		$this->addLocalFolder($path,$baseDir);
+		return $baseDir;
+	}
+	private function addLocalFolder($path,$target) {
+		if($dh=$this->opendir($path)) {
+			while($file=readdir($dh)) {
+				if($file!=='.' and $file!=='..') {
+					if($this->is_dir($path.'/'.$file)) {
+						mkdir($target.'/'.$file);
+						$this->addLocalFolder($path.'/'.$file,$target.'/'.$file);
+					}else{
+						$tmp=$this->toTmpFile($path.'/'.$file);
+						rename($tmp,$target.'/'.$file);
+					}
+				}
+			}
+		}
+	}
+// 	abstract public function touch($path, $mtime=null);
+
+	protected function searchInDir($query,$dir='') {
+		$files=array();
+		$dh=$this->opendir($dir);
+		if($dh) {
+			while($item=readdir($dh)) {
+				if ($item == '.' || $item == '..') continue;
+				if(strstr(strtolower($item),strtolower($query))!==false) {
+					$files[]=$dir.'/'.$item;
+				}
+				if($this->is_dir($dir.'/'.$item)) {
+					$files=array_merge($files,$this->searchInDir($query,$dir.'/'.$item));
+				}
+			}
+		}
+		return $files;
+	}
+
+	/**
+	 * check if a file or folder has been updated since $time
+	 * @param int $time
+	 * @return bool
+	 */
+	public function hasUpdated($path,$time) {
+		return $this->filemtime($path)>$time;
+	}
+}
diff --git a/lib/files/storage/commontest.php b/lib/files/storage/commontest.php
new file mode 100644
index 00000000000..773bfffcb49
--- /dev/null
+++ b/lib/files/storage/commontest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+* ownCloud
+*
+* @author Robin Appelman
+* @copyright 2012 Robin Appelman icewind@owncloud.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/**
+ * test implementation for \OC\Files\Storage\Common with \OC\Files\Storage\Local
+ */
+
+namespace OC\Files\Storage;
+
+class CommonTest extends \OC\Files\Storage\Common{
+	/**
+	 * underlying local storage used for missing functions
+	 * @var \OC\Files\Storage\Local
+	 */
+	private $storage;
+
+	public function __construct($params) {
+		$this->storage=new \OC\Files\Storage\Local($params);
+	}
+
+	public function mkdir($path) {
+		return $this->storage->mkdir($path);
+	}
+	public function rmdir($path) {
+		return $this->storage->rmdir($path);
+	}
+	public function opendir($path) {
+		return $this->storage->opendir($path);
+	}
+	public function stat($path) {
+		return $this->storage->stat($path);
+	}
+	public function filetype($path) {
+		return $this->storage->filetype($path);
+	}
+	public function isReadable($path) {
+		return $this->storage->isReadable($path);
+	}
+	public function isUpdatable($path) {
+		return $this->storage->isUpdatable($path);
+	}
+	public function file_exists($path) {
+		return $this->storage->file_exists($path);
+	}
+	public function unlink($path) {
+		return $this->storage->unlink($path);
+	}
+	public function fopen($path,$mode) {
+		return $this->storage->fopen($path,$mode);
+	}
+	public function free_space($path) {
+		return $this->storage->free_space($path);
+	}
+	public function touch($path, $mtime=null) {
+		return $this->storage->touch($path,$mtime);
+	}
+}
\ No newline at end of file
diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php
new file mode 100644
index 00000000000..e47441499a1
--- /dev/null
+++ b/lib/files/storage/local.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Storage;
+
+/**
+ * for local filestore, we only have to map the paths
+ */
+class Local extends \OC\Files\Storage\Common{
+	protected $datadir;
+	public function __construct($arguments) {
+		$this->datadir=$arguments['datadir'];
+		if(substr($this->datadir,-1)!=='/') {
+			$this->datadir.='/';
+		}
+	}
+	public function mkdir($path) {
+		return @mkdir($this->datadir.$path);
+	}
+	public function rmdir($path) {
+		return @rmdir($this->datadir.$path);
+	}
+	public function opendir($path) {
+		return opendir($this->datadir.$path);
+	}
+	public function is_dir($path) {
+		if(substr($path,-1)=='/') {
+			$path=substr($path,0,-1);
+		}
+		return is_dir($this->datadir.$path);
+	}
+	public function is_file($path) {
+		return is_file($this->datadir.$path);
+	}
+	public function stat($path) {
+		return stat($this->datadir.$path);
+	}
+	public function filetype($path) {
+		$filetype=filetype($this->datadir.$path);
+		if($filetype=='link') {
+			$filetype=filetype(realpath($this->datadir.$path));
+		}
+		return $filetype;
+	}
+	public function filesize($path) {
+		if($this->is_dir($path)) {
+			return 0;
+		}else{
+			return filesize($this->datadir.$path);
+		}
+	}
+	public function isReadable($path) {
+		return is_readable($this->datadir.$path);
+	}
+	public function isUpdatable($path) {
+		return is_writable($this->datadir.$path);
+	}
+	public function file_exists($path) {
+		return file_exists($this->datadir.$path);
+	}
+	public function filectime($path) {
+		return filectime($this->datadir.$path);
+	}
+	public function filemtime($path) {
+		return filemtime($this->datadir.$path);
+	}
+	public function touch($path, $mtime=null) {
+		// sets the modification time of the file to the given value.
+		// If mtime is nil the current time is set.
+		// note that the access time of the file always changes to the current time.
+		if(!is_null($mtime)) {
+			$result=touch( $this->datadir.$path, $mtime );
+		}else{
+			$result=touch( $this->datadir.$path);
+		}
+		if( $result ) {
+			clearstatcache( true, $this->datadir.$path );
+		}
+
+		return $result;
+	}
+	public function file_get_contents($path) {
+		return file_get_contents($this->datadir.$path);
+	}
+	public function file_put_contents($path,$data) {
+		return file_put_contents($this->datadir.$path,$data);
+	}
+	public function unlink($path) {
+		return $this->delTree($path);
+	}
+	public function rename($path1,$path2) {
+		if (!$this->isUpdatable($path1)) {
+			\OC_Log::write('core','unable to rename, file is not writable : '.$path1,\OC_Log::ERROR);
+			return false;
+		}
+		if(! $this->file_exists($path1)) {
+			\OC_Log::write('core','unable to rename, file does not exists : '.$path1,\OC_Log::ERROR);
+			return false;
+		}
+
+		if($return=rename($this->datadir.$path1,$this->datadir.$path2)) {
+		}
+		return $return;
+	}
+	public function copy($path1,$path2) {
+		if($this->is_dir($path2)) {
+			if(!$this->file_exists($path2)) {
+				$this->mkdir($path2);
+			}
+			$source=substr($path1,strrpos($path1,'/')+1);
+			$path2.=$source;
+		}
+		return copy($this->datadir.$path1,$this->datadir.$path2);
+	}
+	public function fopen($path,$mode) {
+		if($return=fopen($this->datadir.$path,$mode)) {
+			switch($mode) {
+				case 'r':
+					break;
+				case 'r+':
+				case 'w+':
+				case 'x+':
+				case 'a+':
+					break;
+				case 'w':
+				case 'x':
+				case 'a':
+					break;
+			}
+		}
+		return $return;
+	}
+
+	public function getMimeType($path) {
+		if($this->isReadable($path)) {
+			return \OC_Helper::getMimeType($this->datadir.$path);
+		}else{
+			return false;
+		}
+	}
+
+	private function delTree($dir) {
+		$dirRelative=$dir;
+		$dir=$this->datadir.$dir;
+		if (!file_exists($dir)) return true;
+		if (!is_dir($dir) || is_link($dir)) return unlink($dir);
+		foreach (scandir($dir) as $item) {
+			if ($item == '.' || $item == '..') continue;
+			if(is_file($dir.'/'.$item)) {
+				if(unlink($dir.'/'.$item)) {
+				}
+			}elseif(is_dir($dir.'/'.$item)) {
+				if (!$this->delTree($dirRelative. "/" . $item)) {
+					return false;
+				};
+			}
+		}
+		if($return=rmdir($dir)) {
+		}
+		return $return;
+	}
+
+	public function hash($path,$type,$raw=false) {
+		return hash_file($type,$this->datadir.$path,$raw);
+	}
+
+	public function free_space($path) {
+		return disk_free_space($this->datadir.$path);
+	}
+
+	public function search($query) {
+		return $this->searchInDir($query);
+	}
+	public function getLocalFile($path) {
+		return $this->datadir.$path;
+	}
+	public function getLocalFolder($path) {
+		return $this->datadir.$path;
+	}
+
+	protected function searchInDir($query,$dir='') {
+		$files=array();
+		foreach (scandir($this->datadir.$dir) as $item) {
+			if ($item == '.' || $item == '..') continue;
+			if(strstr(strtolower($item),strtolower($query))!==false) {
+				$files[]=$dir.'/'.$item;
+			}
+			if(is_dir($this->datadir.$dir.'/'.$item)) {
+				$files=array_merge($files,$this->searchInDir($query,$dir.'/'.$item));
+			}
+		}
+		return $files;
+	}
+
+	/**
+	 * check if a file or folder has been updated since $time
+	 * @param int $time
+	 * @return bool
+	 */
+	public function hasUpdated($path,$time) {
+		return $this->filemtime($path)>$time;
+	}
+}
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
new file mode 100644
index 00000000000..a2f6cb7ec34
--- /dev/null
+++ b/lib/files/storage/storage.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Storage;
+
+/**
+ * Provde a common interface to all different storage options
+ */
+abstract class Storage{
+	abstract public function __construct($parameters);
+	abstract public function mkdir($path);
+	abstract public function rmdir($path);
+	abstract public function opendir($path);
+	abstract public function is_dir($path);
+	abstract public function is_file($path);
+	abstract public function stat($path);
+	abstract public function filetype($path);
+	abstract public function filesize($path);
+	abstract public function isCreatable($path);
+	abstract public function isReadable($path);
+	abstract public function isUpdatable($path);
+	abstract public function isDeletable($path);
+	abstract public function isSharable($path);
+	abstract public function file_exists($path);
+	abstract public function filectime($path);
+	abstract public function filemtime($path);
+	abstract public function file_get_contents($path);
+	abstract public function file_put_contents($path,$data);
+	abstract public function unlink($path);
+	abstract public function rename($path1,$path2);
+	abstract public function copy($path1,$path2);
+	abstract public function fopen($path,$mode);
+	abstract public function getMimeType($path);
+	abstract public function hash($type,$path,$raw = false);
+	abstract public function free_space($path);
+	abstract public function search($query);
+	abstract public function touch($path, $mtime=null);
+	abstract public function getLocalFile($path);// get a path to a local version of the file, whether the original file is local or remote
+	abstract public function getLocalFolder($path);// get a path to a local version of the folder, whether the original file is local or remote
+	/**
+	 * check if a file or folder has been updated since $time
+	 * @param int $time
+	 * @return bool
+	 *
+	 * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed.
+	 * returning true for other changes in the folder is optional
+	 */
+	abstract public function hasUpdated($path,$time);
+}
diff --git a/lib/files/storage/temporary.php b/lib/files/storage/temporary.php
new file mode 100644
index 00000000000..0e69c9112ac
--- /dev/null
+++ b/lib/files/storage/temporary.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Storage;
+
+/**
+ * local storage backnd in temporary folder for testing purpores
+ */
+class Temporary extends OC\Files\Storage\Local{
+	public function __construct($arguments) {
+		$this->datadir=\OC_Helper::tmpFolder();
+	}
+
+	public function cleanUp() {
+		\OC_Helper::rmdirr($this->datadir);
+	}
+
+	public function __destruct() {
+		$this->cleanUp();
+	}
+}
-- 
cgit v1.2.3


From e8d3a4768541980fcc391117e5a173875b2f75e0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 12 Sep 2012 22:50:10 +0200
Subject: add getId to storage backends

---
 lib/files/storage/common.php     | 1 +
 lib/files/storage/commontest.php | 3 +++
 lib/files/storage/local.php      | 3 +++
 lib/files/storage/storage.php    | 1 +
 4 files changed, 8 insertions(+)

(limited to 'lib/files/storage')

diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index 0a60ff757eb..1f8b6204802 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -23,6 +23,7 @@ namespace OC\Files\Storage;
 abstract class Common extends \OC\Files\Storage\Storage {
 
 	public function __construct($parameters) {}
+// 	abstract public function getId();
 // 	abstract public function mkdir($path);
 // 	abstract public function rmdir($path);
 // 	abstract public function opendir($path);
diff --git a/lib/files/storage/commontest.php b/lib/files/storage/commontest.php
index 773bfffcb49..2b42cfe1156 100644
--- a/lib/files/storage/commontest.php
+++ b/lib/files/storage/commontest.php
@@ -38,6 +38,9 @@ class CommonTest extends \OC\Files\Storage\Common{
 		$this->storage=new \OC\Files\Storage\Local($params);
 	}
 
+	public function getId(){
+		return 'test::'.$this->storage->getId();
+	}
 	public function mkdir($path) {
 		return $this->storage->mkdir($path);
 	}
diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php
index e47441499a1..78e4877a005 100644
--- a/lib/files/storage/local.php
+++ b/lib/files/storage/local.php
@@ -19,6 +19,9 @@ class Local extends \OC\Files\Storage\Common{
 			$this->datadir.='/';
 		}
 	}
+	public function getId(){
+		return 'local::'.$this->datadir;
+	}
 	public function mkdir($path) {
 		return @mkdir($this->datadir.$path);
 	}
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
index a2f6cb7ec34..bd4cc4743b6 100644
--- a/lib/files/storage/storage.php
+++ b/lib/files/storage/storage.php
@@ -13,6 +13,7 @@ namespace OC\Files\Storage;
  */
 abstract class Storage{
 	abstract public function __construct($parameters);
+	abstract public function getId();
 	abstract public function mkdir($path);
 	abstract public function rmdir($path);
 	abstract public function opendir($path);
-- 
cgit v1.2.3


From c94fe38d3900acff474c909aaa730d7ab51f914d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 12 Sep 2012 23:25:57 +0200
Subject: add getPermissions to storage backends to get all permission flags in
 one go

---
 lib/files/storage/common.php  | 19 +++++++++++++++++++
 lib/files/storage/storage.php |  1 +
 2 files changed, 20 insertions(+)

(limited to 'lib/files/storage')

diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index 1f8b6204802..b2b4ea8eee4 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -54,6 +54,25 @@ abstract class Common extends \OC\Files\Storage\Storage {
 	public function isSharable($path) {
 		return $this->isReadable($path);
 	}
+	public function getPermissions($path){
+		$permissions = 0;
+		if($this->isCreatable($path)){
+			$permissions |= OCP\Share::PERMISSION_CREATE;
+		}
+		if($this->isReadable($path)){
+			$permissions |= OCP\Share::PERMISSION_READ;
+		}
+		if($this->isUpdatable($path)){
+			$permissions |= OCP\Share::PERMISSION_UPDATE;
+		}
+		if($this->isDeletable($path)){
+			$permissions |= OCP\Share::PERMISSION_DELETE;
+		}
+		if($this->isSharable($path)){
+			$permissions |= OCP\Share::PERMISSION_SHARE;
+		}
+		return $permissions;
+	}
 // 	abstract public function file_exists($path);
 	public function filectime($path) {
 		$stat = $this->stat($path);
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
index bd4cc4743b6..f149c61830c 100644
--- a/lib/files/storage/storage.php
+++ b/lib/files/storage/storage.php
@@ -27,6 +27,7 @@ abstract class Storage{
 	abstract public function isUpdatable($path);
 	abstract public function isDeletable($path);
 	abstract public function isSharable($path);
+	abstract public function getPermissions($path);
 	abstract public function file_exists($path);
 	abstract public function filectime($path);
 	abstract public function filemtime($path);
-- 
cgit v1.2.3


From 46896be0d482f5dcec85ec32b232dd8a205f3e41 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 22 Sep 2012 15:03:17 +0200
Subject: fix namespace error in temporary storage backend

---
 lib/files/storage/temporary.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/files/storage')

diff --git a/lib/files/storage/temporary.php b/lib/files/storage/temporary.php
index 0e69c9112ac..ffc55e27507 100644
--- a/lib/files/storage/temporary.php
+++ b/lib/files/storage/temporary.php
@@ -11,7 +11,7 @@ namespace OC\Files\Storage;
 /**
  * local storage backnd in temporary folder for testing purpores
  */
-class Temporary extends OC\Files\Storage\Local{
+class Temporary extends Local{
 	public function __construct($arguments) {
 		$this->datadir=\OC_Helper::tmpFolder();
 	}
-- 
cgit v1.2.3


From 96d7cd59978cc416bc0d9c5ac487af23692ef1d8 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 3 Oct 2012 11:24:10 +0200
Subject: correct namespace usage in common filestorage backend

---
 lib/files/storage/common.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/files/storage')

diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index b2b4ea8eee4..3886a041829 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -57,19 +57,19 @@ abstract class Common extends \OC\Files\Storage\Storage {
 	public function getPermissions($path){
 		$permissions = 0;
 		if($this->isCreatable($path)){
-			$permissions |= OCP\Share::PERMISSION_CREATE;
+			$permissions |= \OCP\Share::PERMISSION_CREATE;
 		}
 		if($this->isReadable($path)){
-			$permissions |= OCP\Share::PERMISSION_READ;
+			$permissions |= \OCP\Share::PERMISSION_READ;
 		}
 		if($this->isUpdatable($path)){
-			$permissions |= OCP\Share::PERMISSION_UPDATE;
+			$permissions |= \OCP\Share::PERMISSION_UPDATE;
 		}
 		if($this->isDeletable($path)){
-			$permissions |= OCP\Share::PERMISSION_DELETE;
+			$permissions |= \OCP\Share::PERMISSION_DELETE;
 		}
 		if($this->isSharable($path)){
-			$permissions |= OCP\Share::PERMISSION_SHARE;
+			$permissions |= \OCP\Share::PERMISSION_SHARE;
 		}
 		return $permissions;
 	}
-- 
cgit v1.2.3


From cfa036eaa916c1adf38fb161a16c50cd050c0a3b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 20 Oct 2012 23:54:37 +0200
Subject: drop filectime from the filesystem api's

---
 apps/files_external/lib/amazons3.php     |  2 --
 apps/files_external/lib/dropbox.php      |  1 -
 apps/files_external/lib/google.php       |  2 --
 apps/files_external/lib/swift.php        |  2 --
 apps/files_external/lib/webdav.php       |  1 -
 apps/files_sharing/lib/sharedstorage.php | 22 ----------------------
 lib/files.php                            |  3 +--
 lib/files/filesystem.php                 |  4 ----
 lib/files/storage/common.php             |  4 ----
 lib/files/storage/local.php              |  3 ---
 lib/files/storage/storage.php            |  1 -
 lib/files/view.php                       |  4 ----
 lib/filesystem.php                       |  7 -------
 13 files changed, 1 insertion(+), 55 deletions(-)

(limited to 'lib/files/storage')

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 832127d3e79..c3fa4651f64 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -115,12 +115,10 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			$stat['size'] = $this->s3->get_bucket_filesize($this->bucket);
 			$stat['atime'] = time();
 			$stat['mtime'] = $stat['atime'];
-			$stat['ctime'] = $stat['atime'];
 		} else if ($object = $this->getObject($path)) {
 			$stat['size'] = $object['Size'];
 			$stat['atime'] = time();
 			$stat['mtime'] = strtotime($object['LastModified']);
-			$stat['ctime'] = $stat['mtime'];
 		}
 		if (isset($stat)) {
 			return $stat;
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 0f7593162e4..0e82f80668f 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -119,7 +119,6 @@ class Dropbox extends \OC\Files\Storage\Common {
 			$stat['size'] = $metaData['bytes'];
 			$stat['atime'] = time();
 			$stat['mtime'] = (isset($metaData['modified'])) ? strtotime($metaData['modified']) : time();
-			$stat['ctime'] = $stat['mtime'];
 			return $stat;
 		}
 		return false;
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 141fc619e35..7ee5b97f8be 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -257,14 +257,12 @@ class Google extends \OC\Files\Storage\Common {
 			$stat['size'] = $this->free_space($path);
 			$stat['atime'] = time();
 			$stat['mtime'] = time();
-			$stat['ctime'] = time();
 		} else if ($entry = $this->getResource($path)) {
 			// NOTE: Native resources don't have a file size
 			$stat['size'] = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'quotaBytesUsed')->item(0)->nodeValue;
 // 			if (isset($atime = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'lastViewed')->item(0)->nodeValue))
 // 			$stat['atime'] = strtotime($entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'lastViewed')->item(0)->nodeValue);
 			$stat['mtime'] = strtotime($entry->getElementsByTagName('updated')->item(0)->nodeValue);
-			$stat['ctime'] = strtotime($entry->getElementsByTagName('published')->item(0)->nodeValue);
 		}
 		if (isset($stat)) {
 			return $stat;
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 4b3f38166dc..c3578b0c23e 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -500,7 +500,6 @@ class SWIFT extends \OC\Files\Storage\Common{
 			return array(
 				'mtime'=>-1,
 				'size'=>$container->bytes_used,
-				'ctime'=>-1
 			);
 		}
 
@@ -518,7 +517,6 @@ class SWIFT extends \OC\Files\Storage\Common{
 		return array(
 			'mtime'=>$mtime,
 			'size'=>$obj->content_length,
-			'ctime'=>-1,
 		);
 	}
 
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 73231b6ad81..c9785f3eb11 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -256,7 +256,6 @@ class DAV extends \OC\Files\Storage\Common{
 			return array(
 				'mtime'=>strtotime($response['{DAV:}getlastmodified']),
 				'size'=>(int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0,
-				'ctime'=>-1,
 			);
 		}catch(\Exception $e) {
 			return array();
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index e12027a4f2b..521dfb69f2a 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -162,7 +162,6 @@ class Shared extends \OC\Files\Storage\Common {
 		if ($path == '' || $path == '/') {
 			$stat['size'] = $this->filesize($path);
 			$stat['mtime'] = $this->filemtime($path);
-			$stat['ctime'] = $this->filectime($path);
 			return $stat;
 		} else if ($source = $this->getSourcePath($path)) {
 			list($storage, $internalPath)=\OC\Files\Filesystem::resolvePath($source);
@@ -233,27 +232,6 @@ class Shared extends \OC\Files\Storage\Common {
 		return false;
 	}
 
-	public function filectime($path) {
-		if ($path == '' || $path == '/') {
-			$ctime = 0;
-			if ($dh = $this->opendir($path)) {
-				while (($filename = readdir($dh)) !== false) {
-					$tempctime = $this->filectime($filename);
-					if ($tempctime < $ctime) {
-						$ctime = $tempctime;
-					}
-				}
-			}
-			return $ctime;
-		} else {
-			$source = $this->getSourcePath($path);
-			if ($source) {
-				list($storage, $internalPath)=\OC\Files\Filesystem::resolvePath($source);
-				return $storage->filectime($internalPath);
-			}
-		}
-	}
-
 	public function filemtime($path) {
 		if ($path == '' || $path == '/') {
 			$mtime = 0;
diff --git a/lib/files.php b/lib/files.php
index 29322cf2d06..28c8d0b449f 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -30,13 +30,12 @@ class OC_Files {
 
 	/**
 	 * get the filesystem info
-	 * @param string path
+	 * @param string $path
 	 * @return array
 	 *
 	 * returns an associative array with the following keys:
 	 * - size
 	 * - mtime
-	 * - ctime
 	 * - mimetype
 	 * - encrypted
 	 * - versioned
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index e4c269257c2..94e8a562564 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -478,10 +478,6 @@ class Filesystem {
 		return self::$defaultInstance->file_exists($path);
 	}
 
-	static public function filectime($path) {
-		return self::$defaultInstance->filectime($path);
-	}
-
 	static public function filemtime($path) {
 		return self::$defaultInstance->filemtime($path);
 	}
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index 3886a041829..17405845554 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -74,10 +74,6 @@ abstract class Common extends \OC\Files\Storage\Storage {
 		return $permissions;
 	}
 // 	abstract public function file_exists($path);
-	public function filectime($path) {
-		$stat = $this->stat($path);
-		return $stat['ctime'];
-	}
 	public function filemtime($path) {
 		$stat = $this->stat($path);
 		return $stat['mtime'];
diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php
index 66ae5542e36..ccd69e3971c 100644
--- a/lib/files/storage/local.php
+++ b/lib/files/storage/local.php
@@ -66,9 +66,6 @@ class Local extends \OC\Files\Storage\Common{
 	public function file_exists($path) {
 		return file_exists($this->datadir.$path);
 	}
-	public function filectime($path) {
-		return filectime($this->datadir.$path);
-	}
 	public function filemtime($path) {
 		return filemtime($this->datadir.$path);
 	}
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
index f149c61830c..941bc3b0779 100644
--- a/lib/files/storage/storage.php
+++ b/lib/files/storage/storage.php
@@ -29,7 +29,6 @@ abstract class Storage{
 	abstract public function isSharable($path);
 	abstract public function getPermissions($path);
 	abstract public function file_exists($path);
-	abstract public function filectime($path);
 	abstract public function filemtime($path);
 	abstract public function file_get_contents($path);
 	abstract public function file_put_contents($path,$data);
diff --git a/lib/files/view.php b/lib/files/view.php
index bffeb434f28..58e3ee6f051 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -236,10 +236,6 @@ class View {
 		return $this->basicOperation('file_exists', $path);
 	}
 
-	public function filectime($path) {
-		return $this->basicOperation('filectime', $path);
-	}
-
 	public function filemtime($path) {
 		return $this->basicOperation('filemtime', $path);
 	}
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 587eb50d9e0..9ce75aaf8ce 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -306,13 +306,6 @@ class OC_Filesystem {
 		return \OC\Files\Filesystem::file_exists($path);
 	}
 
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function filectime($path) {
-		return \OC\Files\Filesystem::filectime($path);
-	}
-
 	/**
 	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
 	 */
-- 
cgit v1.2.3


From 3ff0772a05c70592360c7b11b280cc4cf45a385e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 21 Oct 2012 00:31:32 +0200
Subject: add getCache and getScanner to storage api in order to allow storage
 backends to overwride caching behaviour

---
 lib/files/storage/common.php  | 50 ++++++++-----------------------
 lib/files/storage/storage.php | 70 ++++++++++++++++++++++---------------------
 2 files changed, 48 insertions(+), 72 deletions(-)

(limited to 'lib/files/storage')

diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index 17405845554..de02c0d5d81 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -20,7 +20,7 @@ namespace OC\Files\Storage;
  * in classes which extend it, e.g. $this->stat() .
  */
 
-abstract class Common extends \OC\Files\Storage\Storage {
+abstract class Common implements \OC\Files\Storage\Storage {
 
 	public function __construct($parameters) {}
 // 	abstract public function getId();
@@ -123,64 +123,30 @@ abstract class Common extends \OC\Files\Storage\Storage {
 	 * deleted together with its contents. To avoid this set $empty to true
 	 */
 	public function deleteAll( $directory, $empty = false ) {
-
-		// strip leading slash
-		if( substr( $directory, 0, 1 ) == "/" ) {
-
-			$directory = substr( $directory, 1 );
-
-		}
-
-		// strip trailing slash
-		if( substr( $directory, -1) == "/" ) {
-
-			$directory = substr( $directory, 0, -1 );
-
-		}
+		$directory = trim($directory,'/');
 
 		if ( !$this->file_exists( \OCP\USER::getUser() . '/' . $directory ) || !$this->is_dir( \OCP\USER::getUser() . '/' . $directory ) ) {
-
 			return false;
-
 		} elseif( !$this->is_readable( \OCP\USER::getUser() . '/' . $directory ) ) {
-
 			return false;
-
 		} else {
-
 			$directoryHandle = $this->opendir( \OCP\USER::getUser() . '/' . $directory );
-
 			while ( $contents = readdir( $directoryHandle ) ) {
-
 				if ( $contents != '.' && $contents != '..') {
-
 					$path = $directory . "/" . $contents;
-
 					if ( $this->is_dir( $path ) ) {
-
 						deleteAll( $path );
-
 					} else {
-
 						$this->unlink( \OCP\USER::getUser() .'/' . $path ); // TODO: make unlink use same system path as is_dir
-
 					}
 				}
-
 			}
-
 			//$this->closedir( $directoryHandle ); // TODO: implement closedir in OC_FSV
-
 			if ( $empty == false ) {
-
 				if ( !$this->rmdir( $directory ) ) {
-
-					return false;
-
+				return false;
 				}
-
 			}
-
 			return true;
 		}
 
@@ -209,7 +175,7 @@ abstract class Common extends \OC\Files\Storage\Storage {
 		return $mime;
 	}
 	public function hash($type,$path,$raw = false) {
-		$tmpFile=$this->getLocalFile();
+		$tmpFile=$this->getLocalFile($path);
 		$hash=hash($type,$tmpFile,$raw);
 		unlink($tmpFile);
 		return $hash;
@@ -283,4 +249,12 @@ abstract class Common extends \OC\Files\Storage\Storage {
 	public function hasUpdated($path,$time) {
 		return $this->filemtime($path)>$time;
 	}
+
+	public function getCache(){
+		return new \OC\Files\Cache\Cache($this);
+	}
+
+	public function getScanner(){
+		return new \OC\Files\Cache\Scanner($this);
+	}
 }
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
index 941bc3b0779..b1ec0bdb500 100644
--- a/lib/files/storage/storage.php
+++ b/lib/files/storage/storage.php
@@ -9,40 +9,40 @@
 namespace OC\Files\Storage;
 
 /**
- * Provde a common interface to all different storage options
+ * Provide a common interface to all different storage options
  */
-abstract class Storage{
-	abstract public function __construct($parameters);
-	abstract public function getId();
-	abstract public function mkdir($path);
-	abstract public function rmdir($path);
-	abstract public function opendir($path);
-	abstract public function is_dir($path);
-	abstract public function is_file($path);
-	abstract public function stat($path);
-	abstract public function filetype($path);
-	abstract public function filesize($path);
-	abstract public function isCreatable($path);
-	abstract public function isReadable($path);
-	abstract public function isUpdatable($path);
-	abstract public function isDeletable($path);
-	abstract public function isSharable($path);
-	abstract public function getPermissions($path);
-	abstract public function file_exists($path);
-	abstract public function filemtime($path);
-	abstract public function file_get_contents($path);
-	abstract public function file_put_contents($path,$data);
-	abstract public function unlink($path);
-	abstract public function rename($path1,$path2);
-	abstract public function copy($path1,$path2);
-	abstract public function fopen($path,$mode);
-	abstract public function getMimeType($path);
-	abstract public function hash($type,$path,$raw = false);
-	abstract public function free_space($path);
-	abstract public function search($query);
-	abstract public function touch($path, $mtime=null);
-	abstract public function getLocalFile($path);// get a path to a local version of the file, whether the original file is local or remote
-	abstract public function getLocalFolder($path);// get a path to a local version of the folder, whether the original file is local or remote
+interface Storage{
+	public function __construct($parameters);
+	public function getId();
+	public function mkdir($path);
+	public function rmdir($path);
+	public function opendir($path);
+	public function is_dir($path);
+	public function is_file($path);
+	public function stat($path);
+	public function filetype($path);
+	public function filesize($path);
+	public function isCreatable($path);
+	public function isReadable($path);
+	public function isUpdatable($path);
+	public function isDeletable($path);
+	public function isSharable($path);
+	public function getPermissions($path);
+	public function file_exists($path);
+	public function filemtime($path);
+	public function file_get_contents($path);
+	public function file_put_contents($path,$data);
+	public function unlink($path);
+	public function rename($path1,$path2);
+	public function copy($path1,$path2);
+	public function fopen($path,$mode);
+	public function getMimeType($path);
+	public function hash($type,$path,$raw = false);
+	public function free_space($path);
+	public function search($query);
+	public function touch($path, $mtime=null);
+	public function getLocalFile($path);// get a path to a local version of the file, whether the original file is local or remote
+	public function getLocalFolder($path);// get a path to a local version of the folder, whether the original file is local or remote
 	/**
 	 * check if a file or folder has been updated since $time
 	 * @param int $time
@@ -51,5 +51,7 @@ abstract class Storage{
 	 * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed.
 	 * returning true for other changes in the folder is optional
 	 */
-	abstract public function hasUpdated($path,$time);
+	public function hasUpdated($path,$time);
+	public function getCache();
+	public function getScanner();
 }
-- 
cgit v1.2.3


From 2522c25af726a8487ac13855e8a035b990cd69a4 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 21 Oct 2012 02:12:58 +0200
Subject: use OC_Files::getFileInfo and OC_Files::getDirectoryContent as high
 level api for the filecache

most apps would want to use this api instead of using the cache directly
---
 lib/files.php                 | 108 +++++++++++++++++++++---------------------
 lib/files/filesystem.php      |  73 +++++++++++++++++++++-------
 lib/files/storage/storage.php |   7 +++
 tests/lib/files.php           |  87 ++++++++++++++++++++++++++++++++++
 4 files changed, 204 insertions(+), 71 deletions(-)
 create mode 100644 tests/lib/files.php

(limited to 'lib/files/storage')

diff --git a/lib/files.php b/lib/files.php
index ba111bee967..8d402c0001d 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -41,69 +41,67 @@ class OC_Files {
 	 * - versioned
 	 */
 	public static function getFileInfo($path) {
-		if (($path == '/Shared' || substr($path, 0, 8) == '/Shared/') && OC_App::isEnabled('files_sharing')) {
-			if ($path == '/Shared') {
-				list($info) = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP_ROOT);
-			}else{
-				$info['size'] = \OC\Files\Filesystem::filesize($path);
-				$info['mtime'] = \OC\Files\Filesystem::filemtime($path);
-				$info['ctime'] = \OC\Files\Filesystem::filectime($path);
-				$info['mimetype'] = \OC\Files\Filesystem::getMimeType($path);
-				$info['encrypted'] = false;
-				$info['versioned'] = false;
+		$path=\OC\Files\Filesystem::normalizePath($path);
+		/**
+		 * @var \OC\Files\Storage\Storage $storage
+		 * @var string $path
+		 */
+		list($storage, $internalPath)=\OC\Files\Filesystem::resolvePath($path);
+		$cache=$storage->getCache();
+		$data = $cache->get($internalPath);
+
+		if($data['mimetype'] === 'httpd/unix-directory'){
+			//add the sizes of other mountpoints to the folder
+			$mountPoints = \OC\Files\Filesystem::getMountPoints($path);
+			foreach($mountPoints as $mountPoint){
+				$subStorage = \OC\Files\Filesystem::getStorage($mountPoint);
+				$subCache = $subStorage->getCache();
+				$rootEntry = $subCache->get('');
+
+				$data['size'] += $rootEntry['size'];
 			}
-		} else {
-			$info = OC_FileCache::get($path);
 		}
-		return $info;
+
+		return $data;
 	}
 
 	/**
 	* get the content of a directory
-	* @param dir $directory path under datadirectory
+	* @param string $directory path under datadirectory
+	* @return array
 	*/
 	public static function getDirectoryContent($directory, $mimetype_filter = '') {
-		$directory=\OC\Files\Filesystem::normalizePath($directory);
-		if($directory=='/') {
-			$directory='';
-		}
-		$files = array();
-		if (($directory == '/Shared' || substr($directory, 0, 8) == '/Shared/') && OC_App::isEnabled('files_sharing')) {
-			if ($directory == '/Shared') {
-				$files = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP, array('folder' => $directory, 'mimetype_filter' => $mimetype_filter));
-			} else {
-				$pos = strpos($directory, '/', 8);
-				// Get shared folder name
-				if ($pos !== false) {
-					$itemTarget = substr($directory, 7, $pos - 7);
-				} else {
-					$itemTarget = substr($directory, 7);
-				}
-				$files = OCP\Share::getItemSharedWith('folder', $itemTarget, OC_Share_Backend_File::FORMAT_FILE_APP, array('folder' => $directory, 'mimetype_filter' => $mimetype_filter));
-			}
-		} else {
-			$files = OC_FileCache::getFolderContent($directory, false, $mimetype_filter);
-			foreach ($files as &$file) {
-				$file['directory'] = $directory;
-				$file['type'] = ($file['mimetype'] == 'httpd/unix-directory') ? 'dir' : 'file';
-				$permissions = OCP\Share::PERMISSION_READ;
-				// NOTE: Remove check when new encryption is merged
-				if (!$file['encrypted']) {
-					$permissions |= OCP\Share::PERMISSION_SHARE;
-				}
-				if ($file['type'] == 'dir' && $file['writable']) {
-					$permissions |= OCP\Share::PERMISSION_CREATE;
-				}
-				if ($file['writable']) {
-					$permissions |= OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_DELETE;
+		$path=\OC\Files\Filesystem::normalizePath($directory);
+		/**
+		 * @var \OC\Files\Storage\Storage $storage
+		 * @var string $path
+		 */
+		list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($path);
+		$cache=$storage->getCache();
+		$files=$cache->getFolderContents($internalPath); //TODO: mimetype_filter
+
+		//add a folder for any mountpoint in this directory and add the sizes of other mountpoints to the folders
+		$mountPoints = \OC\Files\Filesystem::getMountPoints($directory);
+		$dirLength = strlen($path);
+		foreach($mountPoints as $mountPoint){
+			$subStorage = \OC\Files\Filesystem::getStorage($mountPoint);
+			$subCache = $subStorage->getCache();
+			$rootEntry = $subCache->get('');
+
+			$relativePath = trim(substr($mountPoint, $dirLength), '/');
+			if($pos = strpos($relativePath, '/')){ //mountpoint inside subfolder add size to the correct folder
+				$entryName = substr($relativePath, 0, $pos);
+				foreach($files as &$entry){
+					if($entry['name'] === $entryName){
+						$entry['size'] += $rootEntry['size'];
+					}
 				}
-				$file['permissions'] = $permissions;
-			}
-			if ($directory == '' && OC_App::isEnabled('files_sharing')) {
-				// Add 'Shared' folder
-				$files = array_merge($files, OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP_ROOT));
+			}else{ //mountpoint in this folder, add an entry for it
+				$rootEntry['name'] = $relativePath;
+				$files[] = $rootEntry;
 			}
 		}
+
 		usort($files, "fileCmp");//TODO: remove this once ajax is merged
 		return $files;
 	}
@@ -145,7 +143,7 @@ class OC_Files {
 			set_time_limit(0);
 			$zip = new ZipArchive();
 			$filename = OC_Helper::tmpFile('.zip');
-			if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==TRUE) {
+			if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) {
 				exit("cannot open <$filename>\n");
 			}
 			foreach($files as $file) {
@@ -166,7 +164,7 @@ class OC_Files {
 			set_time_limit(0);
 			$zip = new ZipArchive();
 			$filename = OC_Helper::tmpFile('.zip');
-			if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==TRUE) {
+			if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) {
 				exit("cannot open <$filename>\n");
 			}
 			$file=$dir.'/'.$files;
@@ -446,7 +444,7 @@ class OC_Files {
 		    $setting = 'php_value '.$key.' '.$size;
 		    $hasReplaced = 0;
 		    $content = preg_replace($pattern, $setting, $htaccess, 1, $hasReplaced);
-		    if($content !== NULL) {
+		    if($content !== null) {
 				$htaccess = $content;
 			}
 			if($hasReplaced == 0) {
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 05dd698ab4b..b7f8483fbf9 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -164,6 +164,43 @@ class Filesystem {
 		return $foundMountPoint;
 	}
 
+	/**
+	 * get a list of all mount points in a directory
+	 *
+	 * @param string $path
+	 * @return string[]
+	 */
+	static public function getMountPoints($path) {
+		$path = self::normalizePath($path);
+		if (strlen($path) > 1) {
+			$path .= '/';
+		}
+		$pathLength = strlen($path);
+
+		$mountPoints = array_keys(self::$mounts);
+		$result = array();
+		foreach ($mountPoints as $mountPoint) {
+			if (substr($mountPoint, 0, $pathLength) === $path and strlen($mountPoint) > $pathLength) {
+				$result[] = $mountPoint;
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * get the storage mounted at $mountPoint
+	 *
+	 * @param string $mountPoint
+	 * @return \OC\Files\Storage\Storage
+	 */
+	public static function getStorage($mountPoint) {
+		if (!isset(self::$storages[$mountPoint])) {
+			$mount = self::$mounts[$mountPoint];
+			self::$storages[$mountPoint] = self::createStorage($mount['class'], $mount['arguments']);
+		}
+		return self::$storages[$mountPoint];
+	}
+
 	/**
 	 * resolve a path to a storage and internal path
 	 *
@@ -173,14 +210,14 @@ class Filesystem {
 	static public function resolvePath($path) {
 		$mountpoint = self::getMountPoint($path);
 		if ($mountpoint) {
-			if (!isset(self::$storages[$mountpoint])) {
-				$mount = self::$mounts[$mountpoint];
-				self::$storages[$mountpoint] = self::createStorage($mount['class'], $mount['arguments']);
+			$storage = self::getStorage($mountpoint);
+			if ($mountpoint === $path) {
+				$internalPath = '';
+			} else {
+				$internalPath = substr($path, strlen($mountpoint));
 			}
-			$storage = self::$storages[$mountpoint];
-			$internalPath = substr($path, strlen($mountpoint));
 			return array($storage, $internalPath);
-		}else{
+		} else {
 			return array(null, null);
 		}
 	}
@@ -302,18 +339,22 @@ class Filesystem {
 	/**
 	 * mount an \OC\Files\Storage\Storage in our virtual filesystem
 	 *
-	 * @param \OC\Files\Storage\Storage $storage
+	 * @param \OC\Files\Storage\Storage|string $class
 	 * @param array $arguments
 	 * @param string $mountpoint
 	 */
 	static public function mount($class, $arguments, $mountpoint) {
-		if ($mountpoint[0] != '/') {
-			$mountpoint = '/' . $mountpoint;
+		$mountpoint = self::normalizePath($mountpoint);
+		if (strlen($mountpoint) > 1) {
+			$mountpoint .= '/';
 		}
-		if (substr($mountpoint, -1) !== '/') {
-			$mountpoint = $mountpoint . '/';
+
+		if ($class instanceof \OC\Files\Storage\Storage) {
+			self::$mounts[$mountpoint] = array('class' => get_class($class), 'arguments' => $arguments);
+			self::$storages[$mountpoint] = $class;
+		} else {
+			self::$mounts[$mountpoint] = array('class' => $class, 'arguments' => $arguments);
 		}
-		self::$mounts[$mountpoint] = array('class' => $class, 'arguments' => $arguments);
 	}
 
 	/**
@@ -522,15 +563,15 @@ class Filesystem {
 
 	static public function removeETagHook($params, $root = false) {
 		if (isset($params['path'])) {
-			$path=$params['path'];
+			$path = $params['path'];
 		} else {
-			$path=$params['oldpath'];
+			$path = $params['oldpath'];
 		}
 
 		if ($root) { // reduce path to the required part of it (no 'username/files')
-			$fakeRootView = new OC_FilesystemView($root);
+			$fakeRootView = new View($root);
 			$count = 1;
-			$path=str_replace(OC_App::getStorage("files")->getAbsolutePath(), "", $fakeRootView->getAbsolutePath($path), $count);
+			$path = str_replace(\OC_App::getStorage("files")->getAbsolutePath(''), "", $fakeRootView->getAbsolutePath($path), $count);
 		}
 
 		$path = self::normalizePath($path);
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
index b1ec0bdb500..853e8ba5198 100644
--- a/lib/files/storage/storage.php
+++ b/lib/files/storage/storage.php
@@ -52,6 +52,13 @@ interface Storage{
 	 * returning true for other changes in the folder is optional
 	 */
 	public function hasUpdated($path,$time);
+
+	/**
+	 * @return \OC\Files\Cache\Cache
+	 */
 	public function getCache();
+	/**
+	 * @return \OC\Files\Cache\Scanner
+	 */
 	public function getScanner();
 }
diff --git a/tests/lib/files.php b/tests/lib/files.php
new file mode 100644
index 00000000000..9cb52768458
--- /dev/null
+++ b/tests/lib/files.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file. */
+
+use \OC\Files\Filesystem as Filesystem;
+
+class Test_Files extends PHPUnit_Framework_TestCase {
+	/**
+	 * @var \OC\Files\Storage\Storage[] $storages;
+	 */
+	private $storages = array();
+
+	public function setUp() {
+		Filesystem::clearMounts();
+	}
+
+	public function tearDown() {
+		foreach ($this->storages as $storage) {
+			$cache = $storage->getCache();
+			$cache->clear();
+		}
+	}
+
+	public function testCacheAPI() {
+		$storage1 = $this->getTestStorage();
+		$storage2 = $this->getTestStorage();
+		$storage3 = $this->getTestStorage();
+		Filesystem::mount($storage1, array(), '/');
+		Filesystem::mount($storage2, array(), '/substorage');
+		Filesystem::mount($storage3, array(), '/folder/anotherstorage');
+		$textSize = strlen("dummy file data\n");
+		$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png');
+		$storageSize = $textSize * 2 + $imageSize;
+
+		$cachedData = OC_Files::getFileInfo('/foo.txt');
+		$this->assertEquals($textSize, $cachedData['size']);
+		$this->assertEquals('text/plain', $cachedData['mimetype']);
+
+		$cachedData = OC_Files::getFileInfo('/');
+		$this->assertEquals($storageSize * 3, $cachedData['size']);
+		$this->assertEquals('httpd/unix-directory', $cachedData['mimetype']);
+
+		$cachedData = OC_Files::getFileInfo('/folder');
+		$this->assertEquals($storageSize + $textSize, $cachedData['size']);
+		$this->assertEquals('httpd/unix-directory', $cachedData['mimetype']);
+
+		$folderData = OC_Files::getDirectoryContent('/');
+		/**
+		 * expected entries:
+		 * folder
+		 * foo.png
+		 * foo.txt
+		 * substorage
+		 */
+		$this->assertEquals(4, count($folderData));
+		$this->assertEquals('folder', $folderData[0]['name']);
+		$this->assertEquals('foo.png', $folderData[1]['name']);
+		$this->assertEquals('foo.txt', $folderData[2]['name']);
+		$this->assertEquals('substorage', $folderData[3]['name']);
+
+		$this->assertEquals($storageSize + $textSize, $folderData[0]['size']);
+		$this->assertEquals($imageSize, $folderData[1]['size']);
+		$this->assertEquals($textSize, $folderData[2]['size']);
+		$this->assertEquals($storageSize, $folderData[3]['size']);
+	}
+
+	/**
+	 * @return OC\Files\Storage\Storage
+	 */
+	private function getTestStorage() {
+		$storage = new \OC\Files\Storage\Temporary(array());
+		$textData = "dummy file data\n";
+		$imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png');
+		$storage->mkdir('folder');
+		$storage->file_put_contents('foo.txt', $textData);
+		$storage->file_put_contents('foo.png', $imgData);
+		$storage->file_put_contents('folder/bar.txt', $textData);
+
+		$scanner = $storage->getScanner();
+		$scanner->scan('');
+		$this->storages[] = $storage;
+		return $storage;
+	}
+}
-- 
cgit v1.2.3


From 706bb3ccd654f76c0a6c5b7874fcc1e288b13f54 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 8 Nov 2012 17:47:00 +0100
Subject: move ETag generation to storage backends

---
 lib/connector/sabre/node.php  | 16 +---------------
 lib/files/filesystem.php      | 10 ++++++++++
 lib/files/storage/common.php  | 16 ++++++++++++++++
 lib/files/storage/storage.php |  8 ++++++++
 lib/files/view.php            | 15 +++++++++++++++
 5 files changed, 50 insertions(+), 15 deletions(-)

(limited to 'lib/files/storage')

diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index ebc9e539625..d0ab0c24988 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -210,27 +210,13 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 		return $props;
 	}
 
-	/**
-	 * Creates a ETag for this path.
-	 * @param string $path Path of the file
-	 * @return string|null Returns null if the ETag can not effectively be determined
-	 */
-	static protected function createETag($path) {
-		if(self::$ETagFunction) {
-			$hash = call_user_func(self::$ETagFunction, $path);
-			return $hash;
-		}else{
-			return uniqid('', true);
-		}
-	}
-
 	/**
 	 * Returns the ETag surrounded by double-quotes for this path.
 	 * @param string $path Path of the file
 	 * @return string|null Returns null if the ETag can not effectively be determined
 	 */
 	static public function getETagPropertyForPath($path) {
-		$tag = self::createETag($path);
+		$tag = \OC\Files\Filesystem::getETag($path);
 		if (empty($tag)) {
 			return null;
 		}
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 76a188e4120..ed2814211f4 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -654,6 +654,16 @@ class Filesystem {
 	public static function getDirectoryContent($directory, $mimetype_filter = '') {
 		return self::$defaultInstance->getDirectoryContent($directory, $mimetype_filter);
 	}
+
+	/**
+	 * get the ETag for a file or folder
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	static public function getETag($path){
+		return self::$defaultInstance->getETag($path);
+	}
 }
 
 \OC_Hook::connect('OC_Filesystem', 'post_write', 'OC_Filesystem', 'removeETagHook');
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index e22264d0da9..f471752d1ff 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -267,4 +267,20 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	public function getOwner($path) {
 		return \OC_User::getUser();
 	}
+
+	/**
+	 * get the ETag for a file or folder
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getETag($path){
+		$ETagFunction = \OC_Connector_Sabre_Node::$ETagFunction;
+		if($ETagFunction) {
+			$hash = call_user_func($ETagFunction, $path);
+			return $hash;
+		}else{
+			return uniqid('', true);
+		}
+	}
 }
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
index 1f5c9356294..bb1ba16984d 100644
--- a/lib/files/storage/storage.php
+++ b/lib/files/storage/storage.php
@@ -63,4 +63,12 @@ interface Storage{
 	public function getScanner();
 
 	public function getOwner($path);
+
+	/**
+	 * get the ETag for a file or folder
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getETag($path);
 }
diff --git a/lib/files/view.php b/lib/files/view.php
index e3f9b762f7a..a54c3ee3564 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -866,4 +866,19 @@ class View {
 
 		return $files;
 	}
+
+	/**
+	 * get the ETag for a file or folder
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getETag($path){
+		/**
+		 * @var Storage\Storage $storage
+		 * @var string $internalPath
+		 */
+		list($storage, $internalPath) = $this->resolvePath($path);
+		return $storage->getETag($internalPath);
+	}
 }
-- 
cgit v1.2.3


From cbcd9ba84ada830d91a6f1d7bee0ac59762835ed Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 15 Nov 2012 00:57:30 +0100
Subject: allow storage backends to implement custom permission management

---
 lib/files/cache/permissions.php       | 36 +++++++++++++++++++---------
 lib/files/storage/common.php          | 14 +++++++----
 lib/files/storage/storage.php         |  5 ++++
 lib/files/view.php                    |  6 +++--
 tests/lib/files/cache/permissions.php | 45 +++++++++++++++++++++--------------
 tests/lib/files/cache/scanner.php     |  3 ++-
 tests/lib/files/cache/watcher.php     |  3 ++-
 tests/lib/files/view.php              |  3 ++-
 8 files changed, 76 insertions(+), 39 deletions(-)

(limited to 'lib/files/storage')

diff --git a/lib/files/cache/permissions.php b/lib/files/cache/permissions.php
index dd7233abc70..d0968337f02 100644
--- a/lib/files/cache/permissions.php
+++ b/lib/files/cache/permissions.php
@@ -9,6 +9,22 @@
 namespace OC\Files\Cache;
 
 class Permissions {
+	/**
+	 * @var string $storageId
+	 */
+	private $storageId;
+
+	/**
+	 * @param \OC\Files\Storage\Storage|string $storage
+	 */
+	public function __construct($storage){
+		if($storage instanceof \OC\Files\Storage\Storage){
+			$this->storageId = $storage->getId();
+		}else{
+			$this->storageId = $storage;
+		}
+	}
+
 	/**
 	 * get the permissions for a single file
 	 *
@@ -16,7 +32,7 @@ class Permissions {
 	 * @param string $user
 	 * @return int (-1 if file no permissions set)
 	 */
-	static public function get($fileId, $user) {
+	public function get($fileId, $user) {
 		$query = \OC_DB::prepare('SELECT `permissions` FROM `*PREFIX*permissions` WHERE `user` = ? AND `fileid` = ?');
 		$result = $query->execute(array($user, $fileId));
 		if ($row = $result->fetchRow()) {
@@ -33,7 +49,7 @@ class Permissions {
 	 * @param string $user
 	 * @param int $permissions
 	 */
-	static public function set($fileId, $user, $permissions) {
+	public function set($fileId, $user, $permissions) {
 		if (self::get($fileId, $user) !== -1) {
 			$query = \OC_DB::prepare('UPDATE `*PREFIX*permissions` SET `permissions` = ? WHERE `user` = ? AND `fileid` = ?');
 		} else {
@@ -49,7 +65,7 @@ class Permissions {
 	 * @param string $user
 	 * @return int[]
 	 */
-	static public function getMultiple($fileIds, $user) {
+	public function getMultiple($fileIds, $user) {
 		if (count($fileIds) === 0) {
 			return array();
 		}
@@ -72,17 +88,15 @@ class Permissions {
 	 * @param int $fileId
 	 * @param string $user
 	 */
-	static public function remove($fileId, $user) {
+	public function remove($fileId, $user) {
 		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*permissions` WHERE `fileid` = ? AND `user` = ?');
 		$query->execute(array($fileId, $user));
 	}
 
-	static public function removeMultiple($fileIds, $user) {
-		$params = $fileIds;
-		$params[] = $user;
-		$inPart = implode(', ', array_fill(0, count($fileIds), '?'));
-
-		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*permissions` WHERE `fileid` IN (' . $inPart . ') AND `user` = ?');
-		$query->execute($params);
+	public function removeMultiple($fileIds, $user) {
+		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*permissions` WHERE `fileid` = ? AND `user` = ?');
+		foreach($fileIds as $fileId){
+			$query->execute(array($fileId, $user));
+		}
 	}
 }
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index f471752d1ff..cf6fe64a4f2 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -57,19 +57,19 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	public function getPermissions($path){
 		$permissions = 0;
 		if($this->isCreatable($path)){
-			$permissions |= \OCP\Share::PERMISSION_CREATE;
+			$permissions |= \OCP\PERMISSION_CREATE;
 		}
 		if($this->isReadable($path)){
-			$permissions |= \OCP\Share::PERMISSION_READ;
+			$permissions |= \OCP\PERMISSION_READ;
 		}
 		if($this->isUpdatable($path)){
-			$permissions |= \OCP\Share::PERMISSION_UPDATE;
+			$permissions |= \OCP\PERMISSION_UPDATE;
 		}
 		if($this->isDeletable($path)){
-			$permissions |= \OCP\Share::PERMISSION_DELETE;
+			$permissions |= \OCP\PERMISSION_DELETE;
 		}
 		if($this->isSharable($path)){
-			$permissions |= \OCP\Share::PERMISSION_SHARE;
+			$permissions |= \OCP\PERMISSION_SHARE;
 		}
 		return $permissions;
 	}
@@ -259,6 +259,10 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		return new \OC\Files\Cache\Scanner($this);
 	}
 
+	public function getPermissionsCache(){
+		return new \OC\Files\Cache\Permissions($this);
+	}
+
 	/**
 	 * get the owner of a path
 	 * @param string $path The path to get the owner
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
index bb1ba16984d..73dcb8fe36b 100644
--- a/lib/files/storage/storage.php
+++ b/lib/files/storage/storage.php
@@ -64,6 +64,11 @@ interface Storage{
 
 	public function getOwner($path);
 
+	/**
+	 * @return \OC\Files\Cache\Permissions
+	 */
+	public function getPermissionsCache();
+
 	/**
 	 * get the ETag for a file or folder
 	 *
diff --git a/lib/files/view.php b/lib/files/view.php
index a54c3ee3564..e516a4fed6a 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -701,7 +701,8 @@ class View {
 			}
 		}
 
-		$data['permissions'] = Cache\Permissions::get($data['fileid'], \OC_User::getUser());
+		$permissionsCache = $storage->getPermissionsCache();
+		$data['permissions'] = $permissionsCache->get($data['fileid'], \OC_User::getUser());
 
 		return $data;
 	}
@@ -759,8 +760,9 @@ class View {
 			$files[$i]['type'] = $file['mimetype'] === 'httpd/unix-directory' ? 'dir' : 'file';
 			$ids[] = $file['fileid'];
 		}
+		$permissionsCache = $storage->getPermissionsCache();
 
-		$permissions = Cache\Permissions::getMultiple($ids, \OC_User::getUser());
+		$permissions = $permissionsCache->getMultiple($ids, \OC_User::getUser());
 		foreach ($files as $i => $file) {
 			$files[$i]['permissions'] = $permissions[$file['fileid']];
 		}
diff --git a/tests/lib/files/cache/permissions.php b/tests/lib/files/cache/permissions.php
index 4d47929a3ee..56dbbc4518e 100644
--- a/tests/lib/files/cache/permissions.php
+++ b/tests/lib/files/cache/permissions.php
@@ -9,39 +9,48 @@
 namespace Test\Files\Cache;
 
 class Permissions extends \PHPUnit_Framework_TestCase {
+	/***
+	 * @var \OC\Files\Cache\Permissions $permissionsCache
+	 */
+	private $permissionsCache;
+
+	function setUp(){
+		$this->permissionsCache=new \OC\Files\Cache\Permissions('dummy');
+	}
+
 	function testSimple() {
 		$ids = range(1, 10);
 		$user = uniqid();
 
-		$this->assertEquals(-1, \OC\Files\Cache\Permissions::get(1, $user));
-		\OC\Files\Cache\Permissions::set(1, $user, 1);
-		$this->assertEquals(1, \OC\Files\Cache\Permissions::get(1, $user));
-		$this->assertEquals(-1, \OC\Files\Cache\Permissions::get(2, $user));
-		$this->assertEquals(-1, \OC\Files\Cache\Permissions::get(1, $user . '2'));
+		$this->assertEquals(-1, $this->permissionsCache->get(1, $user));
+		$this->permissionsCache->set(1, $user, 1);
+		$this->assertEquals(1, $this->permissionsCache->get(1, $user));
+		$this->assertEquals(-1, $this->permissionsCache->get(2, $user));
+		$this->assertEquals(-1, $this->permissionsCache->get(1, $user . '2'));
 
-		\OC\Files\Cache\Permissions::set(1, $user, 2);
-		$this->assertEquals(2, \OC\Files\Cache\Permissions::get(1, $user));
+		$this->permissionsCache->set(1, $user, 2);
+		$this->assertEquals(2, $this->permissionsCache->get(1, $user));
 
-		\OC\Files\Cache\Permissions::set(2, $user, 1);
-		$this->assertEquals(1, \OC\Files\Cache\Permissions::get(2, $user));
+		$this->permissionsCache->set(2, $user, 1);
+		$this->assertEquals(1, $this->permissionsCache->get(2, $user));
 
-		\OC\Files\Cache\Permissions::remove(1, $user);
-		$this->assertEquals(-1, \OC\Files\Cache\Permissions::get(1, $user));
-		\OC\Files\Cache\Permissions::remove(1, $user . '2');
-		$this->assertEquals(1, \OC\Files\Cache\Permissions::get(2, $user));
+		$this->permissionsCache->remove(1, $user);
+		$this->assertEquals(-1, $this->permissionsCache->get(1, $user));
+		$this->permissionsCache->remove(1, $user . '2');
+		$this->assertEquals(1, $this->permissionsCache->get(2, $user));
 
 		$expected = array();
 		foreach ($ids as $id) {
-			\OC\Files\Cache\Permissions::set($id, $user, 10 + $id);
+			$this->permissionsCache->set($id, $user, 10 + $id);
 			$expected[$id] = 10 + $id;
 		}
-		$this->assertEquals($expected, \OC\Files\Cache\Permissions::getMultiple($ids, $user));
+		$this->assertEquals($expected, $this->permissionsCache->getMultiple($ids, $user));
 
-		\OC\Files\Cache\Permissions::removeMultiple(array(10, 9), $user);
+		$this->permissionsCache->removeMultiple(array(10, 9), $user);
 		unset($expected[9]);
 		unset($expected[10]);
-		$this->assertEquals($expected, \OC\Files\Cache\Permissions::getMultiple($ids, $user));
+		$this->assertEquals($expected, $this->permissionsCache->getMultiple($ids, $user));
 
-		\OC\Files\Cache\Permissions::removeMultiple($ids, $user);
+		$this->permissionsCache->removeMultiple($ids, $user);
 	}
 }
diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php
index f784a82dada..c53da92727c 100644
--- a/tests/lib/files/cache/scanner.php
+++ b/tests/lib/files/cache/scanner.php
@@ -112,7 +112,8 @@ class Scanner extends \UnitTestCase {
 
 	function tearDown() {
 		$ids = $this->cache->getAll();
-		\OC\Files\Cache\Permissions::removeMultiple($ids, \OC_User::getUser());
+		$permissionsCache = $this->storage->getPermissionsCache();
+		$permissionsCache->removeMultiple($ids, \OC_User::getUser());
 		$this->cache->clear();
 	}
 }
diff --git a/tests/lib/files/cache/watcher.php b/tests/lib/files/cache/watcher.php
index a7076d9b0b5..0125dd843b9 100644
--- a/tests/lib/files/cache/watcher.php
+++ b/tests/lib/files/cache/watcher.php
@@ -23,7 +23,8 @@ class Watcher extends \PHPUnit_Framework_TestCase {
 		foreach ($this->storages as $storage) {
 			$cache = $storage->getCache();
 			$ids = $cache->getAll();
-			\OC\Files\Cache\Permissions::removeMultiple($ids, \OC_User::getUser());
+			$permissionsCache = $storage->getPermissionsCache();
+			$permissionsCache->removeMultiple($ids, \OC_User::getUser());
 			$cache->clear();
 		}
 	}
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index fa562cb15cd..a173094b1cc 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -21,7 +21,8 @@ class View extends \PHPUnit_Framework_TestCase {
 		foreach ($this->storages as $storage) {
 			$cache = $storage->getCache();
 			$ids = $cache->getAll();
-			\OC\Files\Cache\Permissions::removeMultiple($ids, \OC_User::getUser());
+			$permissionsCache = $storage->getPermissionsCache();
+			$permissionsCache->removeMultiple($ids, \OC_User::getUser());
 			$cache->clear();
 		}
 	}
-- 
cgit v1.2.3


From 810563ae8aa5884a101cc64226c4f8c3c897132e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 22 Nov 2012 12:44:31 +0100
Subject: don't redefine inherited functions as abstract

---
 lib/files/storage/common.php | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'lib/files/storage')

diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index cf6fe64a4f2..9978cea5712 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -23,18 +23,12 @@ namespace OC\Files\Storage;
 abstract class Common implements \OC\Files\Storage\Storage {
 
 	public function __construct($parameters) {}
- 	abstract public function getId();
- 	abstract public function mkdir($path);
- 	abstract public function rmdir($path);
- 	abstract public function opendir($path);
 	public function is_dir($path) {
 		return $this->filetype($path)=='dir';
 	}
 	public function is_file($path) {
 		return $this->filetype($path)=='file';
 	}
- 	abstract public function stat($path);
- 	abstract public function filetype($path);
 	public function filesize($path) {
 		if($this->is_dir($path)) {
 			return 0;//by definition
@@ -46,8 +40,6 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	public function isCreatable($path) {
 		return $this->isUpdatable($path);
 	}
- 	abstract public function isReadable($path);
- 	abstract public function isUpdatable($path);
 	public function isDeletable($path) {
 		return $this->isUpdatable($path);
 	}
@@ -73,7 +65,6 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		}
 		return $permissions;
 	}
- 	abstract public function file_exists($path);
 	public function filemtime($path) {
 		$stat = $this->stat($path);
 		return $stat['mtime'];
@@ -97,7 +88,6 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		$handle = $this->fopen($path, "w");
 		return fwrite($handle, $data);
 	}
- 	abstract public function unlink($path);
 	public function rename($path1,$path2) {
 		if($this->copy($path1,$path2)) {
 			return $this->unlink($path1);
@@ -111,7 +101,6 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		$count=\OC_Helper::streamCopy($source,$target);
 		return $count>0;
 	}
- 	abstract public function fopen($path,$mode);
 
 	/**
 	 * @brief Deletes all files and folders recursively within a directory
@@ -180,7 +169,6 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		unlink($tmpFile);
 		return $hash;
 	}
- 	abstract public function free_space($path);
 	public function search($query) {
 		return $this->searchInDir($query);
 	}
@@ -222,7 +210,6 @@ abstract class Common implements \OC\Files\Storage\Storage {
 			}
 		}
 	}
- 	abstract public function touch($path, $mtime=null);
 
 	protected function searchInDir($query,$dir='') {
 		$files=array();
-- 
cgit v1.2.3


From d3e37fa157faa59598e92a9aa02c6bbf818b60e0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 23 Nov 2012 16:23:52 +0100
Subject: remove fileatime from common storage backend

---
 lib/fileproxy.php            | 2 +-
 lib/files/storage/common.php | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'lib/files/storage')

diff --git a/lib/fileproxy.php b/lib/fileproxy.php
index 2f81bde64a1..52ec79b4bdb 100644
--- a/lib/fileproxy.php
+++ b/lib/fileproxy.php
@@ -36,7 +36,7 @@
  * The return value of the post-proxy will be used as the new result of the operation
  * The operations that have a post-proxy are:
  * file_get_contents, is_file, is_dir, file_exists, stat, is_readable,
- * is_writable, fileatime, filemtime, filectime, file_get_contents,
+ * is_writable, filemtime, filectime, file_get_contents,
  * getMimeType, hash, fopen, free_space and search
  */
 
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index 9978cea5712..c891d0c3ad0 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -69,10 +69,6 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		$stat = $this->stat($path);
 		return $stat['mtime'];
 	}
-	public function fileatime($path) {
-		$stat = $this->stat($path);
-		return $stat['atime'];
-	}
 	public function file_get_contents($path) {
 		$handle = $this->fopen($path, "r");
 		if(!$handle) {
-- 
cgit v1.2.3


From b4515d874e5259647886d148db902f9753bbeb81 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 26 Dec 2012 15:36:50 -0500
Subject: Only folders have Create permission

---
 lib/files/storage/common.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib/files/storage')

diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index c891d0c3ad0..3cf960d05df 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -38,7 +38,10 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		}
 	}
 	public function isCreatable($path) {
-		return $this->isUpdatable($path);
+		if ($this->is_dir($path) && $this->isUpdatable($path)) {
+			return true;
+		}
+		return false;
 	}
 	public function isDeletable($path) {
 		return $this->isUpdatable($path);
-- 
cgit v1.2.3


From b41189de4420ea8a48adaaf7bb59f9227124b70a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 1 Jan 2013 18:04:29 +0100
Subject: Cache: allow storage backends to overwrite Watcher

---
 lib/files/storage/common.php      |  7 +++++++
 lib/files/storage/storage.php     |  5 +++++
 lib/files/view.php                |  4 ++--
 tests/lib/files/cache/watcher.php | 14 +++++++-------
 4 files changed, 21 insertions(+), 9 deletions(-)

(limited to 'lib/files/storage')

diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index 3cf960d05df..ab167f28646 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -249,6 +249,13 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		return new \OC\Files\Cache\Permissions($this);
 	}
 
+	/**
+	 * @return \OC\Files\Cache\Watcher
+	 */
+	public function getWatcher(){
+		return new \OC\Files\Cache\Watcher($this);
+	}
+
 	/**
 	 * get the owner of a path
 	 * @param string $path The path to get the owner
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
index 73dcb8fe36b..b603381dc90 100644
--- a/lib/files/storage/storage.php
+++ b/lib/files/storage/storage.php
@@ -69,6 +69,11 @@ interface Storage{
 	 */
 	public function getPermissionsCache();
 
+	/**
+	 * @return \OC\Files\Cache\Watcher
+	 */
+	public function getWatcher();
+
 	/**
 	 * get the ETag for a file or folder
 	 *
diff --git a/lib/files/view.php b/lib/files/view.php
index 592c484a21c..d3f93d39f5a 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -685,7 +685,7 @@ class View {
 				$scanner = $storage->getScanner();
 				$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
 			} else {
-				$watcher = new \OC\Files\Cache\Watcher($storage);
+				$watcher = $storage->getWatcher();
 				$watcher->checkUpdate($internalPath);
 			}
 
@@ -733,7 +733,7 @@ class View {
 				$scanner = $storage->getScanner();
 				$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
 			} else {
-				$watcher = new \OC\Files\Cache\Watcher($storage);
+				$watcher = $storage->getWatcher();
 				$watcher->checkUpdate($internalPath);
 			}
 
diff --git a/tests/lib/files/cache/watcher.php b/tests/lib/files/cache/watcher.php
index 07c8ac3640c..e8a1689cab0 100644
--- a/tests/lib/files/cache/watcher.php
+++ b/tests/lib/files/cache/watcher.php
@@ -32,7 +32,7 @@ class Watcher extends \PHPUnit_Framework_TestCase {
 	function testWatcher() {
 		$storage = $this->getTestStorage();
 		$cache = $storage->getCache();
-		$updater = new \OC\Files\Cache\Watcher($storage);
+		$updater = $storage->getWatcher();
 
 		//set the mtime to the past so it can detect an mtime change
 		$cache->put('', array('mtime' => 10));
@@ -66,16 +66,16 @@ class Watcher extends \PHPUnit_Framework_TestCase {
 	public function testFileToFolder() {
 		$storage = $this->getTestStorage();
 		$cache = $storage->getCache();
-		$updater = new \OC\Files\Cache\Watcher($storage);
+		$updater = $storage->getWatcher();
 
 		//set the mtime to the past so it can detect an mtime change
 		$cache->put('', array('mtime' => 10));
 
 		$storage->unlink('foo.txt');
-		$storage->rename('folder','foo.txt');
+		$storage->rename('folder', 'foo.txt');
 		$updater->checkUpdate('');
 
-		$entry= $cache->get('foo.txt');
+		$entry = $cache->get('foo.txt');
 		$this->assertEquals(-1, $entry['size']);
 		$this->assertEquals('httpd/unix-directory', $entry['mimetype']);
 		$this->assertFalse($cache->inCache('folder'));
@@ -83,16 +83,16 @@ class Watcher extends \PHPUnit_Framework_TestCase {
 
 		$storage = $this->getTestStorage();
 		$cache = $storage->getCache();
-		$updater = new \OC\Files\Cache\Watcher($storage);
+		$updater = $storage->getWatcher();
 
 		//set the mtime to the past so it can detect an mtime change
 		$cache->put('foo.txt', array('mtime' => 10));
 
 		$storage->unlink('foo.txt');
-		$storage->rename('folder','foo.txt');
+		$storage->rename('folder', 'foo.txt');
 		$updater->checkUpdate('foo.txt');
 
-		$entry= $cache->get('foo.txt');
+		$entry = $cache->get('foo.txt');
 		$this->assertEquals('httpd/unix-directory', $entry['mimetype']);
 		$this->assertTrue($cache->inCache('foo.txt/bar.txt'));
 	}
-- 
cgit v1.2.3


From 04f83e3b539c6a20ce819bbe4f66c1996e7169f7 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 1 Jan 2013 20:11:39 +0100
Subject: Cache: optional path argument for getCache/Scanner/etc

---
 lib/files/storage/common.php  | 11 ++++-------
 lib/files/storage/storage.php | 12 ++++++++----
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'lib/files/storage')

diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index ab167f28646..e859d447f39 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -237,22 +237,19 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		return $this->filemtime($path)>$time;
 	}
 
-	public function getCache(){
+	public function getCache($path=''){
 		return new \OC\Files\Cache\Cache($this);
 	}
 
-	public function getScanner(){
+	public function getScanner($path=''){
 		return new \OC\Files\Cache\Scanner($this);
 	}
 
-	public function getPermissionsCache(){
+	public function getPermissionsCache($path=''){
 		return new \OC\Files\Cache\Permissions($this);
 	}
 
-	/**
-	 * @return \OC\Files\Cache\Watcher
-	 */
-	public function getWatcher(){
+	public function getWatcher($path=''){
 		return new \OC\Files\Cache\Watcher($this);
 	}
 
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
index b603381dc90..2cc835236ba 100644
--- a/lib/files/storage/storage.php
+++ b/lib/files/storage/storage.php
@@ -54,25 +54,29 @@ interface Storage{
 	public function hasUpdated($path,$time);
 
 	/**
+	 * @param string $path
 	 * @return \OC\Files\Cache\Cache
 	 */
-	public function getCache();
+	public function getCache($path='');
 	/**
+	 * @param string $path
 	 * @return \OC\Files\Cache\Scanner
 	 */
-	public function getScanner();
+	public function getScanner($path='');
 
 	public function getOwner($path);
 
 	/**
+	 * @param string $path
 	 * @return \OC\Files\Cache\Permissions
 	 */
-	public function getPermissionsCache();
+	public function getPermissionsCache($path='');
 
 	/**
+	 * @param string $path
 	 * @return \OC\Files\Cache\Watcher
 	 */
-	public function getWatcher();
+	public function getWatcher($path='');
 
 	/**
 	 * get the ETag for a file or folder
-- 
cgit v1.2.3


From 8a63bcc1e85499335ade1df459f0c9f467161404 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 11 Jan 2013 20:56:36 -0500
Subject: Don't use more entropy for etags

---
 lib/files/storage/common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/files/storage')

diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index e859d447f39..591803f0440 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -274,7 +274,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 			$hash = call_user_func($ETagFunction, $path);
 			return $hash;
 		}else{
-			return uniqid('', true);
+			return uniqid();
 		}
 	}
 }
-- 
cgit v1.2.3