mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23890 from nextcloud/techdebt/noid/refactor-theming-getImage 

Cleanup ImageManager::getImage()
This commit is contained in:
kesselb 2020-11-04 12:30:24 +01:00 committed by GitHub
parent 0e1c9af98d dd93532526
commit b65d9eb99d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/theming/lib/ImageManager.php
View File

@ -101,7 +101,6 @@ class ImageManager {
* @throws NotPermittedException * @throws NotPermittedException
*/ */
public function getImage(string $key, bool $useSvg = true): ISimpleFile { public function getImage(string $key, bool $useSvg = true): ISimpleFile {
$pngFile = null;
$logo = $this->config->getAppValue('theming', $key . 'Mime', false); $logo = $this->config->getAppValue('theming', $key . 'Mime', false);
$folder = $this->appData->getFolder('images'); $folder = $this->appData->getFolder('images');
if ($logo === false || !$folder->fileExists($key)) { if ($logo === false || !$folder->fileExists($key)) {
@ -116,17 +115,14 @@ class ImageManager {
$finalIconFile->setImageFormat('png32'); $finalIconFile->setImageFormat('png32');
$pngFile = $folder->newFile($key . '.png'); $pngFile = $folder->newFile($key . '.png');
$pngFile->putContent($finalIconFile->getImageBlob()); $pngFile->putContent($finalIconFile->getImageBlob());
return $pngFile;
} catch (\ImagickException $e) { } catch (\ImagickException $e) {
$this->logger->info('The image was requested to be no SVG file, but converting it to PNG failed: ' . $e->getMessage()); $this->logger->info('The image was requested to be no SVG file, but converting it to PNG failed: ' . $e->getMessage());
$pngFile = null;
} }
} else { } else {
$pngFile = $folder->getFile($key . '.png'); return $folder->getFile($key . '.png');
} }
} }
if ($pngFile !== null) {
return $pngFile;
}
return $folder->getFile($key); return $folder->getFile($key);
} }