mirrors/h5ai
1
0
Fork 0
mirror of https://github.com/lrsjng/h5ai.git synced 2025-05-25 12:34:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

More refactorings.

Browse source
This commit is contained in:
Lars Jung 2014-05-21 16:09:02 +02:00
parent 0b28a9eea1
commit a89db0c259
3 changed files with 24 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/_h5ai/server/php/inc/class-api.php
View file

@ -17,13 +17,10 @@ class Api {
public function apply() { public function apply() {
$action = use_request_param("action"); $action = use_request_param("action");
json_fail(100, "unsupported request", !in_array($action, $this->actions));
if (in_array($action, $this->actions)) { $methodname = "on_$action";
$methodname = "on_$action"; $this->$methodname();
$this->$methodname();
}
json_fail(100, "unsupported request");
} }
@ -124,7 +121,7 @@ class Api {
header("Connection: close"); header("Connection: close");
$rc = $archive->output($type, $hrefs); $rc = $archive->output($type, $hrefs);
json_fail("packaging failed", $rc !== 0); json_fail(2, "packaging failed", $rc !== 0);
exit; exit;
} }

33
src/_h5ai/server/php/inc/class-thumb.php
View file

@ -2,9 +2,9 @@
class Thumb { class Thumb {
private static $FFMPEG_CMD = "ffmpeg -ss 0:01:00 -i [SOURCE] -an -vframes 1 [TARGET]"; private static $FFMPEG_CMDV = array("ffmpeg", "-ss", "0:01:00", "-i", "[SRC]", "-an", "-vframes", "1", "[DEST]");
private static $AVCONV_CMD = "avconv -ss 0:01:00 -i [SOURCE] -an -vframes 1 [TARGET]"; private static $AVCONV_CMDV = array("avconv", "-ss", "0:01:00", "-i", "[SRC]", "-an", "-vframes", "1", "[DEST]");
private static $CONVERT_CMD = "convert -strip [SOURCE][0] [TARGET]"; private static $CONVERT_CMDV = array("convert", "-strip", "[SRC][0]", "[DEST]");
private static $THUMB_CACHE = "thumbs"; private static $THUMB_CACHE = "thumbs";
@ -26,12 +26,13 @@ class Thumb {
if ($type === "img") { if ($type === "img") {
$capture_path = $source_path; $capture_path = $source_path;
} else if ($type === "mov") { } else if ($type === "mov") {
$capture_path = $this->capture(Thumb::$FFMPEG_CMD, $source_path); if (HAS_CMD_FFMPEG) {
if ($capture_path === null) { $capture_path = $this->capture(Thumb::$FFMPEG_CMDV, $source_path);
$capture_path = $this->capture(Thumb::$AVCONV_CMD, $source_path); } else if (HAS_CMD_AVCONV) {
$capture_path = $this->capture(Thumb::$AVCONV_CMDV, $source_path);
} }
} else if ($type === "doc") { } else if ($type === "doc" && HAS_CMD_CONVERT) {
$capture_path = $this->capture(Thumb::$CONVERT_CMD, $source_path); $capture_path = $this->capture(Thumb::$CONVERT_CMDV, $source_path);
} }
return $this->thumb_href($capture_path, $mode, $width, $height); return $this->thumb_href($capture_path, $mode, $width, $height);
@ -77,7 +78,7 @@ class Thumb {
} }
private function capture($cmd, $source_path) { private function capture($cmdv, $source_path) {
if (!file_exists($source_path)) { if (!file_exists($source_path)) {
return null; return null;
@ -87,16 +88,12 @@ class Thumb {
if (!file_exists($capture_path) || filemtime($source_path) >= filemtime($capture_path)) { if (!file_exists($capture_path) || filemtime($source_path) >= filemtime($capture_path)) {
// if ($type === "mov") { foreach ($cmdv as &$arg) {
// $cmdv = array("ffmpeg", "-ss", "0:01:00", "-i", $source_path, "-an", "-vframes", "1", $capture_path); $arg = str_replace("[SRC]", $source_path, $arg);
// $cmdv = array("avconv", "-ss", "0:01:00", "-i", $source_path, "-an", "-vframes", "1", $capture_path); $arg = str_replace("[DEST]", $capture_path, $arg);
// } else if ($type === "doc") { }
// $cmdv = array("convert", "-strip", $source_path, $capture_path);
// }
$cmd = str_replace("[SOURCE]", escapeshellarg($source_path), $cmd); exec_cmdv($cmdv);
$cmd = str_replace("[TARGET]", escapeshellarg($capture_path), $cmd);
exec_cmd($cmd);
} }
return file_exists($capture_path) ? $capture_path : null; return file_exists($capture_path) ? $capture_path : null;

15
src/_h5ai/server/php/inc/util.php
View file

@ -66,15 +66,6 @@ function load_commented_json($file) {
} }
function exec_cmd($cmd) {
$lines = array();
$rc = null;
exec($cmd, $lines, $rc);
return implode("\n", $lines);
}
function passthru_cmd($cmd) { function passthru_cmd($cmd) {
$rc = null; $rc = null;
@ -89,7 +80,11 @@ function exec_cmdv($cmdv) {
$cmdv = func_get_args(); $cmdv = func_get_args();
} }
$cmd = implode(" ", array_map("escapeshellarg", $cmdv)); $cmd = implode(" ", array_map("escapeshellarg", $cmdv));
return exec_cmd($cmd);
$lines = array();
$rc = null;
exec($cmd, $lines, $rc);
return implode("\n", $lines);
} }