Fix thumbnail bug

Author: MGatner

src/Controllers/Files.php

@@ -56,10 +56,7 @@ public function __construct(FilesConfig $config = null, FileModel $model = null)
 		$this->model = $model ?? model('FileModel');
 
 		// Verify the storage directory
-		if (! is_dir($this->config->storagePath) && ! @mkdir($this->config->storagePath, 0775, true))
-		{
-			throw FilesException::forDirFail($this->config->storagePath);
-		}
+		FileModel::storage();
 	}
 
 	/**

src/Models/FileModel.php

@@ -3,6 +3,7 @@
 use CodeIgniter\Files\File as CIFile;
 use CodeIgniter\Model;
 use Tatter\Files\Entities\File;
+use Tatter\Files\Exceptions\FilesException;
 use Tatter\Thumbnails\Exceptions\ThumbnailsException;
 
 class FileModel extends Model
@@ -45,6 +46,35 @@ class FileModel extends Model
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Normalizes and creates (if necessary) the storage and thumbnail paths.
+	 *
+	 * @return string The normalized storage path
+	 *
+	 * @throws FilesException
+	 */
+	public static function storage(): string
+	{
+		// Normalize the path
+		$storage = realpath(config('Files')->storagePath) ?: config('Files')->storagePath;
+		$storage = rtrim($storage, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+		if (! is_dir($storage) && ! @mkdir($storage, 0775, true))
+		{
+			throw FilesException::forDirFail($storage);
+		}
+
+		// Normalize the path
+		$thumbnails = $storage . 'thumbnails';
+		if (! is_dir($thumbnails) && ! @mkdir($thumbnails, 0775, true))
+		{
+			throw FilesException::forDirFail($thumbnails);
+		}
+
+		return $storage;
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Associates a file with a user
 	 *
@@ -127,8 +157,7 @@ public function createFromFile(CIFile $file, string $originalName = null): File
 		];
 
 		// Normalize paths
-		$storage  = realpath(config('Files')->storagePath) ?: config('Files')->storagePath;
-		$storage  = rtrim($storage, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+		$storage  = self::storage();
 		$filePath = $file->getRealPath() ?: $file->__toString();
 
 		// Determine if we need to move the file
@@ -150,10 +179,11 @@ public function createFromFile(CIFile $file, string $originalName = null): File
 
 		// Try to create a Thumbnail
 		$thumbnail = pathinfo($row['localname'], PATHINFO_FILENAME);
-		$thumbPath = $storage . 'thumbnails' . DIRECTORY_SEPARATOR . $thumbnail;
+		$output    = $storage . 'thumbnails' . DIRECTORY_SEPARATOR . $thumbnail;
+
 		try
 		{
-			service('thumbnails')->create($filePath, $thumbPath);
+			service('thumbnails')->create($file->__toString(), $output);
 
 			// If it succeeds then update the database
 			$this->update($fileId, [
@@ -162,8 +192,8 @@ public function createFromFile(CIFile $file, string $originalName = null): File
 		}
 		catch (\Throwable $e)
 		{
-			log_message('debug', $e->getMessage());
-			log_message('debug', 'Unable to create thumbnail for ' . $row['filename']);
+			log_message('error', $e->getMessage());
+			log_message('error', 'Unable to create thumbnail for ' . $row['filename']);
 		}
 
 		// Return the File entity

tests/unit/ModelTest.php

@@ -71,4 +71,17 @@ public function testCreateFromPathAssignsToUser()
 
 		$this->assertCount(1, $result);
 	}
+
+	public function testCreateAddsThumbnail()
+	{
+		helper('filesystem');
+		$file = $this->model->createFromPath($this->testPath);
+
+		$thumbnail = pathinfo($file->localname, PATHINFO_FILENAME);
+		$array     = $file->toRawArray();
+		$this->assertEquals($thumbnail, $array['thumbnail']);
+
+		$path = FileFaker::storage() . 'thumbnails' . DIRECTORY_SEPARATOR . $thumbnail;
+		$this->assertFileExists($path);
+	}
 }