Merge pull request #32 from tattersoftware/extension

Improve extension handling
tattersoftware · Jun 4, 2021 · d5bc515 · d5bc515
2 parents ea8816f + 4af6dfa
commit d5bc515
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/src/Entities/File.php b/src/Entities/File.php
@@ -67,21 +67,24 @@ public function getPath(): string
  */
  public function getExtension($method = ''): string
  {
- if (! $method || $method === 'type')
+ if ($this->attributes['type'] !== 'application/octet-stream')
  {
- if ($extension = Mimes::guessExtensionFromType($this->attributes['type']))
+ if (! $method || $method === 'type')
  {
- return $extension;
+ if ($extension = Mimes::guessExtensionFromType($this->attributes['type']))
+ {
+ return $extension;
+ }
  }
- }
 
- if (! $method || $method === 'mime')
- {
- if ($file = $this->getObject())
+ if (! $method || $method === 'mime')
  {
- if ($extension = $file->guessExtension())
+ if ($file = $this->getObject())
  {
- return $extension;
+ if ($extension = $file->guessExtension())
+ {
+ return $extension;
+ }
  }
  }
  }

diff --git a/src/Models/FileModel.php b/src/Models/FileModel.php
@@ -2,6 +2,7 @@
 
 use CodeIgniter\Files\File as CIFile;
 use CodeIgniter\Model;
+use Config\Mimes;
 use Tatter\Files\Entities\File;
 use Tatter\Files\Exceptions\FilesException;
 use Tatter\Thumbnails\Exceptions\ThumbnailsException;
@@ -151,7 +152,7 @@ public function createFromFile(CIFile $file, array $data = []): File
  'filename' => $file->getFilename(),
  'localname' => $file->getRandomName(),
  'clientname' => $file->getFilename(),
- 'type' => $file->getMimeType(),
+ 'type' => Mimes::guessTypeFromExtension($file->getExtension()) ?? $file->getMimeType(),
  'size' => $file->getSize(),
  ];