nextcloud / server

lib/private/Files/Notify/Change.php

Indentation +32 added lines, -32 removed lines

@@ -26,40 +26,40 @@
 use OCP\Files\Notify\IChange;
 
 class Change implements IChange {
-	/** @var int */
-	private $type;
+    /** @var int */
+    private $type;
 
-	/** @var string */
-	private $path;
+    /** @var string */
+    private $path;
 
-	/**
-	 * Change constructor.
-	 *
-	 * @param int $type
-	 * @param string $path
-	 */
-	public function __construct($type, $path) {
-		$this->type = $type;
-		$this->path = $path;
-	}
+    /**
+     * Change constructor.
+     *
+     * @param int $type
+     * @param string $path
+     */
+    public function __construct($type, $path) {
+        $this->type = $type;
+        $this->path = $path;
+    }
 
-	/**
-	 * Get the type of the change
-	 *
-	 * @return int IChange::ADDED, IChange::REMOVED, IChange::MODIFIED or IChange::RENAMED
-	 */
-	public function getType() {
-		return $this->type;
-	}
+    /**
+     * Get the type of the change
+     *
+     * @return int IChange::ADDED, IChange::REMOVED, IChange::MODIFIED or IChange::RENAMED
+     */
+    public function getType() {
+        return $this->type;
+    }
 
-	/**
-	 * Get the path of the file that was changed relative to the root of the storage
-	 *
-	 * Note, for rename changes this path is the old path for the file
-	 *
-	 * @return mixed
-	 */
-	public function getPath() {
-		return $this->path;
-	}
+    /**
+     * Get the path of the file that was changed relative to the root of the storage
+     *
+     * Note, for rename changes this path is the old path for the file
+     *
+     * @return mixed
+     */
+    public function getPath() {
+        return $this->path;
+    }
 }

lib/private/Files/Cache/HomePropagator.php

Indentation +21 added lines, -21 removed lines

@@ -25,28 +25,28 @@
 use OCP\IDBConnection;
 
 class HomePropagator extends Propagator {
-	private $ignoredBaseFolders;
+    private $ignoredBaseFolders;
 
-	/**
-	 * @param \OC\Files\Storage\Storage $storage
-	 */
-	public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection) {
-		parent::__construct($storage, $connection);
-		$this->ignoredBaseFolders = ['files_encryption'];
-	}
+    /**
+     * @param \OC\Files\Storage\Storage $storage
+     */
+    public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection) {
+        parent::__construct($storage, $connection);
+        $this->ignoredBaseFolders = ['files_encryption'];
+    }
 
 
-	/**
-	 * @param string $internalPath
-	 * @param int $time
-	 * @param int $sizeDifference number of bytes the file has grown
-	 */
-	public function propagateChange($internalPath, $time, $sizeDifference = 0) {
-		list($baseFolder) = explode('/', $internalPath, 2);
-		if (in_array($baseFolder, $this->ignoredBaseFolders)) {
-			return [];
-		} else {
-			parent::propagateChange($internalPath, $time, $sizeDifference);
-		}
-	}
+    /**
+     * @param string $internalPath
+     * @param int $time
+     * @param int $sizeDifference number of bytes the file has grown
+     */
+    public function propagateChange($internalPath, $time, $sizeDifference = 0) {
+        list($baseFolder) = explode('/', $internalPath, 2);
+        if (in_array($baseFolder, $this->ignoredBaseFolders)) {
+            return [];
+        } else {
+            parent::propagateChange($internalPath, $time, $sizeDifference);
+        }
+    }
 }

lib/private/Files/Cache/Updater.php

Indentation +212 added lines, -212 removed lines

@@ -36,216 +36,216 @@
  *
  */
 class Updater implements IUpdater {
-	/**
-	 * @var bool
-	 */
-	protected $enabled = true;
-
-	/**
-	 * @var \OC\Files\Storage\Storage
-	 */
-	protected $storage;
-
-	/**
-	 * @var \OC\Files\Cache\Propagator
-	 */
-	protected $propagator;
-
-	/**
-	 * @var Scanner
-	 */
-	protected $scanner;
-
-	/**
-	 * @var Cache
-	 */
-	protected $cache;
-
-	/**
-	 * @param \OC\Files\Storage\Storage $storage
-	 */
-	public function __construct(\OC\Files\Storage\Storage $storage) {
-		$this->storage = $storage;
-		$this->propagator = $storage->getPropagator();
-		$this->scanner = $storage->getScanner();
-		$this->cache = $storage->getCache();
-	}
-
-	/**
-	 * Disable updating the cache trough this updater
-	 */
-	public function disable() {
-		$this->enabled = false;
-	}
-
-	/**
-	 * Re-enable the updating of the cache trough this updater
-	 */
-	public function enable() {
-		$this->enabled = true;
-	}
-
-	/**
-	 * Get the propagator for etags and mtime for the view the updater works on
-	 *
-	 * @return Propagator
-	 */
-	public function getPropagator() {
-		return $this->propagator;
-	}
-
-	/**
-	 * Propagate etag and mtime changes for the parent folders of $path up to the root of the filesystem
-	 *
-	 * @param string $path the path of the file to propagate the changes for
-	 * @param int|null $time the timestamp to set as mtime for the parent folders, if left out the current time is used
-	 */
-	public function propagate($path, $time = null) {
-		if (Scanner::isPartialFile($path)) {
-			return;
-		}
-		$this->propagator->propagateChange($path, $time);
-	}
-
-	/**
-	 * Update the cache for $path and update the size, etag and mtime of the parent folders
-	 *
-	 * @param string $path
-	 * @param int $time
-	 */
-	public function update($path, $time = null) {
-		if (!$this->enabled or Scanner::isPartialFile($path)) {
-			return;
-		}
-		if (is_null($time)) {
-			$time = time();
-		}
-
-		$data = $this->scanner->scan($path, Scanner::SCAN_SHALLOW, -1, false);
-		if (
-			isset($data['oldSize']) && isset($data['size']) &&
-			!$data['encrypted'] // encryption is a pita and touches the cache itself
-		) {
-			$sizeDifference = $data['size'] - $data['oldSize'];
-		} else {
-			// scanner didn't provide size info, fallback to full size calculation
-			$sizeDifference = 0;
-			if ($this->cache instanceof Cache) {
-				$this->cache->correctFolderSize($path, $data);
-			}
-		}
-		$this->correctParentStorageMtime($path);
-		$this->propagator->propagateChange($path, $time, $sizeDifference);
-	}
-
-	/**
-	 * Remove $path from the cache and update the size, etag and mtime of the parent folders
-	 *
-	 * @param string $path
-	 */
-	public function remove($path) {
-		if (!$this->enabled or Scanner::isPartialFile($path)) {
-			return;
-		}
-
-		$parent = dirname($path);
-		if ($parent === '.') {
-			$parent = '';
-		}
-
-		$entry = $this->cache->get($path);
-
-		$this->cache->remove($path);
-
-		$this->correctParentStorageMtime($path);
-		if ($entry instanceof ICacheEntry) {
-			$this->propagator->propagateChange($path, time(), -$entry->getSize());
-		} else {
-			$this->propagator->propagateChange($path, time());
-			if ($this->cache instanceof Cache) {
-				$this->cache->correctFolderSize($parent);
-			}
-		}
-
-	}
-
-	/**
-	 * Rename a file or folder in the cache and update the size, etag and mtime of the parent folders
-	 *
-	 * @param IStorage $sourceStorage
-	 * @param string $source
-	 * @param string $target
-	 */
-	public function renameFromStorage(IStorage $sourceStorage, $source, $target) {
-		if (!$this->enabled or Scanner::isPartialFile($source) or Scanner::isPartialFile($target)) {
-			return;
-		}
-
-		$time = time();
-
-		$sourceCache = $sourceStorage->getCache();
-		$sourceUpdater = $sourceStorage->getUpdater();
-		$sourcePropagator = $sourceStorage->getPropagator();
-
-		if ($sourceCache->inCache($source)) {
-			if ($this->cache->inCache($target)) {
-				$this->cache->remove($target);
-			}
-
-			if ($sourceStorage === $this->storage) {
-				$this->cache->move($source, $target);
-			} else {
-				$this->cache->moveFromCache($sourceCache, $source, $target);
-			}
-		}
-
-		if (pathinfo($source, PATHINFO_EXTENSION) !== pathinfo($target, PATHINFO_EXTENSION)) {
-			// handle mime type change
-			$mimeType = $this->storage->getMimeType($target);
-			$fileId = $this->cache->getId($target);
-			$this->cache->update($fileId, ['mimetype' => $mimeType]);
-		}
-
-		if ($sourceCache instanceof Cache) {
-			$sourceCache->correctFolderSize($source);
-		}
-		if ($this->cache instanceof Cache) {
-			$this->cache->correctFolderSize($target);
-		}
-		if ($sourceUpdater instanceof Updater) {
-			$sourceUpdater->correctParentStorageMtime($source);
-		}
-		$this->correctParentStorageMtime($target);
-		$this->updateStorageMTimeOnly($target);
-		$sourcePropagator->propagateChange($source, $time);
-		$this->propagator->propagateChange($target, $time);
-	}
-
-	private function updateStorageMTimeOnly($internalPath) {
-		$fileId = $this->cache->getId($internalPath);
-		if ($fileId !== -1) {
-			$this->cache->update(
-				$fileId, [
-					'mtime' => null, // this magic tells it to not overwrite mtime
-					'storage_mtime' => $this->storage->filemtime($internalPath)
-				]
-			);
-		}
-	}
-
-	/**
-	 * update the storage_mtime of the direct parent in the cache to the mtime from the storage
-	 *
-	 * @param string $internalPath
-	 */
-	private function correctParentStorageMtime($internalPath) {
-		$parentId = $this->cache->getParentId($internalPath);
-		$parent = dirname($internalPath);
-		if ($parentId != -1) {
-			$mtime = $this->storage->filemtime($parent);
-			if ($mtime !== false) {
-				$this->cache->update($parentId, array('storage_mtime' => $mtime));
-			}
-		}
-	}
+    /**
+     * @var bool
+     */
+    protected $enabled = true;
+
+    /**
+     * @var \OC\Files\Storage\Storage
+     */
+    protected $storage;
+
+    /**
+     * @var \OC\Files\Cache\Propagator
+     */
+    protected $propagator;
+
+    /**
+     * @var Scanner
+     */
+    protected $scanner;
+
+    /**
+     * @var Cache
+     */
+    protected $cache;
+
+    /**
+     * @param \OC\Files\Storage\Storage $storage
+     */
+    public function __construct(\OC\Files\Storage\Storage $storage) {
+        $this->storage = $storage;
+        $this->propagator = $storage->getPropagator();
+        $this->scanner = $storage->getScanner();
+        $this->cache = $storage->getCache();
+    }
+
+    /**
+     * Disable updating the cache trough this updater
+     */
+    public function disable() {
+        $this->enabled = false;
+    }
+
+    /**
+     * Re-enable the updating of the cache trough this updater
+     */
+    public function enable() {
+        $this->enabled = true;
+    }
+
+    /**
+     * Get the propagator for etags and mtime for the view the updater works on
+     *
+     * @return Propagator
+     */
+    public function getPropagator() {
+        return $this->propagator;
+    }
+
+    /**
+     * Propagate etag and mtime changes for the parent folders of $path up to the root of the filesystem
+     *
+     * @param string $path the path of the file to propagate the changes for
+     * @param int|null $time the timestamp to set as mtime for the parent folders, if left out the current time is used
+     */
+    public function propagate($path, $time = null) {
+        if (Scanner::isPartialFile($path)) {
+            return;
+        }
+        $this->propagator->propagateChange($path, $time);
+    }
+
+    /**
+     * Update the cache for $path and update the size, etag and mtime of the parent folders
+     *
+     * @param string $path
+     * @param int $time
+     */
+    public function update($path, $time = null) {
+        if (!$this->enabled or Scanner::isPartialFile($path)) {
+            return;
+        }
+        if (is_null($time)) {
+            $time = time();
+        }
+
+        $data = $this->scanner->scan($path, Scanner::SCAN_SHALLOW, -1, false);
+        if (
+            isset($data['oldSize']) && isset($data['size']) &&
+            !$data['encrypted'] // encryption is a pita and touches the cache itself
+        ) {
+            $sizeDifference = $data['size'] - $data['oldSize'];
+        } else {
+            // scanner didn't provide size info, fallback to full size calculation
+            $sizeDifference = 0;
+            if ($this->cache instanceof Cache) {
+                $this->cache->correctFolderSize($path, $data);
+            }
+        }
+        $this->correctParentStorageMtime($path);
+        $this->propagator->propagateChange($path, $time, $sizeDifference);
+    }
+
+    /**
+     * Remove $path from the cache and update the size, etag and mtime of the parent folders
+     *
+     * @param string $path
+     */
+    public function remove($path) {
+        if (!$this->enabled or Scanner::isPartialFile($path)) {
+            return;
+        }
+
+        $parent = dirname($path);
+        if ($parent === '.') {
+            $parent = '';
+        }
+
+        $entry = $this->cache->get($path);
+
+        $this->cache->remove($path);
+
+        $this->correctParentStorageMtime($path);
+        if ($entry instanceof ICacheEntry) {
+            $this->propagator->propagateChange($path, time(), -$entry->getSize());
+        } else {
+            $this->propagator->propagateChange($path, time());
+            if ($this->cache instanceof Cache) {
+                $this->cache->correctFolderSize($parent);
+            }
+        }
+
+    }
+
+    /**
+     * Rename a file or folder in the cache and update the size, etag and mtime of the parent folders
+     *
+     * @param IStorage $sourceStorage
+     * @param string $source
+     * @param string $target
+     */
+    public function renameFromStorage(IStorage $sourceStorage, $source, $target) {
+        if (!$this->enabled or Scanner::isPartialFile($source) or Scanner::isPartialFile($target)) {
+            return;
+        }
+
+        $time = time();
+
+        $sourceCache = $sourceStorage->getCache();
+        $sourceUpdater = $sourceStorage->getUpdater();
+        $sourcePropagator = $sourceStorage->getPropagator();
+
+        if ($sourceCache->inCache($source)) {
+            if ($this->cache->inCache($target)) {
+                $this->cache->remove($target);
+            }
+
+            if ($sourceStorage === $this->storage) {
+                $this->cache->move($source, $target);
+            } else {
+                $this->cache->moveFromCache($sourceCache, $source, $target);
+            }
+        }
+
+        if (pathinfo($source, PATHINFO_EXTENSION) !== pathinfo($target, PATHINFO_EXTENSION)) {
+            // handle mime type change
+            $mimeType = $this->storage->getMimeType($target);
+            $fileId = $this->cache->getId($target);
+            $this->cache->update($fileId, ['mimetype' => $mimeType]);
+        }
+
+        if ($sourceCache instanceof Cache) {
+            $sourceCache->correctFolderSize($source);
+        }
+        if ($this->cache instanceof Cache) {
+            $this->cache->correctFolderSize($target);
+        }
+        if ($sourceUpdater instanceof Updater) {
+            $sourceUpdater->correctParentStorageMtime($source);
+        }
+        $this->correctParentStorageMtime($target);
+        $this->updateStorageMTimeOnly($target);
+        $sourcePropagator->propagateChange($source, $time);
+        $this->propagator->propagateChange($target, $time);
+    }
+
+    private function updateStorageMTimeOnly($internalPath) {
+        $fileId = $this->cache->getId($internalPath);
+        if ($fileId !== -1) {
+            $this->cache->update(
+                $fileId, [
+                    'mtime' => null, // this magic tells it to not overwrite mtime
+                    'storage_mtime' => $this->storage->filemtime($internalPath)
+                ]
+            );
+        }
+    }
+
+    /**
+     * update the storage_mtime of the direct parent in the cache to the mtime from the storage
+     *
+     * @param string $internalPath
+     */
+    private function correctParentStorageMtime($internalPath) {
+        $parentId = $this->cache->getParentId($internalPath);
+        $parent = dirname($internalPath);
+        if ($parentId != -1) {
+            $mtime = $this->storage->filemtime($parent);
+            if ($mtime !== false) {
+                $this->cache->update($parentId, array('storage_mtime' => $mtime));
+            }
+        }
+    }
 }

lib/private/Files/Cache/CacheEntry.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 	}
 
 	public function getId() {
-		return (int)$this->data['fileid'];
+		return (int) $this->data['fileid'];
 	}
 
 	public function getStorageId() {

Indentation +71 added lines, -71 removed lines

@@ -28,100 +28,100 @@
  * meta data for a file or folder
  */
 class CacheEntry implements ICacheEntry, \ArrayAccess {
-	/**
-	 * @var array
-	 */
-	private $data;
+    /**
+     * @var array
+     */
+    private $data;
 
-	public function __construct(array $data) {
-		$this->data = $data;
-	}
+    public function __construct(array $data) {
+        $this->data = $data;
+    }
 
-	public function offsetSet($offset, $value) {
-		$this->data[$offset] = $value;
-	}
+    public function offsetSet($offset, $value) {
+        $this->data[$offset] = $value;
+    }
 
-	public function offsetExists($offset) {
-		return isset($this->data[$offset]);
-	}
+    public function offsetExists($offset) {
+        return isset($this->data[$offset]);
+    }
 
-	public function offsetUnset($offset) {
-		unset($this->data[$offset]);
-	}
+    public function offsetUnset($offset) {
+        unset($this->data[$offset]);
+    }
 
-	public function offsetGet($offset) {
-		if (isset($this->data[$offset])) {
-			return $this->data[$offset];
-		} else {
-			return null;
-		}
-	}
+    public function offsetGet($offset) {
+        if (isset($this->data[$offset])) {
+            return $this->data[$offset];
+        } else {
+            return null;
+        }
+    }
 
-	public function getId() {
-		return (int)$this->data['fileid'];
-	}
+    public function getId() {
+        return (int)$this->data['fileid'];
+    }
 
-	public function getStorageId() {
-		return $this->data['storage'];
-	}
+    public function getStorageId() {
+        return $this->data['storage'];
+    }
 
 
-	public function getPath() {
-		return $this->data['path'];
-	}
+    public function getPath() {
+        return $this->data['path'];
+    }
 
 
-	public function getName() {
-		return $this->data['name'];
-	}
+    public function getName() {
+        return $this->data['name'];
+    }
 
 
-	public function getMimeType() {
-		return $this->data['mimetype'];
-	}
+    public function getMimeType() {
+        return $this->data['mimetype'];
+    }
 
 
-	public function getMimePart() {
-		return $this->data['mimepart'];
-	}
+    public function getMimePart() {
+        return $this->data['mimepart'];
+    }
 
-	public function getSize() {
-		return $this->data['size'];
-	}
+    public function getSize() {
+        return $this->data['size'];
+    }
 
-	public function getMTime() {
-		return $this->data['mtime'];
-	}
+    public function getMTime() {
+        return $this->data['mtime'];
+    }
 
-	public function getStorageMTime() {
-		return $this->data['storage_mtime'];
-	}
+    public function getStorageMTime() {
+        return $this->data['storage_mtime'];
+    }
 
-	public function getEtag() {
-		return $this->data['etag'];
-	}
+    public function getEtag() {
+        return $this->data['etag'];
+    }
 
-	public function getPermissions() {
-		return $this->data['permissions'];
-	}
+    public function getPermissions() {
+        return $this->data['permissions'];
+    }
 
-	public function isEncrypted() {
-		return isset($this->data['encrypted']) && $this->data['encrypted'];
-	}
+    public function isEncrypted() {
+        return isset($this->data['encrypted']) && $this->data['encrypted'];
+    }
 
-	public function getMetadataEtag(): ?string {
-		return $this->data['metadata_etag'];
-	}
+    public function getMetadataEtag(): ?string {
+        return $this->data['metadata_etag'];
+    }
 
-	public function getCreationTime(): ?int {
-		return $this->data['creation_time'];
-	}
+    public function getCreationTime(): ?int {
+        return $this->data['creation_time'];
+    }
 
-	public function getUploadTime(): ?int {
-		return $this->data['upload_time'];
-	}
+    public function getUploadTime(): ?int {
+        return $this->data['upload_time'];
+    }
 
-	public function getData() {
-		return $this->data;
-	}
+    public function getData() {
+        return $this->data;
+    }
 }

lib/private/Files/Cache/HomeCache.php

Indentation +51 added lines, -51 removed lines

@@ -30,58 +30,58 @@
 use OCP\Files\Cache\ICacheEntry;
 
 class HomeCache extends Cache {
-	/**
-	 * get the size of a folder and set it in the cache
-	 *
-	 * @param string $path
-	 * @param array $entry (optional) meta data of the folder
-	 * @return int
-	 */
-	public function calculateFolderSize($path, $entry = null) {
-		if ($path !== '/' and $path !== '' and $path !== 'files' and $path !== 'files_trashbin' and $path !== 'files_versions') {
-			return parent::calculateFolderSize($path, $entry);
-		} elseif ($path === '' or $path === '/') {
-			// since the size of / isn't used (the size of /files is used instead) there is no use in calculating it
-			return 0;
-		}
+    /**
+     * get the size of a folder and set it in the cache
+     *
+     * @param string $path
+     * @param array $entry (optional) meta data of the folder
+     * @return int
+     */
+    public function calculateFolderSize($path, $entry = null) {
+        if ($path !== '/' and $path !== '' and $path !== 'files' and $path !== 'files_trashbin' and $path !== 'files_versions') {
+            return parent::calculateFolderSize($path, $entry);
+        } elseif ($path === '' or $path === '/') {
+            // since the size of / isn't used (the size of /files is used instead) there is no use in calculating it
+            return 0;
+        }
 
-		$totalSize = 0;
-		if (is_null($entry)) {
-			$entry = $this->get($path);
-		}
-		if ($entry && $entry['mimetype'] === 'httpd/unix-directory') {
-			$id = $entry['fileid'];
-			$sql = 'SELECT SUM(`size`) AS f1 ' .
-			   'FROM `*PREFIX*filecache` ' .
-				'WHERE `parent` = ? AND `storage` = ? AND `size` >= 0';
-			$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
-			if ($row = $result->fetchRow()) {
-				$result->closeCursor();
-				list($sum) = array_values($row);
-				$totalSize = 0 + $sum;
-				$entry['size'] += 0;
-				if ($entry['size'] !== $totalSize) {
-					$this->update($id, array('size' => $totalSize));
-				}
-			}
-		}
-		return $totalSize;
-	}
+        $totalSize = 0;
+        if (is_null($entry)) {
+            $entry = $this->get($path);
+        }
+        if ($entry && $entry['mimetype'] === 'httpd/unix-directory') {
+            $id = $entry['fileid'];
+            $sql = 'SELECT SUM(`size`) AS f1 ' .
+                'FROM `*PREFIX*filecache` ' .
+                'WHERE `parent` = ? AND `storage` = ? AND `size` >= 0';
+            $result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
+            if ($row = $result->fetchRow()) {
+                $result->closeCursor();
+                list($sum) = array_values($row);
+                $totalSize = 0 + $sum;
+                $entry['size'] += 0;
+                if ($entry['size'] !== $totalSize) {
+                    $this->update($id, array('size' => $totalSize));
+                }
+            }
+        }
+        return $totalSize;
+    }
 
-	/**
-	 * @param string $path
-	 * @return ICacheEntry
-	 */
-	public function get($path) {
-		$data = parent::get($path);
-		if ($path === '' or $path === '/') {
-			// only the size of the "files" dir counts
-			$filesData = parent::get('files');
+    /**
+     * @param string $path
+     * @return ICacheEntry
+     */
+    public function get($path) {
+        $data = parent::get($path);
+        if ($path === '' or $path === '/') {
+            // only the size of the "files" dir counts
+            $filesData = parent::get('files');
 
-			if (isset($filesData['size'])) {
-				$data['size'] = $filesData['size'];
-			}
-		}
-		return $data;
-	}
+            if (isset($filesData['size'])) {
+                $data['size'] = $filesData['size'];
+            }
+        }
+        return $data;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -51,8 +51,8 @@
 		}
 		if ($entry && $entry['mimetype'] === 'httpd/unix-directory') {
 			$id = $entry['fileid'];
-			$sql = 'SELECT SUM(`size`) AS f1 ' .
-			   'FROM `*PREFIX*filecache` ' .
+			$sql = 'SELECT SUM(`size`) AS f1 '.
+			   'FROM `*PREFIX*filecache` '.
 				'WHERE `parent` = ? AND `storage` = ? AND `size` >= 0';
 			$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
 			if ($row = $result->fetchRow()) {

lib/private/Files/Cache/MoveFromCacheTrait.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 		if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
 			$folderContent = $sourceCache->getFolderContentsById($sourceEntry->getId());
 			foreach ($folderContent as $subEntry) {
-				$subTargetPath = $targetPath . '/' . $subEntry->getName();
+				$subTargetPath = $targetPath.'/'.$subEntry->getName();
 				$this->copyFromCache($sourceCache, $subEntry, $subTargetPath);
 			}
 		}

Indentation +54 added lines, -54 removed lines

@@ -29,63 +29,63 @@
  * Fallback implementation for moveFromCache
  */
 trait MoveFromCacheTrait {
-	/**
-	 * store meta data for a file or folder
-	 *
-	 * @param string $file
-	 * @param array $data
-	 *
-	 * @return int file id
-	 * @throws \RuntimeException
-	 */
-	abstract public function put($file, array $data);
+    /**
+     * store meta data for a file or folder
+     *
+     * @param string $file
+     * @param array $data
+     *
+     * @return int file id
+     * @throws \RuntimeException
+     */
+    abstract public function put($file, array $data);
 
-	/**
-	 * Move a file or folder in the cache
-	 *
-	 * @param \OCP\Files\Cache\ICache $sourceCache
-	 * @param string $sourcePath
-	 * @param string $targetPath
-	 */
-	public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
-		$sourceEntry = $sourceCache->get($sourcePath);
+    /**
+     * Move a file or folder in the cache
+     *
+     * @param \OCP\Files\Cache\ICache $sourceCache
+     * @param string $sourcePath
+     * @param string $targetPath
+     */
+    public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
+        $sourceEntry = $sourceCache->get($sourcePath);
 
-		$this->copyFromCache($sourceCache, $sourceEntry, $targetPath);
+        $this->copyFromCache($sourceCache, $sourceEntry, $targetPath);
 
-		$sourceCache->remove($sourcePath);
-	}
+        $sourceCache->remove($sourcePath);
+    }
 
-	/**
-	 * Copy a file or folder in the cache
-	 *
-	 * @param \OCP\Files\Cache\ICache $sourceCache
-	 * @param ICacheEntry $sourceEntry
-	 * @param string $targetPath
-	 */
-	public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, $targetPath) {
-		$this->put($targetPath, $this->cacheEntryToArray($sourceEntry));
-		if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
-			$folderContent = $sourceCache->getFolderContentsById($sourceEntry->getId());
-			foreach ($folderContent as $subEntry) {
-				$subTargetPath = $targetPath . '/' . $subEntry->getName();
-				$this->copyFromCache($sourceCache, $subEntry, $subTargetPath);
-			}
-		}
-	}
+    /**
+     * Copy a file or folder in the cache
+     *
+     * @param \OCP\Files\Cache\ICache $sourceCache
+     * @param ICacheEntry $sourceEntry
+     * @param string $targetPath
+     */
+    public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, $targetPath) {
+        $this->put($targetPath, $this->cacheEntryToArray($sourceEntry));
+        if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
+            $folderContent = $sourceCache->getFolderContentsById($sourceEntry->getId());
+            foreach ($folderContent as $subEntry) {
+                $subTargetPath = $targetPath . '/' . $subEntry->getName();
+                $this->copyFromCache($sourceCache, $subEntry, $subTargetPath);
+            }
+        }
+    }
 
-	private function cacheEntryToArray(ICacheEntry $entry) {
-		return [
-			'size' => $entry->getSize(),
-			'mtime' => $entry->getMTime(),
-			'storage_mtime' => $entry->getStorageMTime(),
-			'mimetype' => $entry->getMimeType(),
-			'mimepart' => $entry->getMimePart(),
-			'etag' => $entry->getEtag(),
-			'permissions' => $entry->getPermissions(),
-			'encrypted' => $entry->isEncrypted(),
-			'creation_time' => $entry->getCreationTime(),
-			'upload_time' => $entry->getUploadTime(),
-			'metadata_etag' => $entry->getMetadataEtag(),
-		];
-	}
+    private function cacheEntryToArray(ICacheEntry $entry) {
+        return [
+            'size' => $entry->getSize(),
+            'mtime' => $entry->getMTime(),
+            'storage_mtime' => $entry->getStorageMTime(),
+            'mimetype' => $entry->getMimeType(),
+            'mimepart' => $entry->getMimePart(),
+            'etag' => $entry->getEtag(),
+            'permissions' => $entry->getPermissions(),
+            'encrypted' => $entry->isEncrypted(),
+            'creation_time' => $entry->getCreationTime(),
+            'upload_time' => $entry->getUploadTime(),
+            'metadata_etag' => $entry->getMetadataEtag(),
+        ];
+    }
 }

lib/private/Search/Provider/File.php

Spacing +4 added lines, -4 removed lines

@@ -51,19 +51,19 @@
 				continue;
 			}
 			// create audio result
-			if($fileData['mimepart'] === 'audio'){
+			if ($fileData['mimepart'] === 'audio') {
 				$result = new \OC\Search\Result\Audio($fileData);
 			}
 			// create image result
-			elseif($fileData['mimepart'] === 'image'){
+			elseif ($fileData['mimepart'] === 'image') {
 				$result = new \OC\Search\Result\Image($fileData);
 			}
 			// create folder result
-			elseif($fileData['mimetype'] === 'httpd/unix-directory'){
+			elseif ($fileData['mimetype'] === 'httpd/unix-directory') {
 				$result = new \OC\Search\Result\Folder($fileData);
 			}
 			// or create file result
-			else{
+			else {
 				$result = new \OC\Search\Result\File($fileData);
 			}
 			// add to results

Indentation +40 added lines, -40 removed lines

@@ -32,45 +32,45 @@
  */
 class File extends \OCP\Search\Provider {
 
-	/**
-	 * Search for files and folders matching the given query
-	 * @param string $query
-	 * @return \OCP\Search\Result
-	 */
-	public function search($query) {
-		$files = Filesystem::search($query);
-		$results = array();
-		// edit results
-		foreach ($files as $fileData) {
-			// skip versions
-			if (strpos($fileData['path'], '_versions') === 0) {
-				continue;
-			}
-			// skip top-level folder
-			if ($fileData['name'] === 'files' && $fileData['parent'] === -1) {
-				continue;
-			}
-			// create audio result
-			if($fileData['mimepart'] === 'audio'){
-				$result = new \OC\Search\Result\Audio($fileData);
-			}
-			// create image result
-			elseif($fileData['mimepart'] === 'image'){
-				$result = new \OC\Search\Result\Image($fileData);
-			}
-			// create folder result
-			elseif($fileData['mimetype'] === 'httpd/unix-directory'){
-				$result = new \OC\Search\Result\Folder($fileData);
-			}
-			// or create file result
-			else{
-				$result = new \OC\Search\Result\File($fileData);
-			}
-			// add to results
-			$results[] = $result;
-		}
-		// return
-		return $results;
-	}
+    /**
+     * Search for files and folders matching the given query
+     * @param string $query
+     * @return \OCP\Search\Result
+     */
+    public function search($query) {
+        $files = Filesystem::search($query);
+        $results = array();
+        // edit results
+        foreach ($files as $fileData) {
+            // skip versions
+            if (strpos($fileData['path'], '_versions') === 0) {
+                continue;
+            }
+            // skip top-level folder
+            if ($fileData['name'] === 'files' && $fileData['parent'] === -1) {
+                continue;
+            }
+            // create audio result
+            if($fileData['mimepart'] === 'audio'){
+                $result = new \OC\Search\Result\Audio($fileData);
+            }
+            // create image result
+            elseif($fileData['mimepart'] === 'image'){
+                $result = new \OC\Search\Result\Image($fileData);
+            }
+            // create folder result
+            elseif($fileData['mimetype'] === 'httpd/unix-directory'){
+                $result = new \OC\Search\Result\Folder($fileData);
+            }
+            // or create file result
+            else{
+                $result = new \OC\Search\Result\File($fileData);
+            }
+            // add to results
+            $results[] = $result;
+        }
+        // return
+        return $results;
+    }
 	
 }

lib/private/Search/Result/Image.php

Indentation +8 added lines, -8 removed lines

@@ -29,13 +29,13 @@
  */
 class Image extends File {
 
-	/**
-	 * Type name; translated in templates
-	 * @var string 
-	 */
-	public $type = 'image';
+    /**
+     * Type name; translated in templates
+     * @var string 
+     */
+    public $type = 'image';
 	
-	/**
-	 * @TODO add EXIF information
-	 */
+    /**
+     * @TODO add EXIF information
+     */
 }

lib/private/Search/Result/File.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 	 * @param string $path
 	 * @return string relative path
 	 */
-	protected function getRelativePath ($path) {
+	protected function getRelativePath($path) {
 		if (!isset(self::$userFolderCache)) {
 			$user = \OC::$server->getUserSession()->getUser()->getUID();
 			self::$userFolderCache = \OC::$server->getUserFolder($user);

Indentation +70 added lines, -70 removed lines

@@ -32,85 +32,85 @@
  */
 class File extends \OCP\Search\Result {
 
-	/**
-	 * Type name; translated in templates
-	 * @var string 
-	 */
-	public $type = 'file';
+    /**
+     * Type name; translated in templates
+     * @var string 
+     */
+    public $type = 'file';
 
-	/**
-	 * Path to file
-	 * @var string
-	 */
-	public $path;
+    /**
+     * Path to file
+     * @var string
+     */
+    public $path;
 
-	/**
-	 * Size, in bytes
-	 * @var int 
-	 */
-	public $size;
+    /**
+     * Size, in bytes
+     * @var int 
+     */
+    public $size;
 
-	/**
-	 * Date modified, in human readable form
-	 * @var string
-	 */
-	public $modified;
+    /**
+     * Date modified, in human readable form
+     * @var string
+     */
+    public $modified;
 
-	/**
-	 * File mime type
-	 * @var string
-	 */
-	public $mime_type;
+    /**
+     * File mime type
+     * @var string
+     */
+    public $mime_type;
 
-	/**
-	 * File permissions:
-	 * 
-	 * @var string
-	 */
-	public $permissions;
+    /**
+     * File permissions:
+     * 
+     * @var string
+     */
+    public $permissions;
 
-	/**
-	 * Create a new file search result
-	 * @param FileInfo $data file data given by provider
-	 */
-	public function __construct(FileInfo $data) {
+    /**
+     * Create a new file search result
+     * @param FileInfo $data file data given by provider
+     */
+    public function __construct(FileInfo $data) {
 
-		$path = $this->getRelativePath($data->getPath());
+        $path = $this->getRelativePath($data->getPath());
 
-		$info = pathinfo($path);
-		$this->id = $data->getId();
-		$this->name = $info['basename'];
-		$this->link = \OC::$server->getURLGenerator()->linkToRoute(
-			'files.view.index',
-			[
-				'dir' => $info['dirname'],
-				'scrollto' => $info['basename'],
-			]
-		);
-		$this->permissions = $data->getPermissions();
-		$this->path = $path;
-		$this->size = $data->getSize();
-		$this->modified = $data->getMtime();
-		$this->mime_type = $data->getMimetype();
-	}
+        $info = pathinfo($path);
+        $this->id = $data->getId();
+        $this->name = $info['basename'];
+        $this->link = \OC::$server->getURLGenerator()->linkToRoute(
+            'files.view.index',
+            [
+                'dir' => $info['dirname'],
+                'scrollto' => $info['basename'],
+            ]
+        );
+        $this->permissions = $data->getPermissions();
+        $this->path = $path;
+        $this->size = $data->getSize();
+        $this->modified = $data->getMtime();
+        $this->mime_type = $data->getMimetype();
+    }
 
-	/**
-	 * @var Folder $userFolderCache
-	 */
-	static protected $userFolderCache = null;
+    /**
+     * @var Folder $userFolderCache
+     */
+    static protected $userFolderCache = null;
 
-	/**
-	 * converts a path relative to the users files folder
-	 * eg /user/files/foo.txt -> /foo.txt
-	 * @param string $path
-	 * @return string relative path
-	 */
-	protected function getRelativePath ($path) {
-		if (!isset(self::$userFolderCache)) {
-			$user = \OC::$server->getUserSession()->getUser()->getUID();
-			self::$userFolderCache = \OC::$server->getUserFolder($user);
-		}
-		return self::$userFolderCache->getRelativePath($path);
-	}
+    /**
+     * converts a path relative to the users files folder
+     * eg /user/files/foo.txt -> /foo.txt
+     * @param string $path
+     * @return string relative path
+     */
+    protected function getRelativePath ($path) {
+        if (!isset(self::$userFolderCache)) {
+            $user = \OC::$server->getUserSession()->getUser()->getUID();
+            self::$userFolderCache = \OC::$server->getUserFolder($user);
+        }
+        return self::$userFolderCache->getRelativePath($path);
+    }
 
 }