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

movie previews: use file directly when it's stored locally and encryption is not enabled, fixes #7756

This commit is contained in:
Georg Ehrke 2014-06-10 22:08:12 +02:00
parent ecc41fe0c3
commit 7396e5f455
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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