]> source.dussan.org Git - nextcloud-server.git/commitdiff
make movie backend work with encryption
authorGeorg Ehrke <georg@ownCloud.com>
Tue, 28 May 2013 09:48:02 +0000 (11:48 +0200)
committerGeorg Ehrke <georg@ownCloud.com>
Tue, 28 May 2013 09:48:02 +0000 (11:48 +0200)
lib/preview/movies.php

index 8144956c998aa5530261c68da00af0abb4a2e2e2..1e517b381824ab4e5f41d23b34d1590bf802c280 100644 (file)
@@ -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