mirror of
https://github.com/nextcloud/server.git
synced 2026-02-14 08:14:47 -05:00
feat(files_versions): Implement preview mime icon fallback
Signed-off-by: provokateurin <kate@provokateurin.de>
This commit is contained in:
parent
2f73d92602
commit
4e7fc5bfbf
2 changed files with 41 additions and 3 deletions
|
|
@ -12,11 +12,13 @@ use OCP\AppFramework\Http\Attribute\NoAdminRequired;
|
|||
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
|
||||
use OCP\AppFramework\Http\DataResponse;
|
||||
use OCP\AppFramework\Http\FileDisplayResponse;
|
||||
use OCP\AppFramework\Http\RedirectResponse;
|
||||
use OCP\Files\IRootFolder;
|
||||
use OCP\Files\NotFoundException;
|
||||
use OCP\IPreview;
|
||||
use OCP\IRequest;
|
||||
use OCP\IUserSession;
|
||||
use OCP\Preview\IMimeIconProvider;
|
||||
|
||||
class PreviewController extends Controller {
|
||||
|
||||
|
|
@ -38,7 +40,8 @@ class PreviewController extends Controller {
|
|||
IRootFolder $rootFolder,
|
||||
IUserSession $userSession,
|
||||
IVersionManager $versionManager,
|
||||
IPreview $previewManager
|
||||
IPreview $previewManager,
|
||||
private IMimeIconProvider $mimeIconProvider,
|
||||
) {
|
||||
parent::__construct($appName, $request);
|
||||
|
||||
|
|
@ -55,9 +58,11 @@ class PreviewController extends Controller {
|
|||
* @param int $x Width of the preview
|
||||
* @param int $y Height of the preview
|
||||
* @param string $version Version of the file to get the preview for
|
||||
* @return FileDisplayResponse<Http::STATUS_OK, array{Content-Type: string}>|DataResponse<Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND, array<empty>, array{}>
|
||||
* @param bool $mimeFallback Whether to fallback to the mime icon if no preview is available
|
||||
* @return FileDisplayResponse<Http::STATUS_OK, array{Content-Type: string}>|DataResponse<Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND, array<empty>, array{}>|RedirectResponse<Http::STATUS_SEE_OTHER, array{}>
|
||||
*
|
||||
* 200: Preview returned
|
||||
* 303: Redirect to the mime icon url if mimeFallback is true
|
||||
* 400: Getting preview is not possible
|
||||
* 404: Preview not found
|
||||
*/
|
||||
|
|
@ -67,12 +72,14 @@ class PreviewController extends Controller {
|
|||
string $file = '',
|
||||
int $x = 44,
|
||||
int $y = 44,
|
||||
string $version = ''
|
||||
string $version = '',
|
||||
bool $mimeFallback = false,
|
||||
) {
|
||||
if ($file === '' || $version === '' || $x === 0 || $y === 0) {
|
||||
return new DataResponse([], Http::STATUS_BAD_REQUEST);
|
||||
}
|
||||
|
||||
$versionFile = null;
|
||||
try {
|
||||
$user = $this->userSession->getUser();
|
||||
$userFolder = $this->rootFolder->getUserFolder($user->getUID());
|
||||
|
|
@ -83,6 +90,14 @@ class PreviewController extends Controller {
|
|||
$response->cacheFor(3600 * 24, false, true);
|
||||
return $response;
|
||||
} catch (NotFoundException $e) {
|
||||
// If we have no preview enabled, we can redirect to the mime icon if any
|
||||
if ($mimeFallback && $versionFile !== null) {
|
||||
$url = $this->mimeIconProvider->getMimeIconUrl($versionFile->getMimeType());
|
||||
if ($url !== null) {
|
||||
return new RedirectResponse($url);
|
||||
}
|
||||
}
|
||||
|
||||
return new DataResponse([], Http::STATUS_NOT_FOUND);
|
||||
} catch (\InvalidArgumentException $e) {
|
||||
return new DataResponse([], Http::STATUS_BAD_REQUEST);
|
||||
|
|
|
|||
|
|
@ -103,6 +103,19 @@
|
|||
"type": "string",
|
||||
"default": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "mimeFallback",
|
||||
"in": "query",
|
||||
"description": "Whether to fallback to the mime icon if no preview is available",
|
||||
"schema": {
|
||||
"type": "integer",
|
||||
"default": 0,
|
||||
"enum": [
|
||||
0,
|
||||
1
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"responses": {
|
||||
|
|
@ -132,6 +145,16 @@
|
|||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"303": {
|
||||
"description": "Redirect to the mime icon url if mimeFallback is true",
|
||||
"headers": {
|
||||
"Location": {
|
||||
"schema": {
|
||||
"type": "string"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue