Skip to content

refactor(preview): align provider lookup in PreviewManager checks #61629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joshtrichards wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −11
Open

refactor(preview): align provider lookup in PreviewManager checks #61629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions lib/private/PreviewManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ class PreviewManager implements IPreview {
private ?Generator $generator = null;
protected bool $providerListDirty = false;
protected bool $registeredCoreProviders = false;
/**
* @var array<string, list<ProviderClosure>> $providers
*/

/** @var array<string, list<ProviderClosure>> $providers */
protected array $providers = [];

/** @var array mime type => support status */
protected array $mimeTypeSupportMap = [];

/** @var ?list<class-string<IProviderV2>> $defaultProviders */
protected ?array $defaultProviders = null;

Expand Down Expand Up @@ -119,9 +119,6 @@ private function registerProviderClosure(string $mimeTypeRegex, Closure $callabl
$this->providerListDirty = true;
}

/**
* Get all providers
*/
#[\Override]
public function getProviders(): array {
if (!$this->enablePreviews) {
Expand Down Expand Up @@ -212,9 +209,7 @@ public function isMimeSupported(string $mimeType = '*'): bool {
return $this->mimeTypeSupportMap[$mimeType];
}

$this->registerCoreProviders();
$this->registerBootstrapProviders();
$providerMimeTypes = array_keys($this->providers);
$providerMimeTypes = array_keys($this->getProviders());
foreach ($providerMimeTypes as $supportedMimeType) {
if (preg_match($supportedMimeType, $mimeType)) {
$this->mimeTypeSupportMap[$mimeType] = true;
Expand All @@ -233,7 +228,6 @@ public function isAvailable(FileInfo $file, ?string $mimeType = null): bool {

$fileMimeType = $mimeType ?? $file->getMimeType();

$this->registerCoreProviders();
if (!$this->isMimeSupported($fileMimeType)) {
return false;
}
Expand All @@ -243,7 +237,7 @@ public function isAvailable(FileInfo $file, ?string $mimeType = null): bool {
return false;
}

foreach ($this->providers as $supportedMimeType => $providers) {
foreach ($this->getProviders() as $supportedMimeType => $providers) {
if (preg_match($supportedMimeType, $fileMimeType)) {
foreach ($providers as $providerClosure) {
$provider = $this->helper->getProvider($providerClosure);
Expand Down
Loading