PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2024-11-22 04:58:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Added a checks to buildCovers and processFile

Browse source
This commit is contained in:
Isaac 2017-12-02 20:39:31 -08:00
parent d96fde1f55
commit 72117b000c
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/Models/Image.php
View file

@ -23,6 +23,7 @@ namespace Poniverse\Ponyfm\Models;
use External; use External;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Config; use Config;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException; use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
use Symfony\Component\HttpFoundation\File\File; use Symfony\Component\HttpFoundation\File\File;
@ -136,8 +137,12 @@ class Image extends Model
* @param array $coverType The type to process the image to * @param array $coverType The type to process the image to
*/ */
private static function processFile(File $image, string $path, $coverType) { private static function processFile(File $image, string $path, $coverType) {
if ($coverType['id'] === self::ORIGINAL && $image->getMimeType() === self::MIME_JPEG) { if ($coverType['id'] === self::ORIGINAL && $image->getMimeType() === self::MIME_JPEG ){
$command = 'cp "'.$image->getPathname().'" '.$path; if($image->getPathname() === $path) {
Log::warning("Attempted to copy an original file $path to itself.");
} else {
$command = 'cp "' . $image->getPathname() . '" ' . $path;
}
} else { } else {
// ImageMagick options reference: http://www.imagemagick.org/script/command-line-options.php // ImageMagick options reference: http://www.imagemagick.org/script/command-line-options.php
$command = 'convert 2>&1 "'.$image->getPathname().'" -background white -alpha remove -alpha off -strip'; $command = 'convert 2>&1 "'.$image->getPathname().'" -background white -alpha remove -alpha off -strip';
@ -229,6 +234,11 @@ class Image extends Model
$originalFile = new File($this->getFile(self::ORIGINAL)); $originalFile = new File($this->getFile(self::ORIGINAL));
foreach (self::$ImageTypes as $imageType) { foreach (self::$ImageTypes as $imageType) {
//Ignore original imagetype
if($imageType['id'] === self::ORIGINAL) {
continue;
}
self::processFile($originalFile, $this->getFile($imageType['id']), $imageType); self::processFile($originalFile, $this->getFile($imageType['id']), $imageType);
} }
} }