Skip to content

Prevent the OpenDocument preview generator from trying to open empty files. #30986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rotdrop wants to merge 2 commits into from
Closed

Prevent the OpenDocument preview generator from trying to open empty files. #30986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dc8bd7
Prevent the OpenDocument preview generator from trying to open empty …
rotdrop Feb 3, 2022
6ea0b89
Update lib/private/Preview/Bundled.php
rotdrop Feb 14, 2022
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
5 changes: 5 additions & 0 deletions lib/private/Preview/Bundled.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@
*/
abstract class Bundled extends ProviderV2 {
protected function extractThumbnail(File $file, $path): ?IImage {

if ($file->getSize() === 0) {
return null;
}

$sourceTmp = \OC::$server->getTempManager()->getTemporaryFile();
$targetTmp = \OC::$server->getTempManager()->getTemporaryFile();

Expand Down
2 changes: 1 addition & 1 deletion lib/private/Preview/OpenDocument.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function getMimeType(): string {
*/
public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
$image = $this->extractThumbnail($file, 'Thumbnails/thumbnail.png');
if ($image->valid()) {
if (!empty($image) && $image->valid()) {
return $image;
}
return null;
Expand Down