Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 16 additions & 0 deletions lib/private/Preview/Db/PreviewMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

use DateInterval;
use DateTimeImmutable;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Db\Entity;
use OCP\AppFramework\Db\QBMapper;
use OCP\DB\Exception;
Expand Down Expand Up @@ -235,4 +236,19 @@ public function getPreviewsForMimeTypes(array $mimeTypes): \Generator {
));
return $this->yieldEntities($qb);
}

public function getPreviewForSpecification(array $parameters): ?Preview {
$qb = $this->db->getQueryBuilder();
$this->joinLocation($qb);

foreach ($parameters as $key => $value) {
$qb->andWhere($qb->expr()->eq($key, $qb->createNamedParameter($value)));
}

try {
return $this->findEntity($qb);
} catch (DoesNotExistException) {
return null;
}
}
}
26 changes: 25 additions & 1 deletion lib/private/Preview/Generator.php
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,30 @@ public function savePreview(Preview $previewEntry, IImage $preview): Preview {
}
$previewEntry->setSize($size);
$previewEntry->generateId();
return $this->previewMapper->insert($previewEntry);
try {
return $this->previewMapper->insert($previewEntry);
} catch (DBException $e) {
if ($e->getReason() !== DBException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
throw $e;
}

$this->storageFactory->deletePreview($previewEntry);

$this->logger->debug("Generating a preview but one already exists.", ['exception' => $e]);

$preview = $this->previewMapper->getPreviewForSpecification([
'file_id' => $previewEntry->getFileId(),
'width' => $previewEntry->getWidth(),
'height' => $previewEntry->getHeight(),
'mimetype_id' => $previewEntry->getMimetypeId(),
'cropped' => $previewEntry->isCropped(),
'version_id' => $previewEntry->getVersion() ?? '-1',
]);

if ($preview === null) {
throw new \RuntimeException('Unable to save a preview because it already exists but fetching it again yield nothing');
}
return $preview;
}
}
}
Loading