mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8978 from owncloud/movie_preview_improvements 

movie previews: use file directly when it's stored locally and encryption is not enabled
This commit is contained in:
Morris Jobke 2014-06-14 01:01:59 +02:00
parent 2b82e3c251 7396e5f455
commit 35f7565e9b
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/private/preview/movies.php
View File

@ -41,6 +41,13 @@ if (!\OC_Util::runningOnWindows()) {
public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
// TODO: use proc_open() and stream the source file ?
$fileInfo = $fileview->getFileInfo($path);
$useFileDirectly = (!$fileInfo->isEncrypted() && !$fileInfo->isMounted());
if ($useFileDirectly) {
$absPath = $fileview->getLocalFile($path);
} else {
$absPath = \OC_Helper::tmpFile();
$handle = $fileview->fopen($path, 'rb');
@ -49,6 +56,7 @@ if (!\OC_Util::runningOnWindows()) {
// in some cases 1MB was no enough to generate thumbnail
$firstmb = stream_get_contents($handle, 5242880);
file_put_contents($absPath, $firstmb);
}
$result = $this->generateThumbNail($maxX, $maxY, $absPath, 5);
if ($result === false) {
@ -58,8 +66,9 @@ if (!\OC_Util::runningOnWindows()) {
}
}
if (!$useFileDirectly) {
unlink($absPath);
}
return $result;
}