Merge pull request #8019 from owncloud/thumbnail_fixes

Thumbnail fixes

1 files changed, 98 insertions, 42 deletions

diff --git a/tests/lib/preview.php b/tests/lib/preview.php
index 353b66fd6d6..4ef61fb8257 100644
--- a/tests/lib/preview.php
+++ b/tests/lib/preview.php
@@ -10,66 +10,73 @@ namespace Test;
 
 class Preview extends \PHPUnit_Framework_TestCase {
 
-	public function testIsPreviewDeleted() {
-		$user = $this->initFS();
+	/**
+	 * @var string
+	 */
+	private $user;
+
+	/**
+	 * @var \OC\Files\View
+	 */
+	private $rootView;
+
+	public function setUp() {
+		$this->user = $this->initFS();
 
-		$rootView = new \OC\Files\View('');
-		$rootView->mkdir('/'.$user);
-		$rootView->mkdir('/'.$user.'/files');
+		$this->rootView = new \OC\Files\View('');
+		$this->rootView->mkdir('/'.$this->user);
+		$this->rootView->mkdir('/'.$this->user.'/files');
+	}
+
+	public function testIsPreviewDeleted() {
 
-		$samplefile = '/'.$user.'/files/test.txt';
+		$sampleFile = '/'.$this->user.'/files/test.txt';
 
-		$rootView->file_put_contents($samplefile, 'dummy file data');
+		$this->rootView->file_put_contents($sampleFile, 'dummy file data');
 		
 		$x = 50;
 		$y = 50;
 
-		$preview = new \OC\Preview($user, 'files/', 'test.txt', $x, $y);
+		$preview = new \OC\Preview($this->user, 'files/', 'test.txt', $x, $y);
 		$preview->getPreview();
 
-		$fileinfo = $rootView->getFileInfo($samplefile);
-		$fileid = $fileinfo['fileid'];
+		$fileInfo = $this->rootView->getFileInfo($sampleFile);
+		$fileId = $fileInfo['fileid'];
 
-		$thumbcachefile = '/' . $user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileid . '/' . $x . '-' . $y . '.png';
+		$thumbCacheFile = '/' . $this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/' . $x . '-' . $y . '.png';
 		
-		$this->assertEquals($rootView->file_exists($thumbcachefile), true);
+		$this->assertEquals($this->rootView->file_exists($thumbCacheFile), true);
 
 		$preview->deletePreview();
 
-		$this->assertEquals($rootView->file_exists($thumbcachefile), false);
+		$this->assertEquals($this->rootView->file_exists($thumbCacheFile), false);
 	}
 
 	public function testAreAllPreviewsDeleted() {
-		$user = $this->initFS();
 
-		$rootView = new \OC\Files\View('');
-		$rootView->mkdir('/'.$user);
-		$rootView->mkdir('/'.$user.'/files');
+		$sampleFile = '/'.$this->user.'/files/test.txt';
 
-		$samplefile = '/'.$user.'/files/test.txt';
-
-		$rootView->file_put_contents($samplefile, 'dummy file data');
+		$this->rootView->file_put_contents($sampleFile, 'dummy file data');
 		
 		$x = 50;
 		$y = 50;
 
-		$preview = new \OC\Preview($user, 'files/', 'test.txt', $x, $y);
+		$preview = new \OC\Preview($this->user, 'files/', 'test.txt', $x, $y);
 		$preview->getPreview();
 
-		$fileinfo = $rootView->getFileInfo($samplefile);
-		$fileid = $fileinfo['fileid'];
+		$fileInfo = $this->rootView->getFileInfo($sampleFile);
+		$fileId = $fileInfo['fileid'];
 		
-		$thumbcachefolder = '/' . $user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileid . '/';
+		$thumbCacheFolder = '/' . $this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/';
 		
-		$this->assertEquals($rootView->is_dir($thumbcachefolder), true);
+		$this->assertEquals($this->rootView->is_dir($thumbCacheFolder), true);
 
 		$preview->deleteAllPreviews();
 
-		$this->assertEquals($rootView->is_dir($thumbcachefolder), false);
+		$this->assertEquals($this->rootView->is_dir($thumbCacheFolder), false);
 	}
 
 	public function testIsMaxSizeWorking() {
-		$user = $this->initFS();
 
 		$maxX = 250;
 		$maxY = 250;
@@ -77,15 +84,11 @@ class Preview extends \PHPUnit_Framework_TestCase {
 		\OC_Config::setValue('preview_max_x', $maxX);
 		\OC_Config::setValue('preview_max_y', $maxY);
 
-		$rootView = new \OC\Files\View('');
-		$rootView->mkdir('/'.$user);
-		$rootView->mkdir('/'.$user.'/files');
-
-		$samplefile = '/'.$user.'/files/test.txt';
+		$sampleFile = '/'.$this->user.'/files/test.txt';
 
-		$rootView->file_put_contents($samplefile, 'dummy file data');
+		$this->rootView->file_put_contents($sampleFile, 'dummy file data');
 
-		$preview = new \OC\Preview($user, 'files/', 'test.txt', 1000, 1000);
+		$preview = new \OC\Preview($this->user, 'files/', 'test.txt', 1000, 1000);
 		$image = $preview->getPreview();
 
 		$this->assertEquals($image->width(), $maxX);
@@ -108,18 +111,13 @@ class Preview extends \PHPUnit_Framework_TestCase {
 	 * @dataProvider txtBlacklist
 	 */
 	public function testIsTransparent($extension, $data, $expectedResult) {
-		$user = $this->initFS();
-
-		$rootView = new \OC\Files\View('');
-		$rootView->mkdir('/'.$user);
-		$rootView->mkdir('/'.$user.'/files');
 
 		$x = 32;
 		$y = 32;
 
-		$sample = '/'.$user.'/files/test.'.$extension;
-		$rootView->file_put_contents($sample, $data);
-		$preview = new \OC\Preview($user, 'files/', 'test.'.$extension, $x, $y);
+		$sample = '/'.$this->user.'/files/test.'.$extension;
+		$this->rootView->file_put_contents($sample, $data);
+		$preview = new \OC\Preview($this->user, 'files/', 'test.'.$extension, $x, $y);
 		$image = $preview->getPreview();
 		$resource = $image->resource();
 
@@ -133,6 +131,64 @@ class Preview extends \PHPUnit_Framework_TestCase {
 		);
 	}
 
+	public function testCreationFromCached() {
+
+		$sampleFile = '/'.$this->user.'/files/test.txt';
+
+		$this->rootView->file_put_contents($sampleFile, 'dummy file data');
+
+		// create base preview
+		$x = 150;
+		$y = 150;
+
+		$preview = new \OC\Preview($this->user, 'files/', 'test.txt', $x, $y);
+		$preview->getPreview();
+
+		$fileInfo = $this->rootView->getFileInfo($sampleFile);
+		$fileId = $fileInfo['fileid'];
+
+		$thumbCacheFile = '/' . $this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/' . $x . '-' . $y . '.png';
+
+		$this->assertEquals($this->rootView->file_exists($thumbCacheFile), true);
+
+
+		// create smaller previews
+		$preview = new \OC\Preview($this->user, 'files/', 'test.txt', 50, 50);
+		$isCached = $preview->isCached($fileId);
+
+		$this->assertEquals($this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/150-150.png', $isCached);
+	}
+
+	/*
+	public function testScalingUp() {
+
+		$sampleFile = '/'.$this->user.'/files/test.txt';
+
+		$this->rootView->file_put_contents($sampleFile, 'dummy file data');
+
+		// create base preview
+		$x = 150;
+		$y = 150;
+
+		$preview = new \OC\Preview($this->user, 'files/', 'test.txt', $x, $y);
+		$preview->getPreview();
+
+		$fileInfo = $this->rootView->getFileInfo($sampleFile);
+		$fileId = $fileInfo['fileid'];
+
+		$thumbCacheFile = '/' . $this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/' . $x . '-' . $y . '.png';
+
+		$this->assertEquals($this->rootView->file_exists($thumbCacheFile), true);
+
+
+		// create bigger previews - with scale up
+		$preview = new \OC\Preview($this->user, 'files/', 'test.txt', 250, 250);
+		$isCached = $preview->isCached($fileId);
+
+		$this->assertEquals($this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/150-150.png', $isCached);
+	}
+	*/
+
 	private function initFS() {
 		// create a new user with his own filesystem view
 		// this gets called by each test in this test class