xiaohuilam / laravel-flysystem-wantu

sdk/Core/ManageClient.php

Braces +24 added lines, -16 removed lines

@@ -137,10 +137,12 @@ 
 	 */

 	public function existsFolder($namespace, $dir)

 	{

-		if (empty($namespace) || empty($dir))

-			return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");

-		if (strpos($dir, '/') !== 0)

-			$dir = '/' . $dir;

+		if (empty($namespace) || empty($dir)) {

+					return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");

+		}

+		if (strpos($dir, '/') !== 0) {

+					$dir = '/' . $dir;

+		}

 		$resourceInfo = new ResourceInfo($namespace, $dir);

 		$resourceId = $resourceInfo->buildResourceId(); //得到资源ID

 		$uri = '/' . Conf::MANAGE_API_VERSION . '/folders/' . $resourceId . '/exist';

@@ -155,10 +157,12 @@ 
 	 */

 	public function createDir($namespace, $dir)

 	{

-		if (empty($namespace) || empty($dir))

-			return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");

-		if (strpos($dir, '/') !== 0)

-			$dir = '/' . $dir;

+		if (empty($namespace) || empty($dir)) {

+					return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");

+		}

+		if (strpos($dir, '/') !== 0) {

+					$dir = '/' . $dir;

+		}

 		$resourceInfo = new ResourceInfo($namespace, $dir);

 		$resourceId = $resourceInfo->buildResourceId(); //得到资源ID

 		$uri = '/' . Conf::MANAGE_API_VERSION . '/folders/' . $resourceId;

@@ -197,10 +201,12 @@ 
 	 */

 	public function deleteDir($namespace, $dir)

 	{

-		if (empty($namespace) || empty($dir))

-			return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");

-		if (strpos($dir, '/') !== 0)

-			$dir = '/' . $dir;

+		if (empty($namespace) || empty($dir)) {

+					return $this->_errorResponse("InvalidArgument", "namespace or dir is empty");

+		}

+		if (strpos($dir, '/') !== 0) {

+					$dir = '/' . $dir;

+		}

 		$resourceInfo = new ResourceInfo($namespace, $dir);

 		$resourceId = $resourceInfo->buildResourceId(); //得到资源ID

 		$uri = '/' . Conf::MANAGE_API_VERSION . '/folders/' . $resourceId;

@@ -260,8 +266,9 @@ 
 	 */

 	public function mediaEncodeQuery($taskId)

 	{

-		if (empty($taskId))

-			return $this->_errorResponse("InvalidArgument", "taskId is empty");

+		if (empty($taskId)) {

+					return $this->_errorResponse("InvalidArgument", "taskId is empty");

+		}

 		$uri = '/' . Conf::MEDIA_ENCODE_VERSION . '/mediaEncodeResult/' . $taskId;

 		return $this->_send_request('GET', $uri);

 	}

@@ -287,8 +294,9 @@ 
 	 */

 	public function vSnapshotQuery($taskId)

 	{

-		if (empty($taskId))

-			return $this->_errorResponse("InvalidArgument", "taskId is empty");

+		if (empty($taskId)) {

+					return $this->_errorResponse("InvalidArgument", "taskId is empty");

+		}

 		$uri = '/' . Conf::MANAGE_API_VERSION . '/snapshotResult/' . $taskId;

 		return $this->_send_request('GET', $uri);

 	}

sdk/Utils/MediaEncodeOption.php

Braces +46 added lines, -28 removed lines

@@ -21,12 +21,17 @@ 
 	/**检测多媒体转码选项是否合法。如果合法，则返回http请求体<p> 返回格式{$isValid, $message, $httpBody}*/

 	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请求体*/

@@ -38,16 +43,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方法#######################*/

@@ -81,10 +91,13 @@ 
 	/**检测视频截图参数是否合法。如果合法，则返回http请求体<p> 返回格式{$isValid, $message, $httpBody}*/

 	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请求体

 	}

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

@@ -94,8 +107,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请求体

 	}

 

@@ -122,14 +136,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() {

sdk/Utils/UploadOption.php

Braces +6 added lines, -4 removed lines

@@ -60,10 +60,12 @@
 	private function getParas_Common_BlockInit()

 	{

 		$paraArray = array();

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

-			$paraArray['dir'] = $this->dir;

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

-			$paraArray['name'] = $this->name;

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

+					$paraArray['dir'] = $this->dir;

+		}

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

+					$paraArray['name'] = $this->name;

+		}

 		$paraArray['md5'] = md5($this->content); // 计算文件md5

 		$paraArray['size'] = strlen($this->content); // 计算文件大小

 		$paraArray['content'] = $this->content;

sdk/Utils/ResourceInfo.php

Braces +25 added lines, -14 removed lines

@@ -22,10 +22,14 @@ 
 	 * 返回格式{$isValid, $message}*/

 	public function checkResourceInfo($dirState = false, $nameState = false)

 	{

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

-			return array(false, "namespace is empty.[{$this->toString()}]"); // 判断是否设置空间名

-		else

-			return $this->checkFileInfo($dirState, $nameState); // 判断dir和name的合法性

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

+					return array(false, "namespace is empty.[{$this->toString()}]");

+		}

+		// 判断是否设置空间名

+		else {

+					return $this->checkFileInfo($dirState, $nameState);

+		}

+		// 判断dir和name的合法性

 	}

 	/**检测文件信息是否合法。$dirState表示是否检测dir，$nameState表示是否检测filename<p>

 	 * 返回格式{$isValid, $message}*/

@@ -35,10 +39,14 @@ 
 			return array(false, "file's name is empty.[{$this->toString()}]"); // 1：若需要进行文件名name检测，则判断文件名是否为空

 		}

 		if ($dirState) {

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

-				$this->dir = '/'; // 2：判断路径是否为空，若为空，则默认为根目录'/'

-			else if (strpos($this->dir, '/') !== 0)

-				$this->dir = '/' . $this->dir; // 3：判断路径是否以'/'开头，若不是，则添加'/'

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

+							$this->dir = '/';

+			}

+			// 2：判断路径是否为空，若为空，则默认为根目录'/'

+			else if (strpos($this->dir, '/') !== 0) {

+							$this->dir = '/' . $this->dir;

+			}

+			// 3：判断路径是否以'/'开头，若不是，则添加'/'

 		}

 		return array(true, null);

 	}

@@ -46,12 +54,15 @@ 
 	public function buildResourceId()

 	{

 		$jsonData = array();

-		if (!empty($this->namespace))

-			array_push($jsonData, urldecode($this->namespace));

-		if (!empty($this->dir))

-			array_push($jsonData, urldecode($this->dir));

-		if (!empty($this->name))

-			array_push($jsonData, urldecode($this->name));

+		if (!empty($this->namespace)) {

+					array_push($jsonData, urldecode($this->namespace));

+		}

+		if (!empty($this->dir)) {

+					array_push($jsonData, urldecode($this->dir));

+		}

+		if (!empty($this->name)) {

+					array_push($jsonData, urldecode($this->name));

+		}

 		return EncodeUtils::encodeWithURLSafeBase64(json_encode($jsonData, true));

 	}

 	/**对URL中文进行编码*/