sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #53271 from nextcloud/backport/53205/stable30 

[stable30] fix(PreviewManager): use the forced mimetype in throwIfPreviewsDisabled
pull/53288/head
Andy Scherzinger 2025-06-03 07:51:04 +07:00 committed by GitHub
parent 238194d2d3 be027ae01c
commit 5f419642ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/private/PreviewManager.php
Unescape Escape View File

@ -151,7 +151,7 @@ class PreviewManager implements IPreview {
$mimeType = null,
bool $cacheResult = true,
): ISimpleFile {
$this->throwIfPreviewsDisabled($file);
$this->throwIfPreviewsDisabled($file, $mimeType);
$previewConcurrency = $this->getGenerator()->getNumConcurrentPreviews('preview_concurrency_all');
$sem = Generator::guardWithSemaphore(Generator::SEMAPHORE_ID_ALL, $previewConcurrency);
try {
@ -175,7 +175,7 @@ class PreviewManager implements IPreview {
* @since 19.0.0
*/
public function generatePreviews(File $file, array $specifications, $mimeType = null) {
$this->throwIfPreviewsDisabled($file);
$this->throwIfPreviewsDisabled($file, $mimeType);
return $this->getGenerator()->generatePreviews($file, $specifications, $mimeType);
}
@ -210,13 +210,15 @@ class PreviewManager implements IPreview {
/**
* Check if a preview can be generated for a file
*/
public function isAvailable(\OCP\Files\FileInfo $file): bool {
public function isAvailable(\OCP\Files\FileInfo $file, ?string $mimeType = null): bool {
if (!$this->enablePreviews) {
return false;
}
$fileMimeType = $mimeType ?? $file->getMimeType();
$this->registerCoreProviders();
if (!$this->isMimeSupported($file->getMimetype())) {
if (!$this->isMimeSupported($fileMimeType)) {
return false;
}
@ -226,7 +228,7 @@ class PreviewManager implements IPreview {
}
foreach ($this->providers as $supportedMimeType => $providers) {
if (preg_match($supportedMimeType, $file->getMimetype())) {
if (preg_match($supportedMimeType, $fileMimeType)) {
foreach ($providers as $providerClosure) {
$provider = $this->helper->getProvider($providerClosure);
if (!($provider instanceof IProviderV2)) {
@ -452,8 +454,8 @@ class PreviewManager implements IPreview {
/**
* @throws NotFoundException if preview generation is disabled
*/
private function throwIfPreviewsDisabled(File $file): void {
if (!$this->isAvailable($file)) {
private function throwIfPreviewsDisabled(File $file, ?string $mimeType = null): void {
if (!$this->isAvailable($file, $mimeType)) {
throw new NotFoundException('Previews disabled');
}
}