xiaohuilam / laravel-flysystem-wantu

src/Plugins/GetUrl.php

Indentation +8 added lines, -8 removed lines

@@ -5,12 +5,12 @@
 
 class GetUrl extends AbstractPlugin
 {
-    public function getMethod()
-    {
-        return 'getUrl';
-    }
-    public function handle($path)
-    {
-        return $this->filesystem->getAdapter()->getUrl($path);
-    }
+	public function getMethod()
+	{
+		return 'getUrl';
+	}
+	public function handle($path)
+	{
+		return $this->filesystem->getAdapter()->getUrl($path);
+	}
 }

src/WantuFileAdapter.php

Spacing +2 added lines, -2 removed lines

@@ -209,7 +209,7 @@ 
     public function has($path)
     {
         if (Str::endsWith($path, "/")) {
-            return $this->client->existsFolder($this->namespace,  preg_replace('/^\./' , '', dirname( $path)));
+            return $this->client->existsFolder($this->namespace, preg_replace('/^\./', '', dirname($path)));
         } else {
             return $this->client->existsFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
         }
@@ -437,7 +437,7 @@ 
         return $this->client->getUploadToken(collect([
             'expiration' => Carbon::now()->addSeconds($option['ttl'])->timestamp * 1000,
             'insertOnly' => Conf::INSERT_ONLY_TRUE
-        ])->merge(collect($option)->except(['ttl',])));
+        ])->merge(collect($option)->except(['ttl', ])));
     }
 
     /**

Indentation +385 added lines, -385 removed lines

@@ -12,389 +12,389 @@
 
 class WantuFileAdapter extends AbstractAdapter
 {
-    use NotSupportingVisibilityTrait;
-
-    /**
-     * @var Client|null
-     */
-    private $client = null;
-
-    /**
-     * @var string
-     */
-    private $namespace = null;
-
-    /**
-     * @var string
-     */
-    private $domain = null;
-
-    /**
-     * @param string $accessKey
-     * @param string $secretKey
-     * @param string $namespace
-     */
-    public function __construct($accessKey, $secretKey, $namespace, $origin)
-    {
-        $client = new Client($accessKey, $secretKey, $namespace);
-        $this->setClient($client, $namespace, $origin);
-    }
-
-    public function setClient(Client $client, $namespace, $origin)
-    {
-        $this->client = $client;
-        $this->namespace = $namespace;
-        $this->domain = $origin;
-    }
-
-    /**
-     * Write a new file.
-     *
-     * @param string $path
-     * @param string $contents
-     * @param Config $config   Config object
-     *
-     * @return array|false false on failure file meta data on success
-     */
-    public function write($path, $contents, Config $config)
-    {
-        $uploadPolicy = new UploadPolicy([
-            'namespace' => $this->namespace,
-            'dir' => preg_replace('/^\./', '', dirname($path)),
-            'name' => last(explode("/", $path)),
-        ]);
-
-        return $this->client->uploadData($contents, $uploadPolicy);
-    }
-
-    /**
-     * Write a new file using a stream.
-     *
-     * @param string   $path
-     * @param resource $resource
-     * @param Config   $config   Config object
-     *
-     * @return array|false false on failure file meta data on success
-     */
-    public function writeStream($path, $resource, Config $config)
-    {
-        $contents = '';
-
-        while (!feof($resource)) {
-            $contents .= fread($resource, 1024);
-        }
-
-        $response = $this->write($path, $contents, $config);
-
-        if (false === $response) {
-            return $response;
-        }
-
-        return compact('path');
-    }
-
-    /**
-     * Update a file.
-     *
-     * @param string $path
-     * @param string $contents
-     * @param Config $config   Config object
-     *
-     * @return array|false false on failure file meta data on success
-     */
-    public function update($path, $contents, Config $config)
-    {
-        $this->delete($path);
-
-        return $this->write($path, $contents, $config);
-    }
-
-    /**
-     * Update a file using a stream.
-     *
-     * @param string   $path
-     * @param resource $resource
-     * @param Config   $config   Config object
-     *
-     * @return array|false false on failure file meta data on success
-     */
-    public function updateStream($path, $resource, Config $config)
-    {
-        $this->delete($path);
-
-        return $this->writeStream($path, $resource, $config);
-    }
-
-    public function put($path, $contents, Config $config)
-    {
-        return $this->write($path, $contents, $config);
-    }
-
-    public function putStream($path, $resource, Config $config)
-    {
-        return $this->write($path, $resource, $config);
-    }
-
-    /**
-     * Rename a file.
-     *
-     * @param string $path
-     * @param string $newpath
-     *
-     * @return bool
-     */
-    public function rename($path, $newpath)
-    {
-        return $this->client->renameFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)), preg_replace('/^\./', '', dirname($newpath)), last(explode("/", $newpath)));
-    }
-
-    /**
-     * Copy a file.
-     *
-     * @param string $path
-     * @param string $newpath
-     *
-     * @return bool
-     */
-    public function copy($path, $newpath)
-    {
-    }
-
-    /**
-     * Delete a file.
-     *
-     * @param string $path
-     *
-     * @return bool
-     */
-    public function delete($path)
-    {
-        return $this->client->deleteFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
-    }
-
-    /**
-     * Delete a directory.
-     *
-     * @param string $dirname
-     *
-     * @return bool
-     */
-    public function deleteDir($dirname)
-    {
-        return $this->client->deleteDir($this->namespace, $dirname);
-    }
-
-    /**
-     * Create a directory.
-     *
-     * @param string $dirname directory name
-     * @param Config $config
-     *
-     * @return array|false
-     */
-    public function createDir($dirname, Config $config)
-    {
-        return $this->client->createDir($this->namespace, $dirname);
-    }
-
-    /**
-     * Check whether a file exists.
-     *
-     * @param string $path
-     *
-     * @return array|bool|null
-     */
-    public function has($path)
-    {
-        if (Str::endsWith($path, "/")) {
-            return $this->client->existsFolder($this->namespace,  preg_replace('/^\./' , '', dirname( $path)));
-        } else {
-            return $this->client->existsFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
-        }
-    }
-
-
-    /**
-     * Read a file.
-     *
-     * @param string $path
-     *
-     * @return array|false
-     */
-    public function read($path)
-    {
-        $contents = file_get_contents($this->getUrl($path));
-        return compact('contents', 'path');
-    }
-
-    /**
-     * Read a file as a stream.
-     *
-     * @param string $path
-     *
-     * @return array|false
-     */
-    public function readStream($path)
-    {
-    }
-
-    /**
-     * List contents of a directory.
-     *
-     * @param string $directory
-     * @param bool   $recursive
-     *
-     * @return array
-     */
-    public function listContents($directory = '', $recursive = false)
-    {
-        return $this->client->listFiles($this->namespace, $directory, 1, 1000);
-    }
-
-    /**
-     * Get all the meta data of a file or directory.
-     *
-     * @param string $path
-     *
-     * @return array|false
-     */
-    public function getMetadata($path)
-    {
-        return $this->client->getFileInfo($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
-    }
-
-    /**
-     * Get the size of a file.
-     *
-     * @param string $path
-     *
-     * @return array|false
-     */
-    public function getSize($path)
-    {
-    }
-
-
-    /**
-     * Fetch url to bucket.
-     *
-     * @param string $path
-     * @param string $url
-     *
-     * @return array|false
-     */
-    public function fetch($path, $url)
-    {
-    }
-
-    /**
-     * Get private file download url.
-     *
-     * @param string $path
-     * @param int    $expires
-     *
-     * @return string
-     */
-    public function privateDownloadUrl($path, $expires = 3600)
-    {
-    }
-
-    /**
-     * Refresh file cache.
-     *
-     * @param string|array $path
-     *
-     * @return array
-     */
-    public function refresh($path)
-    {
-    }
-
-
-    /**
-     * Get the mime-type of a file.
-     *
-     * @param string $path
-     *
-     * @return array|false
-     */
-    public function getMimeType($path)
-    {
-    }
-
-
-    /**
-     * Get the timestamp of a file.
-     *
-     * @param string $path
-     *
-     * @return array|false
-     */
-    public function getTimestamp($path)
-    {
-    }
-
-    /**
-     * Get the upload token.
-     *
-     * @param string|null $key
-     * @param int         $ttl
-     * @param string|null $policy
-     * @param string|null $strictPolice
-     *
-     * @return string
-     */
-    public function getUploadToken($option = null)
-    {
-        if ($option === null) {
-            $option = ['name' => null, 'ttl' => 3600, ];
-        } else if (!isset($option['ttl']) || !$option['ttl']) {
-            $option['ttl'] = 3600;
-        }
-
-        return $this->client->getUploadToken(collect([
-            'expiration' => Carbon::now()->addSeconds($option['ttl'])->timestamp * 1000,
-            'insertOnly' => Conf::INSERT_ONLY_TRUE
-        ])->merge(collect($option)->except(['ttl',])));
-    }
-
-    /**
-     * @param array $stats
-     *
-     * @return array
-     */
-    protected function normalizeFileInfo(array $stats)
-    {
-        return [
-            'type' => 'file',
-            'path' => $stats['key'],
-            'timestamp' => floor($stats['putTime'] / 10000000),
-            'size' => $stats['fsize'],
-        ];
-    }
-
-    /**
-     * Get resource url.
-     *
-     * @param string $path
-     *
-     * @return string
-     */
-    public function getUrl($path)
-    {
-        return $this->normalizeHost($this->domain) . ltrim($path, '/');
-    }
-
-    /**
-     * @param string $domain
-     *
-     * @return string
-     */
-    protected function normalizeHost($domain)
-    {
-        if (0 !== stripos($domain, 'https://') && 0 !== stripos($domain, 'http://')) {
-            $domain = "http://{$domain}";
-        }
-        return rtrim($domain, '/') . '/';
-    }
+	use NotSupportingVisibilityTrait;
+
+	/**
+	 * @var Client|null
+	 */
+	private $client = null;
+
+	/**
+	 * @var string
+	 */
+	private $namespace = null;
+
+	/**
+	 * @var string
+	 */
+	private $domain = null;
+
+	/**
+	 * @param string $accessKey
+	 * @param string $secretKey
+	 * @param string $namespace
+	 */
+	public function __construct($accessKey, $secretKey, $namespace, $origin)
+	{
+		$client = new Client($accessKey, $secretKey, $namespace);
+		$this->setClient($client, $namespace, $origin);
+	}
+
+	public function setClient(Client $client, $namespace, $origin)
+	{
+		$this->client = $client;
+		$this->namespace = $namespace;
+		$this->domain = $origin;
+	}
+
+	/**
+	 * Write a new file.
+	 *
+	 * @param string $path
+	 * @param string $contents
+	 * @param Config $config   Config object
+	 *
+	 * @return array|false false on failure file meta data on success
+	 */
+	public function write($path, $contents, Config $config)
+	{
+		$uploadPolicy = new UploadPolicy([
+			'namespace' => $this->namespace,
+			'dir' => preg_replace('/^\./', '', dirname($path)),
+			'name' => last(explode("/", $path)),
+		]);
+
+		return $this->client->uploadData($contents, $uploadPolicy);
+	}
+
+	/**
+	 * Write a new file using a stream.
+	 *
+	 * @param string   $path
+	 * @param resource $resource
+	 * @param Config   $config   Config object
+	 *
+	 * @return array|false false on failure file meta data on success
+	 */
+	public function writeStream($path, $resource, Config $config)
+	{
+		$contents = '';
+
+		while (!feof($resource)) {
+			$contents .= fread($resource, 1024);
+		}
+
+		$response = $this->write($path, $contents, $config);
+
+		if (false === $response) {
+			return $response;
+		}
+
+		return compact('path');
+	}
+
+	/**
+	 * Update a file.
+	 *
+	 * @param string $path
+	 * @param string $contents
+	 * @param Config $config   Config object
+	 *
+	 * @return array|false false on failure file meta data on success
+	 */
+	public function update($path, $contents, Config $config)
+	{
+		$this->delete($path);
+
+		return $this->write($path, $contents, $config);
+	}
+
+	/**
+	 * Update a file using a stream.
+	 *
+	 * @param string   $path
+	 * @param resource $resource
+	 * @param Config   $config   Config object
+	 *
+	 * @return array|false false on failure file meta data on success
+	 */
+	public function updateStream($path, $resource, Config $config)
+	{
+		$this->delete($path);
+
+		return $this->writeStream($path, $resource, $config);
+	}
+
+	public function put($path, $contents, Config $config)
+	{
+		return $this->write($path, $contents, $config);
+	}
+
+	public function putStream($path, $resource, Config $config)
+	{
+		return $this->write($path, $resource, $config);
+	}
+
+	/**
+	 * Rename a file.
+	 *
+	 * @param string $path
+	 * @param string $newpath
+	 *
+	 * @return bool
+	 */
+	public function rename($path, $newpath)
+	{
+		return $this->client->renameFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)), preg_replace('/^\./', '', dirname($newpath)), last(explode("/", $newpath)));
+	}
+
+	/**
+	 * Copy a file.
+	 *
+	 * @param string $path
+	 * @param string $newpath
+	 *
+	 * @return bool
+	 */
+	public function copy($path, $newpath)
+	{
+	}
+
+	/**
+	 * Delete a file.
+	 *
+	 * @param string $path
+	 *
+	 * @return bool
+	 */
+	public function delete($path)
+	{
+		return $this->client->deleteFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
+	}
+
+	/**
+	 * Delete a directory.
+	 *
+	 * @param string $dirname
+	 *
+	 * @return bool
+	 */
+	public function deleteDir($dirname)
+	{
+		return $this->client->deleteDir($this->namespace, $dirname);
+	}
+
+	/**
+	 * Create a directory.
+	 *
+	 * @param string $dirname directory name
+	 * @param Config $config
+	 *
+	 * @return array|false
+	 */
+	public function createDir($dirname, Config $config)
+	{
+		return $this->client->createDir($this->namespace, $dirname);
+	}
+
+	/**
+	 * Check whether a file exists.
+	 *
+	 * @param string $path
+	 *
+	 * @return array|bool|null
+	 */
+	public function has($path)
+	{
+		if (Str::endsWith($path, "/")) {
+			return $this->client->existsFolder($this->namespace,  preg_replace('/^\./' , '', dirname( $path)));
+		} else {
+			return $this->client->existsFile($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
+		}
+	}
+
+
+	/**
+	 * Read a file.
+	 *
+	 * @param string $path
+	 *
+	 * @return array|false
+	 */
+	public function read($path)
+	{
+		$contents = file_get_contents($this->getUrl($path));
+		return compact('contents', 'path');
+	}
+
+	/**
+	 * Read a file as a stream.
+	 *
+	 * @param string $path
+	 *
+	 * @return array|false
+	 */
+	public function readStream($path)
+	{
+	}
+
+	/**
+	 * List contents of a directory.
+	 *
+	 * @param string $directory
+	 * @param bool   $recursive
+	 *
+	 * @return array
+	 */
+	public function listContents($directory = '', $recursive = false)
+	{
+		return $this->client->listFiles($this->namespace, $directory, 1, 1000);
+	}
+
+	/**
+	 * Get all the meta data of a file or directory.
+	 *
+	 * @param string $path
+	 *
+	 * @return array|false
+	 */
+	public function getMetadata($path)
+	{
+		return $this->client->getFileInfo($this->namespace, preg_replace('/^\./', '', dirname($path)), last(explode("/", $path)));
+	}
+
+	/**
+	 * Get the size of a file.
+	 *
+	 * @param string $path
+	 *
+	 * @return array|false
+	 */
+	public function getSize($path)
+	{
+	}
+
+
+	/**
+	 * Fetch url to bucket.
+	 *
+	 * @param string $path
+	 * @param string $url
+	 *
+	 * @return array|false
+	 */
+	public function fetch($path, $url)
+	{
+	}
+
+	/**
+	 * Get private file download url.
+	 *
+	 * @param string $path
+	 * @param int    $expires
+	 *
+	 * @return string
+	 */
+	public function privateDownloadUrl($path, $expires = 3600)
+	{
+	}
+
+	/**
+	 * Refresh file cache.
+	 *
+	 * @param string|array $path
+	 *
+	 * @return array
+	 */
+	public function refresh($path)
+	{
+	}
+
+
+	/**
+	 * Get the mime-type of a file.
+	 *
+	 * @param string $path
+	 *
+	 * @return array|false
+	 */
+	public function getMimeType($path)
+	{
+	}
+
+
+	/**
+	 * Get the timestamp of a file.
+	 *
+	 * @param string $path
+	 *
+	 * @return array|false
+	 */
+	public function getTimestamp($path)
+	{
+	}
+
+	/**
+	 * Get the upload token.
+	 *
+	 * @param string|null $key
+	 * @param int         $ttl
+	 * @param string|null $policy
+	 * @param string|null $strictPolice
+	 *
+	 * @return string
+	 */
+	public function getUploadToken($option = null)
+	{
+		if ($option === null) {
+			$option = ['name' => null, 'ttl' => 3600, ];
+		} else if (!isset($option['ttl']) || !$option['ttl']) {
+			$option['ttl'] = 3600;
+		}
+
+		return $this->client->getUploadToken(collect([
+			'expiration' => Carbon::now()->addSeconds($option['ttl'])->timestamp * 1000,
+			'insertOnly' => Conf::INSERT_ONLY_TRUE
+		])->merge(collect($option)->except(['ttl',])));
+	}
+
+	/**
+	 * @param array $stats
+	 *
+	 * @return array
+	 */
+	protected function normalizeFileInfo(array $stats)
+	{
+		return [
+			'type' => 'file',
+			'path' => $stats['key'],
+			'timestamp' => floor($stats['putTime'] / 10000000),
+			'size' => $stats['fsize'],
+		];
+	}
+
+	/**
+	 * Get resource url.
+	 *
+	 * @param string $path
+	 *
+	 * @return string
+	 */
+	public function getUrl($path)
+	{
+		return $this->normalizeHost($this->domain) . ltrim($path, '/');
+	}
+
+	/**
+	 * @param string $domain
+	 *
+	 * @return string
+	 */
+	protected function normalizeHost($domain)
+	{
+		if (0 !== stripos($domain, 'https://') && 0 !== stripos($domain, 'http://')) {
+			$domain = "http://{$domain}";
+		}
+		return rtrim($domain, '/') . '/';
+	}
 }

sdk/Utils/MediaEncodeOption.php

Spacing +11 added lines, -11 removed lines

@@ -6,15 +6,15 @@ 
 class MediaEncodeOption extends MediaResOption

 {

 	/* 以下属性是"视频转码"方法必须的属性 */

-	private $encodeTemplate;          //模板名称。可以设置系统或者用户自定义模板。用户模板名称可以登录后台查看和设置，系统模板见附录系统模板列表

-	public $usePreset = 0;            //是否使用系统模板。默认0。如果为1，则encodeTemplate必须设置系统模板名称

-	public $force = 0;                //是否强制覆盖。默认0，如果为1，当output文件已经存在的时候会强制覆盖，否则不执行转码并结束任务

+	private $encodeTemplate; //模板名称。可以设置系统或者用户自定义模板。用户模板名称可以登录后台查看和设置，系统模板见附录系统模板列表

+	public $usePreset = 0; //是否使用系统模板。默认0。如果为1，则encodeTemplate必须设置系统模板名称

+	public $force = 0; //是否强制覆盖。默认0，如果为1，当output文件已经存在的时候会强制覆盖，否则不执行转码并结束任务

 	/* 以下属性是"视频转码"方法可选的属性 */

-	private $watermark;               //水印资源

-	private $watermarkTemplate;       //用户自定义水印模板

-	private $notifyUrl;               //通知url，任务结束之后会调用这个url

-	private $seek;                    //截取音视频的开始位置

-	private $duration;                //截取音视频的长度

+	private $watermark; //水印资源

+	private $watermarkTemplate; //用户自定义水印模板

+	private $notifyUrl; //通知url，任务结束之后会调用这个url

+	private $seek; //截取音视频的开始位置

+	private $duration; //截取音视频的长度

 

 	/**设置转码模板。必须。模板在顽兔控制台"多媒体处理"中配置*/

 	public function setEncodeTemplate($encodeTemplate)

@@ -50,7 +50,7 @@ 
 		if (isset($this->notifyUrl))

 			$httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);

 		if (isset($this->seek))

-			$httpBody .= '&seek=' .  $this->seek;

+			$httpBody .= '&seek=' . $this->seek;

 		if (isset($this->duration))

 			$httpBody .= '&duration=' . $this->duration;

 		return array(true, "valid", $httpBody); //视频转码参数合法，返回http请求体

@@ -127,8 +127,8 @@ 
 /**多媒体操作的输入输出资源信息。视频截图和视频转码都继承该类*/

 abstract class MediaResOption

 {

-	private $input;                  //输入的资源

-	private $output;                 //输出的资源

+	private $input; //输入的资源

+	private $output; //输出的资源

 	/**设置输入的文件。*/

 	public function setInputResource($namespace = null, $dir = null, $name = null)

 	{

Braces +46 added lines, -28 removed lines

@@ -25,12 +25,17 @@ 
 	public function checkOptionParameters()

 	{

 		list($valid, $msg) = parent::checkOptionParameters(); //检测输入输出资源是否合法

-		if (!$valid)

-			return array($valid, $msg, null);

-		if (empty($this->encodeTemplate))

-			return array(false, "encodeTemplate is empty.", null); // 判断是否设置输入输出文件，或者转码模板

-		if (($this->usePreset != 0 && $this->usePreset != 1) || ($this->force != 0 && $this->force != 1))

-			return array(false, "parameters 'usePreset' or 'force' is invalid.", null); // 判断usePreset和force参数是否为0或1

+		if (!$valid) {

+					return array($valid, $msg, null);

+		}

+		if (empty($this->encodeTemplate)) {

+					return array(false, "encodeTemplate is empty.", null);

+		}

+		// 判断是否设置输入输出文件，或者转码模板

+		if (($this->usePreset != 0 && $this->usePreset != 1) || ($this->force != 0 && $this->force != 1)) {

+					return array(false, "parameters 'usePreset' or 'force' is invalid.", null);

+		}

+		// 判断usePreset和force参数是否为0或1

 		return $this->getOptionsHttpBody(); //返回http请求体

 	}

 	/**构建多媒体转码所需的http请求体*/

@@ -43,16 +48,21 @@ 
 		$httpBody .= '&usePreset=' . $this->usePreset;

 		$httpBody .= '&force=' . $this->force;

 		// 可选的参数

-		if (isset($this->watermark))

-			$httpBody .= '&watermark=' . $this->watermark->buildResourceId();

-		if (isset($this->watermarkTemplate))

-			$httpBody .= '&watermarkTemplate=' . urlencode($this->watermarkTemplate);

-		if (isset($this->notifyUrl))

-			$httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);

-		if (isset($this->seek))

-			$httpBody .= '&seek=' .  $this->seek;

-		if (isset($this->duration))

-			$httpBody .= '&duration=' . $this->duration;

+		if (isset($this->watermark)) {

+					$httpBody .= '&watermark=' . $this->watermark->buildResourceId();

+		}

+		if (isset($this->watermarkTemplate)) {

+					$httpBody .= '&watermarkTemplate=' . urlencode($this->watermarkTemplate);

+		}

+		if (isset($this->notifyUrl)) {

+					$httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);

+		}

+		if (isset($this->seek)) {

+					$httpBody .= '&seek=' .  $this->seek;

+		}

+		if (isset($this->duration)) {

+					$httpBody .= '&duration=' . $this->duration;

+		}

 		return array(true, "valid", $httpBody); //视频转码参数合法，返回http请求体

 	}

 	/*######################以下是可选的参数set方法#######################*/

@@ -93,10 +103,13 @@ 
 	public function checkOptionParameters()

 	{

 		list($valid, $msg) = parent::checkOptionParameters(); //检测输入输出资源是否合法

-		if (!$valid)

-			return array($valid, $msg, null);

-		if (empty($this->time) || !is_int($this->time) || $this->time < 0)

-			return array(false, "time is empty or invalid.", null); // 是否设置时间，且时间是否合法

+		if (!$valid) {

+					return array($valid, $msg, null);

+		}

+		if (empty($this->time) || !is_int($this->time) || $this->time < 0) {

+					return array(false, "time is empty or invalid.", null);

+		}

+		// 是否设置时间，且时间是否合法

 		return $this->getOptionsHttpBody(); //返回http请求体

 	}

 

@@ -108,8 +121,9 @@ 
 		$httpBody .= '&output=' . $this->getOutputResId();

 		$httpBody .= '&time=' . $this->time;

 		// 可选的参数

-		if (isset($this->notifyUrl))

-			$httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);

+		if (isset($this->notifyUrl)) {

+					$httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);

+		}

 		return array(true, "valid", $httpBody); //视频转码参数合法，返回http请求体

 	}

 

@@ -142,14 +156,18 @@ 
 	/**检测参数选项是否合法*/

 	public function checkOptionParameters()

 	{

-		if (empty($this->input) || empty($this->output))

-			return array(false, "input or output resources is empty."); // 判断是否设置输入输出文件，或者转码模板

+		if (empty($this->input) || empty($this->output)) {

+					return array(false, "input or output resources is empty.");

+		}

+		// 判断是否设置输入输出文件，或者转码模板

 		list($valid, $msg) = $this->input->checkResourceInfo(true, true); //检测输入的资源信息是否合法

-		if (!$valid)

-			return array($valid, $msg);

+		if (!$valid) {

+					return array($valid, $msg);

+		}

 		list($valid, $msg) = $this->output->checkResourceInfo(true, true); //检测输入的资源信息是否合法

-		if (!$valid)

-			return array($valid, $msg);

+		if (!$valid) {

+					return array($valid, $msg);

+		}

 		return array(true, null);

 	}

 	public function getInputResId()