Skip to content

Commit 529fdf7

Browse files
Justin StrauchJustin Strauch
authored andcommitted
fix errors attempt 16
1 parent baa9436 commit 529fdf7

File tree

1 file changed

+24
-47
lines changed

1 file changed

+24
-47
lines changed

Classes/Controller/Backend/ImageRecognizeController.php

Lines changed: 24 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,17 @@ protected function ajaxData(ServerRequestInterface $request): ResponseInterface
229229
$queryParams = $request->getQueryParams();
230230

231231
$fileObjects = $this->getFileObjectFromRequestTarget($request);
232+
232233
$allPrompts = $this->promptRepository->findAll();
234+
233235
$defaultPrompt = $this->promptRepository->getDefaultPromptText();
236+
234237
$imageLabels = $this->imagelabelRepository->findAll();
238+
235239
$defaultLabel = $this->imagelabelRepository->getDefaultImageLabelId();
240+
236241
$badwords = $this->badwordsRepository->findAll();
242+
237243
$siteLanguages = $this->getAllSiteLanguages();
238244

239245
$modal = $parsedBody['modal'] ?? $queryParams['modal'] ?? false;
@@ -248,7 +254,6 @@ protected function ajaxData(ServerRequestInterface $request): ResponseInterface
248254
// Setting target, which must be a file reference to a file within the mounts.
249255
$action = $parsedBody['action'] ?? $queryParams['action'] ?? '';
250256
$target = $parsedBody['target'] ?? $queryParams['target'] ?? '';
251-
252257
switch ($action) {
253258
case 'saveMetaData':
254259
$altText = $parsedBody['altText'] ?? $queryParams['altText'] ?? '';
@@ -257,30 +262,18 @@ protected function ajaxData(ServerRequestInterface $request): ResponseInterface
257262

258263
$translations = [];
259264
if ($doTranslate) {
260-
// Fetch all site languages and translate the altText
265+
// fetch all site languages and translate the altText
261266
foreach ($siteLanguages as $siteLanguage) {
262-
// Only translate additional languages (skip current language)
267+
// only translate additional languages (skip current language)
263268
if ($siteLanguage->getLanguageId() !== (int) $target_language) {
264-
$altTextTranslated = $this->translationService->translateText(
265-
$altText,
266-
$targetTwoLetterIsoCode,
267-
$this->getLocaleLanguageCode($siteLanguage)
268-
);
269-
$metaDataUid = $this->imageMetaDataService->saveMetaData(
270-
$target,
271-
$altTextTranslated,
272-
$siteLanguage->getLanguageId(),
273-
$parentUid
274-
);
269+
$altTextTranslated = $this->translationService->translateText($altText, $targetTwoLetterIsoCode, $this->getLocaleLanguageCode($siteLanguage));
270+
$metaDataUid = $this->imageMetaDataService->saveMetaData($target, $altTextTranslated, $siteLanguage->getLanguageId(), $parentUid);
275271
$translations[] = [
276272
'languageId' => $siteLanguage->getLanguageId(),
277273
'title' => $siteLanguage->getTitle(),
278-
'flagHtml' => $this->getLanguageFlagHtml(
279-
$siteLanguage->getFlagIdentifier(),
280-
$siteLanguage->getTitle()
281-
),
274+
'flagHtml' => $this->getLanguageFlagHtml($siteLanguage->getFlagIdentifier(), $siteLanguage->getTitle()),
282275
'altTextTranslated' => $altTextTranslated,
283-
'editLink' => (string) $this->getFileMetaDataEditLink($metaDataUid),
276+
'editLink' => (string)$this->getFileMetaDataEditLink($metaDataUid),
284277
];
285278
}
286279
}
@@ -294,29 +287,23 @@ protected function ajaxData(ServerRequestInterface $request): ResponseInterface
294287
return $this->responseFactory->createResponse()
295288
->withHeader('Content-Type', 'application/json')
296289
->withBody($this->streamFactory->createStream(json_encode($returnArray)));
297-
298290
case 'generateMetaData':
299-
$textPrompt = $parsedBody['textPrompt'] ?? $queryParams['textPrompt']
300-
?: ($defaultPrompt !== null ? $defaultPrompt : '');
301-
302-
$selectedimageLabel = $parsedBody['imageLabel'] ?? $queryParams['imageLabel']
303-
?: ($defaultLabel !== null ? $defaultLabel : -1);
304-
$selectedimageLabel = $selectedimageLabel !== "undefined" ? $selectedimageLabel : $defaultLabel;
305-
291+
$textPrompt = $parsedBody['textPrompt'] ?? $queryParams['textPrompt'] ?: ($defaultPrompt != null ? $defaultPrompt : '');
292+
$selectedimageLabel = $parsedBody['imageLabel'] ?? $queryParams['imageLabel'] ?: ($defaultLabel != null ? $defaultLabel : -1);
293+
$selectedimageLabel = $selectedimageLabel != "undefined" ? $selectedimageLabel : $defaultLabel;
306294
$badwords = $parsedBody['badwords'] ?? $queryParams['badwords'] ?: "";
307-
$badwords = $badwords !== "undefined" ? $badwords : "";
308-
295+
$badwords = $badwords != "undefined" ? $badwords : "";
296+
297+
298+
$supportsTranslation = false; //d asd sad sadsa das dasd sad asd
309299
if ($this->imageMetaDataService->supportsTranslation()) {
310300
$altTextFromImageTranslated = $this->imageMetaDataService->generateImageDescription(
311301
$fileObjects[0]['file'],
312302
$textPrompt,
313303
$badwords,
314304
$targetTwoLetterIsoCode
315305
);
316-
$data = [
317-
'alternative' => $altTextFromImageTranslated,
318-
'baseAlternative' => $altTextFromImageTranslated
319-
];
306+
$data = ['alternative' => $altTextFromImageTranslated, 'baseAlternative' => $altTextFromImageTranslated];
320307
} else {
321308
$altTextFromImage = $this->imageMetaDataService->generateImageDescription(
322309
$fileObjects[0]['file'],
@@ -333,12 +320,7 @@ protected function ajaxData(ServerRequestInterface $request): ResponseInterface
333320
->withBody($this->streamFactory->createStream(json_encode($data)));
334321

335322
default:
336-
if (version_compare(
337-
GeneralUtility::makeInstance(VersionNumberUtility::class)->getNumericTypo3Version(),
338-
'13.0',
339-
'<'
340-
)
341-
) {
323+
if (version_compare(GeneralUtility::makeInstance(VersionNumberUtility::class)->getNumericTypo3Version(), '13.0', '<')) {
342324
$moduleTemplate = $this->moduleTemplateFactory->create($request);
343325
$view = $this->getView('AjaxMetaGenerate', $request);
344326
} else {
@@ -368,20 +350,16 @@ protected function ajaxData(ServerRequestInterface $request): ResponseInterface
368350
$typo3Version = new Typo3Version();
369351
if ($typo3Version->getMajorVersion() > 11) {
370352
$pageRenderer->loadJavaScriptModule( // @phpstan-ignore-line
371-
'@pagemachine/ai-tools/AjaxMetaGenerate.js'
353+
'@pagemachine/ai-tools/AjaxMetaGenerate.js',
372354
);
373355
} else {
374356
$pageRenderer->loadRequireJsModule( // @phpstan-ignore-line
375357
'TYPO3/CMS/AiTools/Amd/AjaxMetaGenerate'
376358
);
377359
}
378360

379-
if (version_compare(
380-
GeneralUtility::makeInstance(VersionNumberUtility::class)->getNumericTypo3Version(),
381-
'13.0',
382-
'<'
383-
)
384-
) {
361+
362+
if (version_compare(GeneralUtility::makeInstance(VersionNumberUtility::class)->getNumericTypo3Version(), '13.0', '<')) {
385363
$view = $this->getView('AjaxMetaGenerate', $request);
386364
$view->assignMultiple($template_variables);
387365
$moduleTemplate->setContent($view->render()); // @phpstan-ignore-line
@@ -393,7 +371,6 @@ protected function ajaxData(ServerRequestInterface $request): ResponseInterface
393371
}
394372
}
395373

396-
397374
protected function addMetaToFile($fileObject, $languages): array
398375
{
399376
$meta = $this->imageMetaDataService->getMetaDataLanguages($fileObject, $languages);

0 commit comments

Comments
 (0)