upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-21 14:23:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

fix(Text2Image): Fix psalm issues

Browse source 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
This commit is contained in:
Marcel Klehr 2023-10-20 13:38:20 +02:00
parent 7b7f552a6e
commit bc85acf7d0
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/private/TextToImage/Manager.php
View file

@ -147,8 +147,11 @@ class Manager implements IManager {
}
$this->logger->debug('Creating result files for Text2Image task');
$resources = [];
$files = [];
for ($i = 0; $i < $task->getNumberOfImages(); $i++) {
$resources[] = $folder->newFile((string) $i)->write();
$file = $folder->newFile((string) $i);
$files[] = $file;
$resources[] = $file->write();
if ($resource[count($resources) - 1] === false) {
throw new RuntimeException('Text2Image generation using provider ' . $provider->getName() . ' failed: Couldn\'t open file to write.');
}
@ -158,7 +161,7 @@ class Manager implements IManager {
for ($i = 0; $i < $task->getNumberOfImages(); $i++) {
if (is_resource($resources[$i])) {
// If $resource hasn't been closed yet, we'll do that here
fclose($resource[$i]);
fclose($resources[$i]);
}
}
$task->setStatus(Task::STATUS_SUCCESSFUL);
@ -166,17 +169,20 @@ class Manager implements IManager {
$this->taskMapper->update(DbTask::fromPublicTask($task));
return;
} catch (\RuntimeException|\Throwable $e) {
if (isset($resource) && is_resource($resource)) {
// If $resource hasn't been closed yet, we'll do that here
fclose($resource);
}
try {
if (isset($file)) {
$file->delete();
for ($i = 0; $i < $task->getNumberOfImages(); $i++) {
if (isset($resources[$i]) && is_resource($resources[$i])) {
// If $resource hasn't been closed yet, we'll do that here
fclose($resources[$i]);
}
if (isset($files, $files[$i])) {
try {
$files[$i]->delete();
} catch(NotPermittedException $e) {
$this->logger->warning('Failed to clean up Text2Image result file after error', ['exception' => $e]);
}
}
} catch(NotPermittedException $e) {
$this->logger->warning('Failed to clean up Text2Image result file after error', ['exception' => $e]);
}
$this->logger->info('Text2Image generation using provider ' . $provider->getName() . ' failed', ['exception' => $e]);
$task->setStatus(Task::STATUS_FAILED);
try {