From 92b60e36de8d89e8ea7c4781a8c5d5fa4371b7c3 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Mon, 20 Apr 2015 14:25:39 +0200 Subject: Introduce Storage::getData() to allow storage implementations more control over the data array --- lib/private/files/cache/scanner.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'lib/private/files/cache/scanner.php') diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php index 0878b6c60a0..c1ba7c01461 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/files/cache/scanner.php @@ -109,17 +109,10 @@ class Scanner extends BasicEmitter { \OCP\Util::writeLog('OC\Files\Cache\Scanner', "!!! Path '$path' is not accessible or present !!!", \OCP\Util::DEBUG); return null; } - $data = array(); - $data['mimetype'] = $this->storage->getMimeType($path); - $data['mtime'] = $this->storage->filemtime($path); - if ($data['mimetype'] == 'httpd/unix-directory') { - $data['size'] = -1; //unknown - } else { - $data['size'] = $this->storage->filesize($path); - } - $data['etag'] = $this->storage->getETag($path); - $data['storage_mtime'] = $data['mtime']; + + $data = $this->storage->getData($path); $data['permissions'] = $permissions; + return $data; } -- cgit v1.2.3