@@ -25,28 +25,28 @@ |
||
| 25 | 25 | use OCP\IDBConnection; |
| 26 | 26 | |
| 27 | 27 | class HomePropagator extends Propagator { |
| 28 | - private $ignoredBaseFolders; |
|
| 28 | + private $ignoredBaseFolders; |
|
| 29 | 29 | |
| 30 | - /** |
|
| 31 | - * @param \OC\Files\Storage\Storage $storage |
|
| 32 | - */ |
|
| 33 | - public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection) { |
|
| 34 | - parent::__construct($storage, $connection); |
|
| 35 | - $this->ignoredBaseFolders = ['files_encryption']; |
|
| 36 | - } |
|
| 30 | + /** |
|
| 31 | + * @param \OC\Files\Storage\Storage $storage |
|
| 32 | + */ |
|
| 33 | + public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection) { |
|
| 34 | + parent::__construct($storage, $connection); |
|
| 35 | + $this->ignoredBaseFolders = ['files_encryption']; |
|
| 36 | + } |
|
| 37 | 37 | |
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * @param string $internalPath |
|
| 41 | - * @param int $time |
|
| 42 | - * @param int $sizeDifference number of bytes the file has grown |
|
| 43 | - */ |
|
| 44 | - public function propagateChange($internalPath, $time, $sizeDifference = 0) { |
|
| 45 | - list($baseFolder) = explode('/', $internalPath, 2); |
|
| 46 | - if (in_array($baseFolder, $this->ignoredBaseFolders)) { |
|
| 47 | - return []; |
|
| 48 | - } else { |
|
| 49 | - parent::propagateChange($internalPath, $time, $sizeDifference); |
|
| 50 | - } |
|
| 51 | - } |
|
| 39 | + /** |
|
| 40 | + * @param string $internalPath |
|
| 41 | + * @param int $time |
|
| 42 | + * @param int $sizeDifference number of bytes the file has grown |
|
| 43 | + */ |
|
| 44 | + public function propagateChange($internalPath, $time, $sizeDifference = 0) { |
|
| 45 | + list($baseFolder) = explode('/', $internalPath, 2); |
|
| 46 | + if (in_array($baseFolder, $this->ignoredBaseFolders)) { |
|
| 47 | + return []; |
|
| 48 | + } else { |
|
| 49 | + parent::propagateChange($internalPath, $time, $sizeDifference); |
|
| 50 | + } |
|
| 51 | + } |
|
| 52 | 52 | } |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | public function getId() { |
| 61 | - return (int)$this->data['fileid']; |
|
| 61 | + return (int) $this->data['fileid']; |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | public function getStorageId() { |
@@ -28,100 +28,100 @@ |
||
| 28 | 28 | * meta data for a file or folder |
| 29 | 29 | */ |
| 30 | 30 | class CacheEntry implements ICacheEntry, \ArrayAccess { |
| 31 | - /** |
|
| 32 | - * @var array |
|
| 33 | - */ |
|
| 34 | - private $data; |
|
| 31 | + /** |
|
| 32 | + * @var array |
|
| 33 | + */ |
|
| 34 | + private $data; |
|
| 35 | 35 | |
| 36 | - public function __construct(array $data) { |
|
| 37 | - $this->data = $data; |
|
| 38 | - } |
|
| 36 | + public function __construct(array $data) { |
|
| 37 | + $this->data = $data; |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - public function offsetSet($offset, $value) { |
|
| 41 | - $this->data[$offset] = $value; |
|
| 42 | - } |
|
| 40 | + public function offsetSet($offset, $value) { |
|
| 41 | + $this->data[$offset] = $value; |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | - public function offsetExists($offset) { |
|
| 45 | - return isset($this->data[$offset]); |
|
| 46 | - } |
|
| 44 | + public function offsetExists($offset) { |
|
| 45 | + return isset($this->data[$offset]); |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | - public function offsetUnset($offset) { |
|
| 49 | - unset($this->data[$offset]); |
|
| 50 | - } |
|
| 48 | + public function offsetUnset($offset) { |
|
| 49 | + unset($this->data[$offset]); |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | - public function offsetGet($offset) { |
|
| 53 | - if (isset($this->data[$offset])) { |
|
| 54 | - return $this->data[$offset]; |
|
| 55 | - } else { |
|
| 56 | - return null; |
|
| 57 | - } |
|
| 58 | - } |
|
| 52 | + public function offsetGet($offset) { |
|
| 53 | + if (isset($this->data[$offset])) { |
|
| 54 | + return $this->data[$offset]; |
|
| 55 | + } else { |
|
| 56 | + return null; |
|
| 57 | + } |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - public function getId() { |
|
| 61 | - return (int)$this->data['fileid']; |
|
| 62 | - } |
|
| 60 | + public function getId() { |
|
| 61 | + return (int)$this->data['fileid']; |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - public function getStorageId() { |
|
| 65 | - return $this->data['storage']; |
|
| 66 | - } |
|
| 64 | + public function getStorageId() { |
|
| 65 | + return $this->data['storage']; |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | 68 | |
| 69 | - public function getPath() { |
|
| 70 | - return $this->data['path']; |
|
| 71 | - } |
|
| 69 | + public function getPath() { |
|
| 70 | + return $this->data['path']; |
|
| 71 | + } |
|
| 72 | 72 | |
| 73 | 73 | |
| 74 | - public function getName() { |
|
| 75 | - return $this->data['name']; |
|
| 76 | - } |
|
| 74 | + public function getName() { |
|
| 75 | + return $this->data['name']; |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | 78 | |
| 79 | - public function getMimeType() { |
|
| 80 | - return $this->data['mimetype']; |
|
| 81 | - } |
|
| 79 | + public function getMimeType() { |
|
| 80 | + return $this->data['mimetype']; |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | 83 | |
| 84 | - public function getMimePart() { |
|
| 85 | - return $this->data['mimepart']; |
|
| 86 | - } |
|
| 84 | + public function getMimePart() { |
|
| 85 | + return $this->data['mimepart']; |
|
| 86 | + } |
|
| 87 | 87 | |
| 88 | - public function getSize() { |
|
| 89 | - return $this->data['size']; |
|
| 90 | - } |
|
| 88 | + public function getSize() { |
|
| 89 | + return $this->data['size']; |
|
| 90 | + } |
|
| 91 | 91 | |
| 92 | - public function getMTime() { |
|
| 93 | - return $this->data['mtime']; |
|
| 94 | - } |
|
| 92 | + public function getMTime() { |
|
| 93 | + return $this->data['mtime']; |
|
| 94 | + } |
|
| 95 | 95 | |
| 96 | - public function getStorageMTime() { |
|
| 97 | - return $this->data['storage_mtime']; |
|
| 98 | - } |
|
| 96 | + public function getStorageMTime() { |
|
| 97 | + return $this->data['storage_mtime']; |
|
| 98 | + } |
|
| 99 | 99 | |
| 100 | - public function getEtag() { |
|
| 101 | - return $this->data['etag']; |
|
| 102 | - } |
|
| 100 | + public function getEtag() { |
|
| 101 | + return $this->data['etag']; |
|
| 102 | + } |
|
| 103 | 103 | |
| 104 | - public function getPermissions() { |
|
| 105 | - return $this->data['permissions']; |
|
| 106 | - } |
|
| 104 | + public function getPermissions() { |
|
| 105 | + return $this->data['permissions']; |
|
| 106 | + } |
|
| 107 | 107 | |
| 108 | - public function isEncrypted() { |
|
| 109 | - return isset($this->data['encrypted']) && $this->data['encrypted']; |
|
| 110 | - } |
|
| 108 | + public function isEncrypted() { |
|
| 109 | + return isset($this->data['encrypted']) && $this->data['encrypted']; |
|
| 110 | + } |
|
| 111 | 111 | |
| 112 | - public function getMetadataEtag(): ?string { |
|
| 113 | - return $this->data['metadata_etag']; |
|
| 114 | - } |
|
| 112 | + public function getMetadataEtag(): ?string { |
|
| 113 | + return $this->data['metadata_etag']; |
|
| 114 | + } |
|
| 115 | 115 | |
| 116 | - public function getCreationTime(): ?int { |
|
| 117 | - return $this->data['creation_time']; |
|
| 118 | - } |
|
| 116 | + public function getCreationTime(): ?int { |
|
| 117 | + return $this->data['creation_time']; |
|
| 118 | + } |
|
| 119 | 119 | |
| 120 | - public function getUploadTime(): ?int { |
|
| 121 | - return $this->data['upload_time']; |
|
| 122 | - } |
|
| 120 | + public function getUploadTime(): ?int { |
|
| 121 | + return $this->data['upload_time']; |
|
| 122 | + } |
|
| 123 | 123 | |
| 124 | - public function getData() { |
|
| 125 | - return $this->data; |
|
| 126 | - } |
|
| 124 | + public function getData() { |
|
| 125 | + return $this->data; |
|
| 126 | + } |
|
| 127 | 127 | } |
@@ -30,58 +30,58 @@ |
||
| 30 | 30 | use OCP\Files\Cache\ICacheEntry; |
| 31 | 31 | |
| 32 | 32 | class HomeCache extends Cache { |
| 33 | - /** |
|
| 34 | - * get the size of a folder and set it in the cache |
|
| 35 | - * |
|
| 36 | - * @param string $path |
|
| 37 | - * @param array $entry (optional) meta data of the folder |
|
| 38 | - * @return int |
|
| 39 | - */ |
|
| 40 | - public function calculateFolderSize($path, $entry = null) { |
|
| 41 | - if ($path !== '/' and $path !== '' and $path !== 'files' and $path !== 'files_trashbin' and $path !== 'files_versions') { |
|
| 42 | - return parent::calculateFolderSize($path, $entry); |
|
| 43 | - } elseif ($path === '' or $path === '/') { |
|
| 44 | - // since the size of / isn't used (the size of /files is used instead) there is no use in calculating it |
|
| 45 | - return 0; |
|
| 46 | - } |
|
| 33 | + /** |
|
| 34 | + * get the size of a folder and set it in the cache |
|
| 35 | + * |
|
| 36 | + * @param string $path |
|
| 37 | + * @param array $entry (optional) meta data of the folder |
|
| 38 | + * @return int |
|
| 39 | + */ |
|
| 40 | + public function calculateFolderSize($path, $entry = null) { |
|
| 41 | + if ($path !== '/' and $path !== '' and $path !== 'files' and $path !== 'files_trashbin' and $path !== 'files_versions') { |
|
| 42 | + return parent::calculateFolderSize($path, $entry); |
|
| 43 | + } elseif ($path === '' or $path === '/') { |
|
| 44 | + // since the size of / isn't used (the size of /files is used instead) there is no use in calculating it |
|
| 45 | + return 0; |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | - $totalSize = 0; |
|
| 49 | - if (is_null($entry)) { |
|
| 50 | - $entry = $this->get($path); |
|
| 51 | - } |
|
| 52 | - if ($entry && $entry['mimetype'] === 'httpd/unix-directory') { |
|
| 53 | - $id = $entry['fileid']; |
|
| 54 | - $sql = 'SELECT SUM(`size`) AS f1 ' . |
|
| 55 | - 'FROM `*PREFIX*filecache` ' . |
|
| 56 | - 'WHERE `parent` = ? AND `storage` = ? AND `size` >= 0'; |
|
| 57 | - $result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId())); |
|
| 58 | - if ($row = $result->fetchRow()) { |
|
| 59 | - $result->closeCursor(); |
|
| 60 | - list($sum) = array_values($row); |
|
| 61 | - $totalSize = 0 + $sum; |
|
| 62 | - $entry['size'] += 0; |
|
| 63 | - if ($entry['size'] !== $totalSize) { |
|
| 64 | - $this->update($id, array('size' => $totalSize)); |
|
| 65 | - } |
|
| 66 | - } |
|
| 67 | - } |
|
| 68 | - return $totalSize; |
|
| 69 | - } |
|
| 48 | + $totalSize = 0; |
|
| 49 | + if (is_null($entry)) { |
|
| 50 | + $entry = $this->get($path); |
|
| 51 | + } |
|
| 52 | + if ($entry && $entry['mimetype'] === 'httpd/unix-directory') { |
|
| 53 | + $id = $entry['fileid']; |
|
| 54 | + $sql = 'SELECT SUM(`size`) AS f1 ' . |
|
| 55 | + 'FROM `*PREFIX*filecache` ' . |
|
| 56 | + 'WHERE `parent` = ? AND `storage` = ? AND `size` >= 0'; |
|
| 57 | + $result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId())); |
|
| 58 | + if ($row = $result->fetchRow()) { |
|
| 59 | + $result->closeCursor(); |
|
| 60 | + list($sum) = array_values($row); |
|
| 61 | + $totalSize = 0 + $sum; |
|
| 62 | + $entry['size'] += 0; |
|
| 63 | + if ($entry['size'] !== $totalSize) { |
|
| 64 | + $this->update($id, array('size' => $totalSize)); |
|
| 65 | + } |
|
| 66 | + } |
|
| 67 | + } |
|
| 68 | + return $totalSize; |
|
| 69 | + } |
|
| 70 | 70 | |
| 71 | - /** |
|
| 72 | - * @param string $path |
|
| 73 | - * @return ICacheEntry |
|
| 74 | - */ |
|
| 75 | - public function get($path) { |
|
| 76 | - $data = parent::get($path); |
|
| 77 | - if ($path === '' or $path === '/') { |
|
| 78 | - // only the size of the "files" dir counts |
|
| 79 | - $filesData = parent::get('files'); |
|
| 71 | + /** |
|
| 72 | + * @param string $path |
|
| 73 | + * @return ICacheEntry |
|
| 74 | + */ |
|
| 75 | + public function get($path) { |
|
| 76 | + $data = parent::get($path); |
|
| 77 | + if ($path === '' or $path === '/') { |
|
| 78 | + // only the size of the "files" dir counts |
|
| 79 | + $filesData = parent::get('files'); |
|
| 80 | 80 | |
| 81 | - if (isset($filesData['size'])) { |
|
| 82 | - $data['size'] = $filesData['size']; |
|
| 83 | - } |
|
| 84 | - } |
|
| 85 | - return $data; |
|
| 86 | - } |
|
| 81 | + if (isset($filesData['size'])) { |
|
| 82 | + $data['size'] = $filesData['size']; |
|
| 83 | + } |
|
| 84 | + } |
|
| 85 | + return $data; |
|
| 86 | + } |
|
| 87 | 87 | } |
@@ -51,8 +51,8 @@ |
||
| 51 | 51 | } |
| 52 | 52 | if ($entry && $entry['mimetype'] === 'httpd/unix-directory') { |
| 53 | 53 | $id = $entry['fileid']; |
| 54 | - $sql = 'SELECT SUM(`size`) AS f1 ' . |
|
| 55 | - 'FROM `*PREFIX*filecache` ' . |
|
| 54 | + $sql = 'SELECT SUM(`size`) AS f1 '. |
|
| 55 | + 'FROM `*PREFIX*filecache` '. |
|
| 56 | 56 | 'WHERE `parent` = ? AND `storage` = ? AND `size` >= 0'; |
| 57 | 57 | $result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId())); |
| 58 | 58 | if ($row = $result->fetchRow()) { |
@@ -67,7 +67,7 @@ |
||
| 67 | 67 | if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) { |
| 68 | 68 | $folderContent = $sourceCache->getFolderContentsById($sourceEntry->getId()); |
| 69 | 69 | foreach ($folderContent as $subEntry) { |
| 70 | - $subTargetPath = $targetPath . '/' . $subEntry->getName(); |
|
| 70 | + $subTargetPath = $targetPath.'/'.$subEntry->getName(); |
|
| 71 | 71 | $this->copyFromCache($sourceCache, $subEntry, $subTargetPath); |
| 72 | 72 | } |
| 73 | 73 | } |
@@ -29,63 +29,63 @@ |
||
| 29 | 29 | * Fallback implementation for moveFromCache |
| 30 | 30 | */ |
| 31 | 31 | trait MoveFromCacheTrait { |
| 32 | - /** |
|
| 33 | - * store meta data for a file or folder |
|
| 34 | - * |
|
| 35 | - * @param string $file |
|
| 36 | - * @param array $data |
|
| 37 | - * |
|
| 38 | - * @return int file id |
|
| 39 | - * @throws \RuntimeException |
|
| 40 | - */ |
|
| 41 | - abstract public function put($file, array $data); |
|
| 32 | + /** |
|
| 33 | + * store meta data for a file or folder |
|
| 34 | + * |
|
| 35 | + * @param string $file |
|
| 36 | + * @param array $data |
|
| 37 | + * |
|
| 38 | + * @return int file id |
|
| 39 | + * @throws \RuntimeException |
|
| 40 | + */ |
|
| 41 | + abstract public function put($file, array $data); |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * Move a file or folder in the cache |
|
| 45 | - * |
|
| 46 | - * @param \OCP\Files\Cache\ICache $sourceCache |
|
| 47 | - * @param string $sourcePath |
|
| 48 | - * @param string $targetPath |
|
| 49 | - */ |
|
| 50 | - public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) { |
|
| 51 | - $sourceEntry = $sourceCache->get($sourcePath); |
|
| 43 | + /** |
|
| 44 | + * Move a file or folder in the cache |
|
| 45 | + * |
|
| 46 | + * @param \OCP\Files\Cache\ICache $sourceCache |
|
| 47 | + * @param string $sourcePath |
|
| 48 | + * @param string $targetPath |
|
| 49 | + */ |
|
| 50 | + public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) { |
|
| 51 | + $sourceEntry = $sourceCache->get($sourcePath); |
|
| 52 | 52 | |
| 53 | - $this->copyFromCache($sourceCache, $sourceEntry, $targetPath); |
|
| 53 | + $this->copyFromCache($sourceCache, $sourceEntry, $targetPath); |
|
| 54 | 54 | |
| 55 | - $sourceCache->remove($sourcePath); |
|
| 56 | - } |
|
| 55 | + $sourceCache->remove($sourcePath); |
|
| 56 | + } |
|
| 57 | 57 | |
| 58 | - /** |
|
| 59 | - * Copy a file or folder in the cache |
|
| 60 | - * |
|
| 61 | - * @param \OCP\Files\Cache\ICache $sourceCache |
|
| 62 | - * @param ICacheEntry $sourceEntry |
|
| 63 | - * @param string $targetPath |
|
| 64 | - */ |
|
| 65 | - public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, $targetPath) { |
|
| 66 | - $this->put($targetPath, $this->cacheEntryToArray($sourceEntry)); |
|
| 67 | - if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) { |
|
| 68 | - $folderContent = $sourceCache->getFolderContentsById($sourceEntry->getId()); |
|
| 69 | - foreach ($folderContent as $subEntry) { |
|
| 70 | - $subTargetPath = $targetPath . '/' . $subEntry->getName(); |
|
| 71 | - $this->copyFromCache($sourceCache, $subEntry, $subTargetPath); |
|
| 72 | - } |
|
| 73 | - } |
|
| 74 | - } |
|
| 58 | + /** |
|
| 59 | + * Copy a file or folder in the cache |
|
| 60 | + * |
|
| 61 | + * @param \OCP\Files\Cache\ICache $sourceCache |
|
| 62 | + * @param ICacheEntry $sourceEntry |
|
| 63 | + * @param string $targetPath |
|
| 64 | + */ |
|
| 65 | + public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, $targetPath) { |
|
| 66 | + $this->put($targetPath, $this->cacheEntryToArray($sourceEntry)); |
|
| 67 | + if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) { |
|
| 68 | + $folderContent = $sourceCache->getFolderContentsById($sourceEntry->getId()); |
|
| 69 | + foreach ($folderContent as $subEntry) { |
|
| 70 | + $subTargetPath = $targetPath . '/' . $subEntry->getName(); |
|
| 71 | + $this->copyFromCache($sourceCache, $subEntry, $subTargetPath); |
|
| 72 | + } |
|
| 73 | + } |
|
| 74 | + } |
|
| 75 | 75 | |
| 76 | - private function cacheEntryToArray(ICacheEntry $entry) { |
|
| 77 | - return [ |
|
| 78 | - 'size' => $entry->getSize(), |
|
| 79 | - 'mtime' => $entry->getMTime(), |
|
| 80 | - 'storage_mtime' => $entry->getStorageMTime(), |
|
| 81 | - 'mimetype' => $entry->getMimeType(), |
|
| 82 | - 'mimepart' => $entry->getMimePart(), |
|
| 83 | - 'etag' => $entry->getEtag(), |
|
| 84 | - 'permissions' => $entry->getPermissions(), |
|
| 85 | - 'encrypted' => $entry->isEncrypted(), |
|
| 86 | - 'creation_time' => $entry->getCreationTime(), |
|
| 87 | - 'upload_time' => $entry->getUploadTime(), |
|
| 88 | - 'metadata_etag' => $entry->getMetadataEtag(), |
|
| 89 | - ]; |
|
| 90 | - } |
|
| 76 | + private function cacheEntryToArray(ICacheEntry $entry) { |
|
| 77 | + return [ |
|
| 78 | + 'size' => $entry->getSize(), |
|
| 79 | + 'mtime' => $entry->getMTime(), |
|
| 80 | + 'storage_mtime' => $entry->getStorageMTime(), |
|
| 81 | + 'mimetype' => $entry->getMimeType(), |
|
| 82 | + 'mimepart' => $entry->getMimePart(), |
|
| 83 | + 'etag' => $entry->getEtag(), |
|
| 84 | + 'permissions' => $entry->getPermissions(), |
|
| 85 | + 'encrypted' => $entry->isEncrypted(), |
|
| 86 | + 'creation_time' => $entry->getCreationTime(), |
|
| 87 | + 'upload_time' => $entry->getUploadTime(), |
|
| 88 | + 'metadata_etag' => $entry->getMetadataEtag(), |
|
| 89 | + ]; |
|
| 90 | + } |
|
| 91 | 91 | } |
@@ -51,19 +51,19 @@ |
||
| 51 | 51 | continue; |
| 52 | 52 | } |
| 53 | 53 | // create audio result |
| 54 | - if($fileData['mimepart'] === 'audio'){ |
|
| 54 | + if ($fileData['mimepart'] === 'audio') { |
|
| 55 | 55 | $result = new \OC\Search\Result\Audio($fileData); |
| 56 | 56 | } |
| 57 | 57 | // create image result |
| 58 | - elseif($fileData['mimepart'] === 'image'){ |
|
| 58 | + elseif ($fileData['mimepart'] === 'image') { |
|
| 59 | 59 | $result = new \OC\Search\Result\Image($fileData); |
| 60 | 60 | } |
| 61 | 61 | // create folder result |
| 62 | - elseif($fileData['mimetype'] === 'httpd/unix-directory'){ |
|
| 62 | + elseif ($fileData['mimetype'] === 'httpd/unix-directory') { |
|
| 63 | 63 | $result = new \OC\Search\Result\Folder($fileData); |
| 64 | 64 | } |
| 65 | 65 | // or create file result |
| 66 | - else{ |
|
| 66 | + else { |
|
| 67 | 67 | $result = new \OC\Search\Result\File($fileData); |
| 68 | 68 | } |
| 69 | 69 | // add to results |
@@ -32,45 +32,45 @@ |
||
| 32 | 32 | */ |
| 33 | 33 | class File extends \OCP\Search\Provider { |
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * Search for files and folders matching the given query |
|
| 37 | - * @param string $query |
|
| 38 | - * @return \OCP\Search\Result |
|
| 39 | - */ |
|
| 40 | - public function search($query) { |
|
| 41 | - $files = Filesystem::search($query); |
|
| 42 | - $results = array(); |
|
| 43 | - // edit results |
|
| 44 | - foreach ($files as $fileData) { |
|
| 45 | - // skip versions |
|
| 46 | - if (strpos($fileData['path'], '_versions') === 0) { |
|
| 47 | - continue; |
|
| 48 | - } |
|
| 49 | - // skip top-level folder |
|
| 50 | - if ($fileData['name'] === 'files' && $fileData['parent'] === -1) { |
|
| 51 | - continue; |
|
| 52 | - } |
|
| 53 | - // create audio result |
|
| 54 | - if($fileData['mimepart'] === 'audio'){ |
|
| 55 | - $result = new \OC\Search\Result\Audio($fileData); |
|
| 56 | - } |
|
| 57 | - // create image result |
|
| 58 | - elseif($fileData['mimepart'] === 'image'){ |
|
| 59 | - $result = new \OC\Search\Result\Image($fileData); |
|
| 60 | - } |
|
| 61 | - // create folder result |
|
| 62 | - elseif($fileData['mimetype'] === 'httpd/unix-directory'){ |
|
| 63 | - $result = new \OC\Search\Result\Folder($fileData); |
|
| 64 | - } |
|
| 65 | - // or create file result |
|
| 66 | - else{ |
|
| 67 | - $result = new \OC\Search\Result\File($fileData); |
|
| 68 | - } |
|
| 69 | - // add to results |
|
| 70 | - $results[] = $result; |
|
| 71 | - } |
|
| 72 | - // return |
|
| 73 | - return $results; |
|
| 74 | - } |
|
| 35 | + /** |
|
| 36 | + * Search for files and folders matching the given query |
|
| 37 | + * @param string $query |
|
| 38 | + * @return \OCP\Search\Result |
|
| 39 | + */ |
|
| 40 | + public function search($query) { |
|
| 41 | + $files = Filesystem::search($query); |
|
| 42 | + $results = array(); |
|
| 43 | + // edit results |
|
| 44 | + foreach ($files as $fileData) { |
|
| 45 | + // skip versions |
|
| 46 | + if (strpos($fileData['path'], '_versions') === 0) { |
|
| 47 | + continue; |
|
| 48 | + } |
|
| 49 | + // skip top-level folder |
|
| 50 | + if ($fileData['name'] === 'files' && $fileData['parent'] === -1) { |
|
| 51 | + continue; |
|
| 52 | + } |
|
| 53 | + // create audio result |
|
| 54 | + if($fileData['mimepart'] === 'audio'){ |
|
| 55 | + $result = new \OC\Search\Result\Audio($fileData); |
|
| 56 | + } |
|
| 57 | + // create image result |
|
| 58 | + elseif($fileData['mimepart'] === 'image'){ |
|
| 59 | + $result = new \OC\Search\Result\Image($fileData); |
|
| 60 | + } |
|
| 61 | + // create folder result |
|
| 62 | + elseif($fileData['mimetype'] === 'httpd/unix-directory'){ |
|
| 63 | + $result = new \OC\Search\Result\Folder($fileData); |
|
| 64 | + } |
|
| 65 | + // or create file result |
|
| 66 | + else{ |
|
| 67 | + $result = new \OC\Search\Result\File($fileData); |
|
| 68 | + } |
|
| 69 | + // add to results |
|
| 70 | + $results[] = $result; |
|
| 71 | + } |
|
| 72 | + // return |
|
| 73 | + return $results; |
|
| 74 | + } |
|
| 75 | 75 | |
| 76 | 76 | } |
@@ -29,13 +29,13 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | class Image extends File { |
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * Type name; translated in templates |
|
| 34 | - * @var string |
|
| 35 | - */ |
|
| 36 | - public $type = 'image'; |
|
| 32 | + /** |
|
| 33 | + * Type name; translated in templates |
|
| 34 | + * @var string |
|
| 35 | + */ |
|
| 36 | + public $type = 'image'; |
|
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * @TODO add EXIF information |
|
| 40 | - */ |
|
| 38 | + /** |
|
| 39 | + * @TODO add EXIF information |
|
| 40 | + */ |
|
| 41 | 41 | } |
@@ -105,7 +105,7 @@ |
||
| 105 | 105 | * @param string $path |
| 106 | 106 | * @return string relative path |
| 107 | 107 | */ |
| 108 | - protected function getRelativePath ($path) { |
|
| 108 | + protected function getRelativePath($path) { |
|
| 109 | 109 | if (!isset(self::$userFolderCache)) { |
| 110 | 110 | $user = \OC::$server->getUserSession()->getUser()->getUID(); |
| 111 | 111 | self::$userFolderCache = \OC::$server->getUserFolder($user); |
@@ -32,85 +32,85 @@ |
||
| 32 | 32 | */ |
| 33 | 33 | class File extends \OCP\Search\Result { |
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * Type name; translated in templates |
|
| 37 | - * @var string |
|
| 38 | - */ |
|
| 39 | - public $type = 'file'; |
|
| 35 | + /** |
|
| 36 | + * Type name; translated in templates |
|
| 37 | + * @var string |
|
| 38 | + */ |
|
| 39 | + public $type = 'file'; |
|
| 40 | 40 | |
| 41 | - /** |
|
| 42 | - * Path to file |
|
| 43 | - * @var string |
|
| 44 | - */ |
|
| 45 | - public $path; |
|
| 41 | + /** |
|
| 42 | + * Path to file |
|
| 43 | + * @var string |
|
| 44 | + */ |
|
| 45 | + public $path; |
|
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * Size, in bytes |
|
| 49 | - * @var int |
|
| 50 | - */ |
|
| 51 | - public $size; |
|
| 47 | + /** |
|
| 48 | + * Size, in bytes |
|
| 49 | + * @var int |
|
| 50 | + */ |
|
| 51 | + public $size; |
|
| 52 | 52 | |
| 53 | - /** |
|
| 54 | - * Date modified, in human readable form |
|
| 55 | - * @var string |
|
| 56 | - */ |
|
| 57 | - public $modified; |
|
| 53 | + /** |
|
| 54 | + * Date modified, in human readable form |
|
| 55 | + * @var string |
|
| 56 | + */ |
|
| 57 | + public $modified; |
|
| 58 | 58 | |
| 59 | - /** |
|
| 60 | - * File mime type |
|
| 61 | - * @var string |
|
| 62 | - */ |
|
| 63 | - public $mime_type; |
|
| 59 | + /** |
|
| 60 | + * File mime type |
|
| 61 | + * @var string |
|
| 62 | + */ |
|
| 63 | + public $mime_type; |
|
| 64 | 64 | |
| 65 | - /** |
|
| 66 | - * File permissions: |
|
| 67 | - * |
|
| 68 | - * @var string |
|
| 69 | - */ |
|
| 70 | - public $permissions; |
|
| 65 | + /** |
|
| 66 | + * File permissions: |
|
| 67 | + * |
|
| 68 | + * @var string |
|
| 69 | + */ |
|
| 70 | + public $permissions; |
|
| 71 | 71 | |
| 72 | - /** |
|
| 73 | - * Create a new file search result |
|
| 74 | - * @param FileInfo $data file data given by provider |
|
| 75 | - */ |
|
| 76 | - public function __construct(FileInfo $data) { |
|
| 72 | + /** |
|
| 73 | + * Create a new file search result |
|
| 74 | + * @param FileInfo $data file data given by provider |
|
| 75 | + */ |
|
| 76 | + public function __construct(FileInfo $data) { |
|
| 77 | 77 | |
| 78 | - $path = $this->getRelativePath($data->getPath()); |
|
| 78 | + $path = $this->getRelativePath($data->getPath()); |
|
| 79 | 79 | |
| 80 | - $info = pathinfo($path); |
|
| 81 | - $this->id = $data->getId(); |
|
| 82 | - $this->name = $info['basename']; |
|
| 83 | - $this->link = \OC::$server->getURLGenerator()->linkToRoute( |
|
| 84 | - 'files.view.index', |
|
| 85 | - [ |
|
| 86 | - 'dir' => $info['dirname'], |
|
| 87 | - 'scrollto' => $info['basename'], |
|
| 88 | - ] |
|
| 89 | - ); |
|
| 90 | - $this->permissions = $data->getPermissions(); |
|
| 91 | - $this->path = $path; |
|
| 92 | - $this->size = $data->getSize(); |
|
| 93 | - $this->modified = $data->getMtime(); |
|
| 94 | - $this->mime_type = $data->getMimetype(); |
|
| 95 | - } |
|
| 80 | + $info = pathinfo($path); |
|
| 81 | + $this->id = $data->getId(); |
|
| 82 | + $this->name = $info['basename']; |
|
| 83 | + $this->link = \OC::$server->getURLGenerator()->linkToRoute( |
|
| 84 | + 'files.view.index', |
|
| 85 | + [ |
|
| 86 | + 'dir' => $info['dirname'], |
|
| 87 | + 'scrollto' => $info['basename'], |
|
| 88 | + ] |
|
| 89 | + ); |
|
| 90 | + $this->permissions = $data->getPermissions(); |
|
| 91 | + $this->path = $path; |
|
| 92 | + $this->size = $data->getSize(); |
|
| 93 | + $this->modified = $data->getMtime(); |
|
| 94 | + $this->mime_type = $data->getMimetype(); |
|
| 95 | + } |
|
| 96 | 96 | |
| 97 | - /** |
|
| 98 | - * @var Folder $userFolderCache |
|
| 99 | - */ |
|
| 100 | - static protected $userFolderCache = null; |
|
| 97 | + /** |
|
| 98 | + * @var Folder $userFolderCache |
|
| 99 | + */ |
|
| 100 | + static protected $userFolderCache = null; |
|
| 101 | 101 | |
| 102 | - /** |
|
| 103 | - * converts a path relative to the users files folder |
|
| 104 | - * eg /user/files/foo.txt -> /foo.txt |
|
| 105 | - * @param string $path |
|
| 106 | - * @return string relative path |
|
| 107 | - */ |
|
| 108 | - protected function getRelativePath ($path) { |
|
| 109 | - if (!isset(self::$userFolderCache)) { |
|
| 110 | - $user = \OC::$server->getUserSession()->getUser()->getUID(); |
|
| 111 | - self::$userFolderCache = \OC::$server->getUserFolder($user); |
|
| 112 | - } |
|
| 113 | - return self::$userFolderCache->getRelativePath($path); |
|
| 114 | - } |
|
| 102 | + /** |
|
| 103 | + * converts a path relative to the users files folder |
|
| 104 | + * eg /user/files/foo.txt -> /foo.txt |
|
| 105 | + * @param string $path |
|
| 106 | + * @return string relative path |
|
| 107 | + */ |
|
| 108 | + protected function getRelativePath ($path) { |
|
| 109 | + if (!isset(self::$userFolderCache)) { |
|
| 110 | + $user = \OC::$server->getUserSession()->getUser()->getUID(); |
|
| 111 | + self::$userFolderCache = \OC::$server->getUserFolder($user); |
|
| 112 | + } |
|
| 113 | + return self::$userFolderCache->getRelativePath($path); |
|
| 114 | + } |
|
| 115 | 115 | |
| 116 | 116 | } |
@@ -29,13 +29,13 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | class Audio extends File { |
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * Type name; translated in templates |
|
| 34 | - * @var string |
|
| 35 | - */ |
|
| 36 | - public $type = 'audio'; |
|
| 32 | + /** |
|
| 33 | + * Type name; translated in templates |
|
| 34 | + * @var string |
|
| 35 | + */ |
|
| 36 | + public $type = 'audio'; |
|
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * @TODO add ID3 information |
|
| 40 | - */ |
|
| 38 | + /** |
|
| 39 | + * @TODO add ID3 information |
|
| 40 | + */ |
|
| 41 | 41 | } |
@@ -29,10 +29,10 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | class Folder extends File { |
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * Type name; translated in templates |
|
| 34 | - * @var string |
|
| 35 | - */ |
|
| 36 | - public $type = 'folder'; |
|
| 32 | + /** |
|
| 33 | + * Type name; translated in templates |
|
| 34 | + * @var string |
|
| 35 | + */ |
|
| 36 | + public $type = 'folder'; |
|
| 37 | 37 | |
| 38 | 38 | } |