any preview requiring the which command will not be used on Windows
This commit is contained in:
Thomas Müller
parent
86f6f0ca92
commit
e3489b36ff
|
|
@ -8,40 +8,44 @@
|
|||
*/
|
||||
namespace OC\Preview;
|
||||
|
||||
$isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions')));
|
||||
$whichAVCONV = shell_exec('which avconv');
|
||||
$isAVCONVAvailable = !empty($whichAVCONV);
|
||||
// movie preview is currently not supported on Windows
|
||||
if (!\OC_Util::runningOnWindows()) {
|
||||
$isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions')));
|
||||
$whichAVCONV = shell_exec('which avconv');
|
||||
$isAVCONVAvailable = !empty($whichAVCONV);
|
||||
|
||||
if($isShellExecEnabled && $isAVCONVAvailable) {
|
||||
if($isShellExecEnabled && $isAVCONVAvailable) {
|
||||
|
||||
class Movie extends Provider {
|
||||
class Movie extends Provider {
|
||||
|
||||
public function getMimeType() {
|
||||
return '/video\/.*/';
|
||||
public function getMimeType() {
|
||||
return '/video\/.*/';
|
||||
}
|
||||
|
||||
public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
|
||||
$absPath = \OC_Helper::tmpFile();
|
||||
$tmpPath = \OC_Helper::tmpFile();
|
||||
|
||||
$handle = $fileview->fopen($path, 'rb');
|
||||
|
||||
$firstmb = stream_get_contents($handle, 1048576); //1024 * 1024 = 1048576
|
||||
file_put_contents($absPath, $firstmb);
|
||||
|
||||
//$cmd = 'ffmpeg -y -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmpPath;
|
||||
$cmd = 'avconv -an -y -ss 1 -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 ' . escapeshellarg($tmpPath);
|
||||
|
||||
shell_exec($cmd);
|
||||
|
||||
$image = new \OC_Image($tmpPath);
|
||||
|
||||
unlink($absPath);
|
||||
unlink($tmpPath);
|
||||
|
||||
return $image->valid() ? $image : false;
|
||||
}
|
||||
}
|
||||
|
||||
public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
|
||||
$absPath = \OC_Helper::tmpFile();
|
||||
$tmpPath = \OC_Helper::tmpFile();
|
||||
|
||||
$handle = $fileview->fopen($path, 'rb');
|
||||
|
||||
$firstmb = stream_get_contents($handle, 1048576); //1024 * 1024 = 1048576
|
||||
file_put_contents($absPath, $firstmb);
|
||||
|
||||
//$cmd = 'ffmpeg -y -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmpPath;
|
||||
$cmd = 'avconv -an -y -ss 1 -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 ' . escapeshellarg($tmpPath);
|
||||
|
||||
shell_exec($cmd);
|
||||
|
||||
$image = new \OC_Image($tmpPath);
|
||||
|
||||
unlink($absPath);
|
||||
unlink($tmpPath);
|
||||
|
||||
return $image->valid() ? $image : false;
|
||||
}
|
||||
\OC\Preview::registerProvider('OC\Preview\Movie');
|
||||
}
|
||||
}
|
||||
|
||||
\OC\Preview::registerProvider('OC\Preview\Movie');
|
||||
}
|
||||
|
|
@ -7,128 +7,132 @@
|
|||
*/
|
||||
namespace OC\Preview;
|
||||
|
||||
//we need imagick to convert
|
||||
class Office extends Provider {
|
||||
// office preview is currently not supported on Windows
|
||||
if (!\OC_Util::runningOnWindows()) {
|
||||
|
||||
private $cmd;
|
||||
//we need imagick to convert
|
||||
class Office extends Provider {
|
||||
|
||||
public function getMimeType() {
|
||||
return null;
|
||||
}
|
||||
private $cmd;
|
||||
|
||||
public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
|
||||
$this->initCmd();
|
||||
if(is_null($this->cmd)) {
|
||||
return false;
|
||||
public function getMimeType() {
|
||||
return null;
|
||||
}
|
||||
|
||||
$absPath = $fileview->toTmpFile($path);
|
||||
public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
|
||||
$this->initCmd();
|
||||
if(is_null($this->cmd)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$tmpDir = get_temp_dir();
|
||||
$absPath = $fileview->toTmpFile($path);
|
||||
|
||||
$defaultParameters = ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir ';
|
||||
$clParameters = \OCP\Config::getSystemValue('preview_office_cl_parameters', $defaultParameters);
|
||||
$tmpDir = get_temp_dir();
|
||||
|
||||
$exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
|
||||
$export = 'export HOME=/' . $tmpDir;
|
||||
$defaultParameters = ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir ';
|
||||
$clParameters = \OCP\Config::getSystemValue('preview_office_cl_parameters', $defaultParameters);
|
||||
|
||||
shell_exec($export . "\n" . $exec);
|
||||
$exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
|
||||
$export = 'export HOME=/' . $tmpDir;
|
||||
|
||||
shell_exec($export . "\n" . $exec);
|
||||
|
||||
//create imagick object from pdf
|
||||
try{
|
||||
$pdf = new \imagick($absPath . '.pdf' . '[0]');
|
||||
$pdf->setImageFormat('jpg');
|
||||
} catch (\Exception $e) {
|
||||
unlink($absPath);
|
||||
unlink($absPath . '.pdf');
|
||||
\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
|
||||
return false;
|
||||
}
|
||||
|
||||
$image = new \OC_Image($pdf);
|
||||
|
||||
//create imagick object from pdf
|
||||
try{
|
||||
$pdf = new \imagick($absPath . '.pdf' . '[0]');
|
||||
$pdf->setImageFormat('jpg');
|
||||
} catch (\Exception $e) {
|
||||
unlink($absPath);
|
||||
unlink($absPath . '.pdf');
|
||||
\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
|
||||
return false;
|
||||
|
||||
return $image->valid() ? $image : false;
|
||||
}
|
||||
|
||||
$image = new \OC_Image($pdf);
|
||||
private function initCmd() {
|
||||
$cmd = '';
|
||||
|
||||
unlink($absPath);
|
||||
unlink($absPath . '.pdf');
|
||||
if(is_string(\OC_Config::getValue('preview_libreoffice_path', null))) {
|
||||
$cmd = \OC_Config::getValue('preview_libreoffice_path', null);
|
||||
}
|
||||
|
||||
return $image->valid() ? $image : false;
|
||||
$whichLibreOffice = shell_exec('which libreoffice');
|
||||
if($cmd === '' && !empty($whichLibreOffice)) {
|
||||
$cmd = 'libreoffice';
|
||||
}
|
||||
|
||||
$whichOpenOffice = shell_exec('which openoffice');
|
||||
if($cmd === '' && !empty($whichOpenOffice)) {
|
||||
$cmd = 'openoffice';
|
||||
}
|
||||
|
||||
if($cmd === '') {
|
||||
$cmd = null;
|
||||
}
|
||||
|
||||
$this->cmd = $cmd;
|
||||
}
|
||||
}
|
||||
|
||||
private function initCmd() {
|
||||
$cmd = '';
|
||||
//.doc, .dot
|
||||
class MSOfficeDoc extends Office {
|
||||
|
||||
if(is_string(\OC_Config::getValue('preview_libreoffice_path', null))) {
|
||||
$cmd = \OC_Config::getValue('preview_libreoffice_path', null);
|
||||
public function getMimeType() {
|
||||
return '/application\/msword/';
|
||||
}
|
||||
|
||||
$whichLibreOffice = shell_exec('which libreoffice');
|
||||
if($cmd === '' && !empty($whichLibreOffice)) {
|
||||
$cmd = 'libreoffice';
|
||||
}
|
||||
|
||||
\OC\Preview::registerProvider('OC\Preview\MSOfficeDoc');
|
||||
|
||||
//.docm, .dotm, .xls(m), .xlt(m), .xla(m), .ppt(m), .pot(m), .pps(m), .ppa(m)
|
||||
class MSOffice2003 extends Office {
|
||||
|
||||
public function getMimeType() {
|
||||
return '/application\/vnd.ms-.*/';
|
||||
}
|
||||
|
||||
$whichOpenOffice = shell_exec('which openoffice');
|
||||
if($cmd === '' && !empty($whichOpenOffice)) {
|
||||
$cmd = 'openoffice';
|
||||
}
|
||||
|
||||
\OC\Preview::registerProvider('OC\Preview\MSOffice2003');
|
||||
|
||||
//.docx, .dotx, .xlsx, .xltx, .pptx, .potx, .ppsx
|
||||
class MSOffice2007 extends Office {
|
||||
|
||||
public function getMimeType() {
|
||||
return '/application\/vnd.openxmlformats-officedocument.*/';
|
||||
}
|
||||
|
||||
if($cmd === '') {
|
||||
$cmd = null;
|
||||
}
|
||||
|
||||
\OC\Preview::registerProvider('OC\Preview\MSOffice2007');
|
||||
|
||||
//.odt, .ott, .oth, .odm, .odg, .otg, .odp, .otp, .ods, .ots, .odc, .odf, .odb, .odi, .oxt
|
||||
class OpenDocument extends Office {
|
||||
|
||||
public function getMimeType() {
|
||||
return '/application\/vnd.oasis.opendocument.*/';
|
||||
}
|
||||
|
||||
$this->cmd = $cmd;
|
||||
}
|
||||
}
|
||||
|
||||
//.doc, .dot
|
||||
class MSOfficeDoc extends Office {
|
||||
|
||||
public function getMimeType() {
|
||||
return '/application\/msword/';
|
||||
}
|
||||
|
||||
}
|
||||
\OC\Preview::registerProvider('OC\Preview\OpenDocument');
|
||||
|
||||
\OC\Preview::registerProvider('OC\Preview\MSOfficeDoc');
|
||||
//.sxw, .stw, .sxc, .stc, .sxd, .std, .sxi, .sti, .sxg, .sxm
|
||||
class StarOffice extends Office {
|
||||
|
||||
//.docm, .dotm, .xls(m), .xlt(m), .xla(m), .ppt(m), .pot(m), .pps(m), .ppa(m)
|
||||
class MSOffice2003 extends Office {
|
||||
public function getMimeType() {
|
||||
return '/application\/vnd.sun.xml.*/';
|
||||
}
|
||||
|
||||
public function getMimeType() {
|
||||
return '/application\/vnd.ms-.*/';
|
||||
}
|
||||
|
||||
\OC\Preview::registerProvider('OC\Preview\StarOffice');
|
||||
}
|
||||
|
||||
\OC\Preview::registerProvider('OC\Preview\MSOffice2003');
|
||||
|
||||
//.docx, .dotx, .xlsx, .xltx, .pptx, .potx, .ppsx
|
||||
class MSOffice2007 extends Office {
|
||||
|
||||
public function getMimeType() {
|
||||
return '/application\/vnd.openxmlformats-officedocument.*/';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
\OC\Preview::registerProvider('OC\Preview\MSOffice2007');
|
||||
|
||||
//.odt, .ott, .oth, .odm, .odg, .otg, .odp, .otp, .ods, .ots, .odc, .odf, .odb, .odi, .oxt
|
||||
class OpenDocument extends Office {
|
||||
|
||||
public function getMimeType() {
|
||||
return '/application\/vnd.oasis.opendocument.*/';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
\OC\Preview::registerProvider('OC\Preview\OpenDocument');
|
||||
|
||||
//.sxw, .stw, .sxc, .stc, .sxd, .std, .sxi, .sti, .sxg, .sxm
|
||||
class StarOffice extends Office {
|
||||
|
||||
public function getMimeType() {
|
||||
return '/application\/vnd.sun.xml.*/';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
\OC\Preview::registerProvider('OC\Preview\StarOffice');
|
||||
|
|
@ -8,15 +8,22 @@
|
|||
//both, libreoffice backend and php fallback, need imagick
|
||||
if (extension_loaded('imagick')) {
|
||||
$isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions')));
|
||||
$whichLibreOffice = shell_exec('which libreoffice');
|
||||
$isLibreOfficeAvailable = !empty($whichLibreOffice);
|
||||
$whichOpenOffice = shell_exec('which libreoffice');
|
||||
$isOpenOfficeAvailable = !empty($whichOpenOffice);
|
||||
//let's see if there is libreoffice or openoffice on this machine
|
||||
if($isShellExecEnabled && ($isLibreOfficeAvailable || $isOpenOfficeAvailable || is_string(\OC_Config::getValue('preview_libreoffice_path', null)))) {
|
||||
require_once('office-cl.php');
|
||||
}else{
|
||||
|
||||
// movie preview is currently not supported on Windows
|
||||
if (!\OC_Util::runningOnWindows()) {
|
||||
$whichLibreOffice = shell_exec('which libreoffice');
|
||||
$isLibreOfficeAvailable = !empty($whichLibreOffice);
|
||||
$whichOpenOffice = shell_exec('which libreoffice');
|
||||
$isOpenOfficeAvailable = !empty($whichOpenOffice);
|
||||
//let's see if there is libreoffice or openoffice on this machine
|
||||
if($isShellExecEnabled && ($isLibreOfficeAvailable || $isOpenOfficeAvailable || is_string(\OC_Config::getValue('preview_libreoffice_path', null)))) {
|
||||
require_once('office-cl.php');
|
||||
}else{
|
||||
//in case there isn't, use our fallback
|
||||
require_once('office-fallback.php');
|
||||
}
|
||||
} else {
|
||||
//in case there isn't, use our fallback
|
||||
require_once('office-fallback.php');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue