GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[CONTROLLER][Attachment] Small refactor and add testing annotation

Browse Source
This commit is contained in:
Hugo Sales 2021-08-16 17:09:44 +01:00
parent e2caf19b67
commit 3843348c1b
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Controller/Attachment.php
View File

@ -26,10 +26,12 @@ use App\Core\DB\DB;
use App\Core\Event; use App\Core\Event;
use App\Core\GSFile; use App\Core\GSFile;
use function App\Core\I18n\_m; use function App\Core\I18n\_m;
use App\Core\Log;
use App\Core\Router\Router; use App\Core\Router\Router;
use App\Entity\AttachmentThumbnail; use App\Entity\AttachmentThumbnail;
use App\Util\Common; use App\Util\Common;
use App\Util\Exception\ClientException; use App\Util\Exception\ClientException;
use App\Util\Exception\NoSuchFileException;
use App\Util\Exception\NotFoundException; use App\Util\Exception\NotFoundException;
use App\Util\Exception\ServerException; use App\Util\Exception\ServerException;
use Symfony\Component\HttpFoundation\HeaderUtils; use Symfony\Component\HttpFoundation\HeaderUtils;
@ -52,16 +54,24 @@ class Attachment extends Controller
} else { } else {
if (Event::handle('AttachmentFileInfo', [$id, &$res]) != Event::stop) { if (Event::handle('AttachmentFileInfo', [$id, &$res]) != Event::stop) {
// If no one else claims this attachment, use the default representation // If no one else claims this attachment, use the default representation
$res = GSFile::getAttachmentFileInfo($id); try {
$res = GSFile::getAttachmentFileInfo($id);
} catch (NoSuchFileException $e) {
// Continue below
}
} }
} }
if (!empty($res)) { if (empty($res)) {
return $handle($res);
} else {
// @codeCoverageIgnoreStart
throw new ClientException(_m('No such attachment'), 404); throw new ClientException(_m('No such attachment'), 404);
} else {
if (!array_key_exists('filepath', $res)) {
// @codeCoverageIgnoreStart
throw new ServerException('This attachment is not stored locally.');
// @codeCoverageIgnoreEnd // @codeCoverageIgnoreEnd
} else {
return $handle($res);
}
} }
} }
@ -90,22 +100,22 @@ class Attachment extends Controller
*/ */
public function attachment_view(Request $request, int $id) public function attachment_view(Request $request, int $id)
{ {
return $this->attachment($id, function (array $res) { return $this->attachment($id, fn (array $res) => GSFile::sendFile(
if (!array_key_exists('filepath', $res)) { $res['filepath'], $res['mimetype'],
throw new ServerException('This attachment is not stored locally.'); GSFile::ensureFilenameWithProperExtension($res['filename'], $res['mimetype']) ?? $res['filename'],
} HeaderUtils::DISPOSITION_INLINE
return GSFile::sendFile($res['filepath'], $res['mimetype'], GSFile::ensureFilenameWithProperExtension($res['filename'], $res['mimetype']) ?? $res['filename'], HeaderUtils::DISPOSITION_INLINE); )
}); );
} }
public function attachment_download(Request $request, int $id) public function attachment_download(Request $request, int $id)
{ {
return $this->attachment($id, function (array $res) { return $this->attachment($id, fn (array $res) => GSFile::sendFile(
if (!array_key_exists('filepath', $res)) { $res['filepath'], $res['mimetype'],
throw new ServerException('This attachment is not stored locally.'); GSFile::ensureFilenameWithProperExtension($res['filename'], $res['mimetype']) ?? $res['filename'],
} HeaderUtils::DISPOSITION_ATTACHMENT
return GSFile::sendFile($res['filepath'], $res['mimetype'], GSFile::ensureFilenameWithProperExtension($res['filename'], $res['mimetype']) ?? $res['filename'], HeaderUtils::DISPOSITION_ATTACHMENT); )
}); );
} }
/** /**