Skip to content

Commit 002945e

Browse files
committed
feat(new-file-menu): adjustments
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
1 parent d235ce5 commit 002945e

File tree

4 files changed

+16
-63
lines changed

4 files changed

+16
-63
lines changed

lib/AppInfo/Application.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use OCA\Assistant\Listener\FileActionTaskSuccessfulListener;
1616
use OCA\Assistant\Listener\FreePrompt\FreePromptReferenceListener;
1717
use OCA\Assistant\Listener\LoadAdditionalScriptsListener;
18-
use OCA\Assistant\Listener\LoadAdditionalScriptsListener2;
1918
use OCA\Assistant\Listener\SpeechToText\SpeechToTextReferenceListener;
2019
use OCA\Assistant\Listener\TaskFailedListener;
2120
use OCA\Assistant\Listener\TaskOutputFileReferenceListener;
@@ -70,7 +69,6 @@ public function register(IRegistrationContext $context): void {
7069

7170
$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
7271
$context->registerEventListener(LoadAdditionalScriptsEvent::class, LoadAdditionalScriptsListener::class);
73-
$context->registerEventListener(LoadAdditionalScriptsEvent::class, LoadAdditionalScriptsListener2::class);
7472

7573
$context->registerEventListener(TaskSuccessfulEvent::class, TaskSuccessfulListener::class);
7674
$context->registerEventListener(TaskFailedEvent::class, TaskFailedListener::class);

lib/Listener/LoadAdditionalScriptsListener.php

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
use OCP\AppFramework\Services\IInitialState;
1313
use OCP\EventDispatcher\Event;
1414
use OCP\EventDispatcher\IEventListener;
15+
use OCP\IAppConfig;
1516
use OCP\TaskProcessing\IManager as ITaskProcessingManager;
1617
use OCP\TaskProcessing\TaskTypes\AudioToText;
18+
use OCP\TaskProcessing\TaskTypes\TextToImage;
1719
use OCP\TaskProcessing\TaskTypes\TextToTextSummary;
1820
use OCP\Util;
1921

@@ -23,6 +25,7 @@
2325
class LoadAdditionalScriptsListener implements IEventListener {
2426

2527
public function __construct(
28+
private IAppConfig $appConfig,
2629
private IInitialState $initialStateService,
2730
private ITaskProcessingManager $taskProcessingManager,
2831
) {
@@ -34,15 +37,25 @@ public function handle(Event $event): void {
3437
}
3538

3639
$availableTaskTypes = $this->taskProcessingManager->getAvailableTaskTypes();
40+
41+
// file actions
3742
$summarizeAvailable = array_key_exists(TextToTextSummary::ID, $availableTaskTypes);
3843
$sttAvailable = array_key_exists(AudioToText::ID, $availableTaskTypes);
3944
$ttsAvailable = class_exists('OCP\\TaskProcessing\\TaskTypes\\TextToSpeech')
4045
&& array_key_exists(\OCP\TaskProcessing\TaskTypes\TextToSpeech::ID, $availableTaskTypes);
41-
4246
$this->initialStateService->provideInitialState('stt-available', $sttAvailable);
4347
$this->initialStateService->provideInitialState('tts-available', $ttsAvailable);
4448
$this->initialStateService->provideInitialState('summarize-available', $summarizeAvailable);
45-
4649
Util::addInitScript(Application::APP_ID, Application::APP_ID . '-fileActions');
50+
51+
// New file menu to generate images
52+
$isNewFileMenuEnabled = $this->appConfig->getValueInt(Application::APP_ID, 'newFileMenuPlugin', 1) === 1;
53+
if ($isNewFileMenuEnabled) {
54+
$hasText2Image = array_key_exists(TextToImage::ID, $availableTaskTypes);
55+
$this->initialStateService->provideInitialState('new-file-generate-image', [
56+
'hasText2Image' => $hasText2Image,
57+
]);
58+
Util::addScript(Application::APP_ID, Application::APP_ID . '-filesNewMenu');
59+
}
4760
}
4861
}

lib/Listener/LoadAdditionalScriptsListener2.php

Lines changed: 0 additions & 58 deletions
This file was deleted.

lib/Listener/TaskSuccessfulListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function handle(Event $event): void {
6969

7070
if ($hasTargetDirectory) {
7171
$directoryId = (int)$matches[1];
72-
$fileId = (int) $task->getOutput()['images'][0];
72+
$fileId = (int)$task->getOutput()['images'][0];
7373
try {
7474
$file = $this->assistantService->saveNewFileMenuActionFile($task->getUserId(), $task->getId(), $fileId, $directoryId);
7575
$notificationTarget = $this->url->linkToRouteAbsolute(

0 commit comments

Comments
 (0)