jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Host images locally
Some checks failed
PHP Unit / PHPUnit test suite (pull_request) Has been cancelled
Details
Laravel Pint / Laravel Pint (pull_request) Has been cancelled
Details

Browse source 
We don’t need the complexity of S3. Sepcifically the complexity of
managing my own AWS account, flysystem made the Laravel side easy.

A command is added to copy the the S3 files over to local storage.
This commit is contained in:
Jonny Barnes 2024-10-25 20:40:52 +01:00
parent d80e8164c8
commit d7da42b626
Signed by: jonny
SSH key fingerprint: SHA256:CTuSlns5U7qlD9jqHvtnVmfYV3Zwl2Z7WnJ4/dqOaL8
47 changed files with 295 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

30
app/Http/Controllers/MicropubMediaController.php
View file

@ -39,13 +39,13 @@ class MicropubMediaController extends Controller
try {
$tokenData = $this->tokenService->validateToken($request->input('access_token'));
} catch (RequiredConstraintsViolated|InvalidTokenStructure) {
$micropubResponses = new MicropubResponses();
$micropubResponses = new MicropubResponses;
return $micropubResponses->invalidTokenResponse();
}
if ($tokenData->claims()->has('scope') === false) {
$micropubResponses = new MicropubResponses();
$micropubResponses = new MicropubResponses;
return $micropubResponses->tokenHasNoScopeResponse();
}
@ -55,7 +55,7 @@ class MicropubMediaController extends Controller
$scopes = explode(' ', $scopes);
}
if (! in_array('create', $scopes)) {
$micropubResponses = new MicropubResponses();
$micropubResponses = new MicropubResponses;
return $micropubResponses->insufficientScopeResponse();
}
@ -111,13 +111,13 @@ class MicropubMediaController extends Controller
try {
$tokenData = $this->tokenService->validateToken($request->input('access_token'));
} catch (RequiredConstraintsViolated|InvalidTokenStructure) {
$micropubResponses = new MicropubResponses();
$micropubResponses = new MicropubResponses;
return $micropubResponses->invalidTokenResponse();
}
if ($tokenData->claims()->has('scope') === false) {
$micropubResponses = new MicropubResponses();
$micropubResponses = new MicropubResponses;
return $micropubResponses->tokenHasNoScopeResponse();
}
@ -127,7 +127,7 @@ class MicropubMediaController extends Controller
$scopes = explode(' ', $scopes);
}
if (! in_array('create', $scopes)) {
$micropubResponses = new MicropubResponses();
$micropubResponses = new MicropubResponses;
return $micropubResponses->insufficientScopeResponse();
}
@ -140,7 +140,10 @@ class MicropubMediaController extends Controller
], 400);
}
if ($request->file('file')->isValid() === false) {
/** @var UploadedFile $file */
$file = $request->file('file');
if ($file->isValid() === false) {
return response()->json([
'response' => 'error',
'error' => 'invalid_request',
@ -148,7 +151,7 @@ class MicropubMediaController extends Controller
], 400);
}
$filename = $this->saveFile($request->file('file'));
$filename = Storage::disk('local')->putFile('media', $file);
/** @var ImageManager $manager */
$manager = resolve(ImageManager::class);
@ -162,18 +165,11 @@ class MicropubMediaController extends Controller
$media = Media::create([
'token' => $request->bearerToken(),
'path' => 'media/' . $filename,
'path' => $filename,
'type' => $this->getFileTypeFromMimeType($request->file('file')->getMimeType()),
'image_widths' => $width,
]);
// put the file on S3 initially, the ProcessMedia job may edit this
Storage::disk('s3')->putFileAs(
'media',
new File(storage_path('app') . '/' . $filename),
$filename
);
ProcessMedia::dispatch($filename);
return response()->json([
@ -237,7 +233,7 @@ class MicropubMediaController extends Controller
*
* @throws Exception
*/
private function saveFile(UploadedFile $file): string
private function saveFileToLocal(UploadedFile $file): string
{
$filename = Uuid::uuid4()->toString() . '.' . $file->extension();
Storage::disk('local')->putFileAs('', $file, $filename);