diff options
| author | Georg Ehrke <georg@ownCloud.com> | 2013-05-28 11:48:02 +0200 |
|---|---|---|
| committer | Georg Ehrke <georg@ownCloud.com> | 2013-05-28 11:48:02 +0200 |
| commit | 4d52dfb0a0517a7fd52d20572085aba2ec0e4ad0 (patch) | |
| tree | d32db0274d8ab369ae3ede6179983c73942abaef /lib/preview | |
| parent | 7555332d58c6e684cfbde72d5676e8e1902ae4f3 (diff) | |
| download | nextcloud-server-4d52dfb0a0517a7fd52d20572085aba2ec0e4ad0.tar.gz nextcloud-server-4d52dfb0a0517a7fd52d20572085aba2ec0e4ad0.zip | |
make movie backend work with encryption
Diffstat (limited to 'lib/preview')
| -rw-r--r-- | lib/preview/movies.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/preview/movies.php b/lib/preview/movies.php index 8144956c998..1e517b38182 100644 --- a/lib/preview/movies.php +++ b/lib/preview/movies.php @@ -14,18 +14,25 @@ if(!is_null(shell_exec('ffmpeg -version'))){ } public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) { - $abspath = $fileview->getLocalfile($path); + //get fileinfo + $fileinfo = $fileview->getFileInfo($path); + $abspath = $fileview->toTmpFile($path); $tmppath = OC_Helper::tmpFile(); $cmd = 'ffmpeg -y -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmppath; shell_exec($cmd); + unlink($abspath); + $image = new \OC_Image($tmppath); if (!$image->valid()) return false; + unlink($tmppath); + return $image; } } + OC_Preview::registerProvider('OC_Preview_Movie'); }
\ No newline at end of file |