-
-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #20319 from nextcloud/enh/noid/embedded-previews
Use embedded previews of ZIP-like files
- Loading branch information
Showing
7 changed files
with
138 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| <?php | ||
| /** | ||
| * @copyright Copyright (c) 2020 Julius Härtl <jus@bitgrid.net> | ||
| * | ||
| * @author Julius Härtl <jus@bitgrid.net> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OC\Preview; | ||
|
|
||
| use OC\Archive\ZIP; | ||
| use OCP\Files\File; | ||
| use OCP\IImage; | ||
|
|
||
| /** | ||
| * Extracts a preview from files that embed them in an ZIP archive | ||
| */ | ||
| abstract class Bundled extends ProviderV2 { | ||
|
|
||
| protected function extractThumbnail(File $file, $path): ?IImage { | ||
| $sourceTmp = \OC::$server->getTempManager()->getTemporaryFile(); | ||
| $targetTmp = \OC::$server->getTempManager()->getTemporaryFile(); | ||
|
|
||
| try { | ||
| $content = $file->fopen('r'); | ||
| file_put_contents($sourceTmp, $content); | ||
|
|
||
| $zip = new ZIP($sourceTmp); | ||
| $zip->extractFile($path, $targetTmp); | ||
|
|
||
| $image = new \OC_Image(); | ||
| $image->loadFromFile($targetTmp); | ||
| $image->fixOrientation(); | ||
|
|
||
| return $image; | ||
| } catch (\Exception $e) { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| <?php | ||
| /** | ||
| * @copyright Copyright (c) 2020 Julius Härtl <jus@bitgrid.net> | ||
| * | ||
| * @author Julius Härtl <jus@bitgrid.net> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OC\Preview; | ||
|
|
||
| use OCP\Files\File; | ||
| use OCP\IImage; | ||
|
|
||
| class Krita extends Bundled { | ||
| /** | ||
| * {@inheritDoc} | ||
| */ | ||
| public function getMimeType(): string { | ||
| return '/application\/x-krita/'; | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * @inheritDoc | ||
| */ | ||
| public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage { | ||
| $image = $this->extractThumbnail($file, 'mergedimage.png'); | ||
| if ($image->valid()) { | ||
| return $image; | ||
| } | ||
| $image = $this->extractThumbnail($file, 'preview.png'); | ||
| if ($image->valid()) { | ||
| return $image; | ||
| } | ||
| return null; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters