yetangitu/nextcloud-apps
1
0
Fork 0
mirror of https://github.com/Yetangitu/owncloud-apps.git synced 2025-10-02 14:49:17 +02:00
Code Issues Releases Wiki Activity

files_opds: more robust preview service, fallback to icon when showPreview throws exception

Browse source
This commit is contained in:
frankdelange 2017-01-14 12:00:00 +01:00
parent 6caec6c3e3
commit 2204d4bfdf
1 changed files with 31 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

46
files_opds/lib/feed.php
View file

@ -106,22 +106,38 @@ class Feed
$preview->setMaxY(Config::getApp('thumb-y', '36')); $preview->setMaxY(Config::getApp('thumb-y', '36'));
break; break;
} }
$preview->showPreview();
// showPreview has been known to throw exceptions so wrap this call
try {
$preview->showPreview();
} catch (\OC\PreviewNotAvailableException $e) {
self::serveIcon($i['mimetype']);
}
} else { } else {
// no preview, serve icon instead self::serveIcon($i['mimetype']);
$scheme = ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off')
|| $_SERVER['SERVER_PORT'] == 443) ? 'https' : 'http';
header("Location: "
. $scheme
. "://"
. $_SERVER['HTTP_HOST']
. \OC::$server->getMimeTypeDetector()->mimeTypeIcon($i->getMimeType())
);
/* Note: relative URL should be enough (RFC7231) but some OPDS clients
* (especially those in dedicated book readers) might not support them
*
* header("Location: " . \OC::$server->getMimeTypeDetector()->mimeTypeIcon($i->getMimeType()));
*/
} }
}
/**
* @brief offer icon for download
*
* send icon for $mimetype
*
* @param string $mimetype
*/
private static function serveIcon($mimetype) {
$scheme = ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off')
|| $_SERVER['SERVER_PORT'] == 443) ? 'https' : 'http';
header("Location: "
. $scheme
. "://"
. $_SERVER['HTTP_HOST']
. \OC::$server->getMimeTypeDetector()->mimeTypeIcon($mimetype)
);
/* Note: relative URL should be enough (RFC7231) but some OPDS clients
* (especially those in dedicated book readers) might not support them
*
* header("Location: " . \OC::$server->getMimeTypeDetector()->mimeTypeIcon($mimetype));
*/
} }
} }