upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Revert "fix(TaskProcessing): Use OCP\Server::get instead of copying methods"

Browse source 
This reverts commit d624c8da8f.

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
This commit is contained in:
Marcel Klehr 2024-08-30 10:01:21 +02:00 committed by Julien Veyssier
parent 41e3bde40c
commit 95006d2b8e
No known key found for this signature in database
GPG key ID: 4141FEE162030638
1 changed files with 45 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
lib/private/TaskProcessing/Manager.php
View file

@ -36,7 +36,6 @@ use OCP\IL10N;
use OCP\IServerContainer;
use OCP\L10N\IFactory;
use OCP\Lock\LockedException;
use OCP\SpeechToText\ISpeechToTextManager;
use OCP\SpeechToText\ISpeechToTextProvider;
use OCP\SpeechToText\ISpeechToTextProviderWithId;
use OCP\TaskProcessing\EShapeType;
@ -96,9 +95,31 @@ class Manager implements IManager {
$this->appData = $appDataFactory->get('core');
}
/**
* This is almost a copy of textProcessingManager->getProviders
* to avoid a dependency cycle between TextProcessingManager and TaskProcessingManager
*/
private function _getRawTextProcessingProviders(): array {
$textProcessingManager = \OCP\Server::get(\OCP\TextProcessing\IManager::class);
return $textProcessingManager->getProviders();
$context = $this->coordinator->getRegistrationContext();
if ($context === null) {
return [];
}
$providers = [];
foreach ($context->getTextProcessingProviders() as $providerServiceRegistration) {
$class = $providerServiceRegistration->getService();
try {
$providers[$class] = $this->serverContainer->get($class);
} catch (\Throwable $e) {
$this->logger->error('Failed to load Text processing provider ' . $class, [
'exception' => $e,
]);
}
}
return $providers;
}
private function _getTextProcessingProviders(): array {
@ -347,9 +368,28 @@ class Manager implements IManager {
return $newProviders;
}
/**
* This is almost a copy of SpeechToTextManager->getProviders
* to avoid a dependency cycle between SpeechToTextManager and TaskProcessingManager
*/
private function _getRawSpeechToTextProviders(): array {
$speechToTextManager = \OCP\Server::get(ISpeechToTextManager::class);
return $speechToTextManager->getProviders();
$context = $this->coordinator->getRegistrationContext();
if ($context === null) {
return [];
}
$providers = [];
foreach ($context->getSpeechToTextProviders() as $providerServiceRegistration) {
$class = $providerServiceRegistration->getService();
try {
$providers[$class] = $this->serverContainer->get($class);
} catch (NotFoundExceptionInterface|ContainerExceptionInterface|\Throwable $e) {
$this->logger->error('Failed to load SpeechToText provider ' . $class, [
'exception' => $e,
]);
}
}
return $providers;
}
/**