forked from GNUsocial/gnu-social
[ImageThumbnail] Implement image resizing with Intervention/Image
This commit is contained in:
@@ -23,7 +23,10 @@ namespace Plugin\ImageThumbnail\Controller;
|
||||
|
||||
use App\Core\Controller;
|
||||
use App\Core\DB\DB;
|
||||
use App\Entity\AttachmentThumbnail;
|
||||
use App\Util\Common;
|
||||
use Component\Media\Media;
|
||||
use Plugin\ImageThumbnail\ImageThumbnail as ThisPlugin;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
|
||||
class ImageThumbnail extends Controller
|
||||
@@ -33,9 +36,9 @@ class ImageThumbnail extends Controller
|
||||
*/
|
||||
public function thumbnail(Request $request, int $id)
|
||||
{
|
||||
$attachemnt = DB::findOneBy('attachment', ['id' => $id]);
|
||||
if (!is_null($attachemnt->getScope())) {
|
||||
// && ($attachemnt->scope | VisibilityScope::PUBLIC) != 0
|
||||
$attachment = DB::findOneBy('attachment', ['id' => $id]);
|
||||
if (!is_null($attachment->getScope())) {
|
||||
// && ($attachment->scope | VisibilityScope::PUBLIC) != 0
|
||||
// $user = Common::ensureLoggedIn();
|
||||
assert(false, 'Attachment scope not implemented');
|
||||
}
|
||||
@@ -48,6 +51,12 @@ class ImageThumbnail extends Controller
|
||||
$height = Common::clamp($this->int('h') ?? $max_height, min: 0, max: $max_height);
|
||||
$crop = $this->bool('c') ?? false;
|
||||
|
||||
dd($width, $height, $crop);
|
||||
$filename = $attachment->getFilename();
|
||||
$filepath = ThisPlugin::getPath($attachment);
|
||||
|
||||
$thumbnail = AttachmentThumbnail::getOrCreate(attachment: $attachment, width: $width, height: $height, crop: $crop);
|
||||
dd($thumbnail);
|
||||
|
||||
return Media::sendFile(filepath: $filepath, mimetype: $attachment->getMimetype(), output_filename: $filename, disposition: 'inline');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,8 +20,12 @@
|
||||
namespace Plugin\ImageThumbnail;
|
||||
|
||||
use App\Core\Event;
|
||||
use function App\Core\I18n\_m;
|
||||
use App\Core\Modules\Module;
|
||||
use App\Core\Router\RouteLoader;
|
||||
use App\Entity\Attachment;
|
||||
use App\Util\Common;
|
||||
use Intervention\Image\Image;
|
||||
|
||||
class ImageThumbnail extends Module
|
||||
{
|
||||
@@ -30,4 +34,49 @@ class ImageThumbnail extends Module
|
||||
$r->connect('thumbnail', '/thumbnail/{id<\d+>}', [Controller\ImageThumbnail::class, 'thumbnail']);
|
||||
return Event::next;
|
||||
}
|
||||
|
||||
public static function getPath(Attachment $attachment)
|
||||
{
|
||||
return Common::config('attachments', 'dir') . $attachment->getFilename();
|
||||
}
|
||||
|
||||
/**
|
||||
* Resizes an image. It will reencode the image in the
|
||||
* `self::prefferedType()` format. This only applies henceforward,
|
||||
* not retroactively
|
||||
*
|
||||
* Increases the 'memory_limit' to the one in the 'attachments' section in the config, to
|
||||
* enable the handling of bigger images, which can cause a peak of memory consumption, while
|
||||
* encoding
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function onResizeImage(Attachment $attachment, string $outpath, int $width, int $height, bool $crop)
|
||||
{
|
||||
$old_limit = ini_set('memory_limit', Common::config('attachments', 'memory_limit'));
|
||||
|
||||
// try {
|
||||
// $img = Image::make($this->filepath);
|
||||
// } catch (Exception $e) {
|
||||
// Log::error(__METHOD__ . ' encountered exception: ' . print_r($e, true));
|
||||
// // TRANS: Exception thrown when trying to resize an unknown file type.
|
||||
// throw new Exception(_m('Unknown file type'));
|
||||
// }
|
||||
|
||||
// if (self::getPath($attachment) === $outpath) {
|
||||
// @unlink($outpath);
|
||||
// }
|
||||
|
||||
// // Fit image to dimensions and optionally prevent upscaling
|
||||
// if (!$crop) $img->fit($width, $height, function ($constraint) { $constraint->upsize();});
|
||||
// else $img->crop($width, $height);
|
||||
|
||||
// $img->save($outpath, 100, 'webp');
|
||||
// $img->destroy();
|
||||
|
||||
// ini_set('memory_limit', $old_limit); // Restore the old memory limit
|
||||
|
||||
// return $outpath;
|
||||
return Event::next;
|
||||
}
|
||||
}
|
||||
|
||||
5
plugins/ImageThumbnail/composer.json
Normal file
5
plugins/ImageThumbnail/composer.json
Normal file
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"require": {
|
||||
"intervention/image": "2.5.1"
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user