Only return 1 type
Throw proper exception if we can't get the mimetype for a preview. Catch it later on so we can just return a not found for the preview. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
50b880edeb
commit
87e99651f5
|
@ -120,9 +120,13 @@ class Generator {
|
|||
|
||||
// Try to get a cached preview. Else generate (and store) one
|
||||
try {
|
||||
$file = $this->getCachedPreview($previewFolder, $width, $height, $crop, $maxPreview->getMimeType());
|
||||
} catch (NotFoundException $e) {
|
||||
$file = $this->generatePreview($previewFolder, $maxPreview, $width, $height, $crop, $maxWidth, $maxHeight);
|
||||
try {
|
||||
$file = $this->getCachedPreview($previewFolder, $width, $height, $crop, $maxPreview->getMimeType());
|
||||
} catch (NotFoundException $e) {
|
||||
$file = $this->generatePreview($previewFolder, $maxPreview, $width, $height, $crop, $maxWidth, $maxHeight);
|
||||
}
|
||||
} catch (\InvalidArgumentException $e) {
|
||||
throw new NotFoundException();
|
||||
}
|
||||
|
||||
return $file;
|
||||
|
@ -165,7 +169,14 @@ class Generator {
|
|||
continue;
|
||||
}
|
||||
|
||||
$ext = $this->getExtention($preview->dataMimeType());
|
||||
// Try to get the extention.
|
||||
try {
|
||||
$ext = $this->getExtention($preview->dataMimeType());
|
||||
} catch (\InvalidArgumentException $e) {
|
||||
// Just continue to the next iteration if this preview doesn't have a valid mimetype
|
||||
continue;
|
||||
}
|
||||
|
||||
$path = (string)$preview->width() . '-' . (string)$preview->height() . '-max.' . $ext;
|
||||
try {
|
||||
$file = $previewFolder->newFile($path);
|
||||
|
@ -382,6 +393,7 @@ class Generator {
|
|||
/**
|
||||
* @param string $mimeType
|
||||
* @return null|string
|
||||
* @throws \InvalidArgumentException
|
||||
*/
|
||||
private function getExtention($mimeType) {
|
||||
switch ($mimeType) {
|
||||
|
@ -392,7 +404,7 @@ class Generator {
|
|||
case 'image/gif':
|
||||
return 'gif';
|
||||
default:
|
||||
return null;
|
||||
throw new \InvalidArgumentException('Not a valid mimetype');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -318,11 +318,12 @@ class OC_Image implements \OCP\IImage {
|
|||
}
|
||||
|
||||
/**
|
||||
* @return null|string Returns the mimetype of the data
|
||||
* @return string Returns the mimetype of the data. Returns the empty string
|
||||
* if the data is not valid.
|
||||
*/
|
||||
public function dataMimeType() {
|
||||
if (!$this->valid()) {
|
||||
return null;
|
||||
return '';
|
||||
}
|
||||
|
||||
switch ($this->mimeType) {
|
||||
|
|
Loading…
Reference in New Issue