From 96dff341e271f2c662f35fe0888e7e0992a8d33b Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 13 Jan 2015 13:59:28 +0100 Subject: [PATCH] Return valid fileinfo objects for part files --- lib/private/files/view.php | 31 +++++++++++++++++++++++++++++++ tests/lib/files/view.php | 14 ++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 034c49a905..a849f8b887 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -896,6 +896,9 @@ class View { if (!Filesystem::isValidPath($path)) { return $data; } + if (Cache\Scanner::isPartialFile($path)) { + return $this->getPartFileInfo($path); + } $path = Filesystem::normalizePath($this->fakeRoot . '/' . $path); $mount = Filesystem::getMountManager()->find($path); @@ -1308,4 +1311,32 @@ class View { return $result; } + + /** + * Get a fileinfo object for files that are ignored in the cache (part files) + * + * @param string $path + * @return \OCP\Files\FileInfo + */ + private function getPartFileInfo($path) { + $mount = $this->getMount($path); + $storage = $mount->getStorage(); + $internalPath = $mount->getInternalPath($this->getAbsolutePath($path)); + return new FileInfo( + $this->getAbsolutePath($path), + $storage, + $internalPath, + [ + 'fileid' => null, + 'mimetype' => $storage->getMimeType($internalPath), + 'name' => basename($path), + 'etag' => null, + 'size' => $storage->filesize($internalPath), + 'mtime' => $storage->filemtime($internalPath), + 'encrypted' => false, + 'permissions' => \OCP\Constants::PERMISSION_ALL + ], + $mount + ); + } } diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php index 2506596726..3ff19d7385 100644 --- a/tests/lib/files/view.php +++ b/tests/lib/files/view.php @@ -703,6 +703,20 @@ class View extends \Test\TestCase { $this->assertEquals($expectedPath, $view->getAbsolutePath($relativePath)); } + public function testPartFileInfo() { + $storage = new Temporary(array()); + $scanner = $storage->getScanner(); + \OC\Files\Filesystem::mount($storage, array(), '/test/'); + $storage->file_put_contents('test.part', 'foobar'); + $scanner->scan(''); + $view = new \OC\Files\View('/test'); + $info = $view->getFileInfo('test.part'); + + $this->assertInstanceOf('\OCP\Files\FileInfo', $info); + $this->assertNull($info->getId()); + $this->assertEquals(6, $info->getSize()); + } + function absolutePathProvider() { return array( array('/files/', ''),