xiaohuilam / laravel-flysystem-wantu

sdk/Utils/ResourceInfo.php

Indentation +87 added lines, -87 removed lines

@@ -4,93 +4,93 @@
 /**文件资源类*/
 class ResourceInfo
 {
-    /* 以下属性是资源ID所需的属性*/
-    protected $namespace;                              //空间名，必须
-    protected $dir;                                    //路径
-    protected $name;                                   //文件名信息
-    /* 以下属性是资源ID所需的属性*/
-    /**
-     * ResourceOption的构造函数
-     */
-    public function __construct($namespace, $dir = null, $name = null)
-    {
-        $this->namespace = $namespace;
-        $this->dir = $dir;
-        $this->name = $name;
-    }
-    /**检测资源ID的是否合法。$dirState表示是否检测dir，$nameState表示是否检测filename<p>
+	/* 以下属性是资源ID所需的属性*/
+	protected $namespace;                              //空间名，必须
+	protected $dir;                                    //路径
+	protected $name;                                   //文件名信息
+	/* 以下属性是资源ID所需的属性*/
+	/**
+	 * ResourceOption的构造函数
+	 */
+	public function __construct($namespace, $dir = null, $name = null)
+	{
+		$this->namespace = $namespace;
+		$this->dir = $dir;
+		$this->name = $name;
+	}
+	/**检测资源ID的是否合法。$dirState表示是否检测dir，$nameState表示是否检测filename<p>
      * 返回格式{$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的合法性
-        }
-    }
-    /**检测文件信息是否合法。$dirState表示是否检测dir，$nameState表示是否检测filename<p>
+	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的合法性
+		}
+	}
+	/**检测文件信息是否合法。$dirState表示是否检测dir，$nameState表示是否检测filename<p>
      * 返回格式{$isValid, $message}*/
-    public function checkFileInfo($dirState = false, $nameState = false)
-    {
-        if ($nameState && empty($this->name)) {
-            return array(false, "file's name is empty.[{$this->toString()}]"); // 1：若需要进行文件名name检测，则判断文件名是否为空
-        }
-        if ($dirState) {
-            if (empty($this->dir)) {
-                $this->dir = '/'; // 2：判断路径是否为空，若为空，则默认为根目录'/'
-            } elseif (strpos($this->dir, '/') !== 0) {
-                $this->dir = '/' . $this->dir; // 3：判断路径是否以'/'开头，若不是，则添加'/'
-            }
-        }
-        return array(true, null);
-    }
-    /**资源ID(resourceId)的生成*/
-    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));
-        }
-        return EncodeUtils::encodeWithURLSafeBase64(json_encode($jsonData, true));
-    }
-    /**对URL中文进行编码*/
-    protected function urlencodeCh($str)
-    {
-        return preg_replace_callback('/[^\0-\127]+/', function ($match) {
-            return urlencode($match[0]);
-        }, $str);
-    }
-    public function toString()
-    {
-        return "namespace={$this->namespace}, dir={$this->dir}, name={$this->name}";
-    }
-    public function toArray()
-    {
-        return array("namespace" => $this->namespace, "dir" => $this->dir, "name" => $this->name);
-    }
-    /*###################下面是属性的get和set方法###############*/
-    /**设置路径*/
-    public function setNamespace($namespace)
-    {
-        $this->namespace = $namespace;
-        return $this;
-    }
-    /**设置路径*/
-    public function setDir($dir)
-    {
-        $this->dir = $dir;
-        return $this;
-    }
-    /**设置文件名*/
-    public function setName($filename)
-    {
-        $this->name = $filename;
-        return $this;
-    }
+	public function checkFileInfo($dirState = false, $nameState = false)
+	{
+		if ($nameState && empty($this->name)) {
+			return array(false, "file's name is empty.[{$this->toString()}]"); // 1：若需要进行文件名name检测，则判断文件名是否为空
+		}
+		if ($dirState) {
+			if (empty($this->dir)) {
+				$this->dir = '/'; // 2：判断路径是否为空，若为空，则默认为根目录'/'
+			} elseif (strpos($this->dir, '/') !== 0) {
+				$this->dir = '/' . $this->dir; // 3：判断路径是否以'/'开头，若不是，则添加'/'
+			}
+		}
+		return array(true, null);
+	}
+	/**资源ID(resourceId)的生成*/
+	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));
+		}
+		return EncodeUtils::encodeWithURLSafeBase64(json_encode($jsonData, true));
+	}
+	/**对URL中文进行编码*/
+	protected function urlencodeCh($str)
+	{
+		return preg_replace_callback('/[^\0-\127]+/', function ($match) {
+			return urlencode($match[0]);
+		}, $str);
+	}
+	public function toString()
+	{
+		return "namespace={$this->namespace}, dir={$this->dir}, name={$this->name}";
+	}
+	public function toArray()
+	{
+		return array("namespace" => $this->namespace, "dir" => $this->dir, "name" => $this->name);
+	}
+	/*###################下面是属性的get和set方法###############*/
+	/**设置路径*/
+	public function setNamespace($namespace)
+	{
+		$this->namespace = $namespace;
+		return $this;
+	}
+	/**设置路径*/
+	public function setDir($dir)
+	{
+		$this->dir = $dir;
+		return $this;
+	}
+	/**设置文件名*/
+	public function setName($filename)
+	{
+		$this->name = $filename;
+		return $this;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -5,9 +5,9 @@ 
 class ResourceInfo
 {
     /* 以下属性是资源ID所需的属性*/
-    protected $namespace;                              //空间名，必须
-    protected $dir;                                    //路径
-    protected $name;                                   //文件名信息
+    protected $namespace; //空间名，必须
+    protected $dir; //路径
+    protected $name; //文件名信息
     /* 以下属性是资源ID所需的属性*/
     /**
      * ResourceOption的构造函数
@@ -62,7 +62,7 @@ 
     /**对URL中文进行编码*/
     protected function urlencodeCh($str)
     {
-        return preg_replace_callback('/[^\0-\127]+/', function ($match) {
+        return preg_replace_callback('/[^\0-\127]+/', function($match) {
             return urlencode($match[0]);
         }, $str);
     }

sdk/Utils/SnapShotOption.php

Indentation +39 added lines, -39 removed lines

@@ -5,45 +5,45 @@
 /**视频截图的参数*/
 class SnapShotOption extends MediaResOption
 {
-    /** 视频截图的位置，单位为毫秒。该属性必须*/
-    private $time;
-    /** 通知url，任务结束之后会调用这个url。该属性可选 */
-    private $notifyUrl;
-    /**检测视频截图参数是否合法。如果合法，则返回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); // 是否设置时间，且时间是否合法
-        }
-        return $this->getOptionsHttpBody(); //返回http请求体
-    }
+	/** 视频截图的位置，单位为毫秒。该属性必须*/
+	private $time;
+	/** 通知url，任务结束之后会调用这个url。该属性可选 */
+	private $notifyUrl;
+	/**检测视频截图参数是否合法。如果合法，则返回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); // 是否设置时间，且时间是否合法
+		}
+		return $this->getOptionsHttpBody(); //返回http请求体
+	}
 
-    /**构建多媒体转码所需的http请求体*/
-    public function getOptionsHttpBody()
-    {
-        //必须的参数
-        $httpBody = 'input=' . $this->getInputResId();
-        $httpBody .= '&output=' . $this->getOutputResId();
-        $httpBody .= '&time=' . $this->time;
-        // 可选的参数
-        if (isset($this->notifyUrl)) {
-            $httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);
-        }
-        return array(true, "valid", $httpBody); //视频转码参数合法，返回http请求体
-    }
+	/**构建多媒体转码所需的http请求体*/
+	public function getOptionsHttpBody()
+	{
+		//必须的参数
+		$httpBody = 'input=' . $this->getInputResId();
+		$httpBody .= '&output=' . $this->getOutputResId();
+		$httpBody .= '&time=' . $this->time;
+		// 可选的参数
+		if (isset($this->notifyUrl)) {
+			$httpBody .= '&notifyUrl=' . urlencode($this->notifyUrl);
+		}
+		return array(true, "valid", $httpBody); //视频转码参数合法，返回http请求体
+	}
 
-    /**设置视频截图的位置，单位为毫秒。改参数必须设置*/
-    public function setTime($time)
-    {
-        $this->time = $time;
-    }
-    /**设置截图完成后的通知url。可选*/
-    public function setNotifyUrl($notifyUrl)
-    {
-        $this->notifyUrl = $notifyUrl;
-    }
+	/**设置视频截图的位置，单位为毫秒。改参数必须设置*/
+	public function setTime($time)
+	{
+		$this->time = $time;
+	}
+	/**设置截图完成后的通知url。可选*/
+	public function setNotifyUrl($notifyUrl)
+	{
+		$this->notifyUrl = $notifyUrl;
+	}
 }

sdk/Utils/MimeTypes.php

Indentation +133 added lines, -133 removed lines

@@ -3,138 +3,138 @@
 
 class MimeTypes
 {
-    public static $mime_types = array(
-        '3gp' => 'video/3gpp', 'ai' => 'application/postscript',
-        'aif' => 'audio/x-aiff', 'aifc' => 'audio/x-aiff',
-        'aiff' => 'audio/x-aiff', 'asc' => 'text/plain',
-        'atom' => 'application/atom+xml', 'au' => 'audio/basic',
-        'avi' => 'video/x-msvideo', 'bcpio' => 'application/x-bcpio',
-        'bin' => 'application/octet-stream', 'bmp' => 'image/bmp',
-        'cdf' => 'application/x-netcdf', 'cgm' => 'image/cgm',
-        'class' => 'application/octet-stream',
-        'cpio' => 'application/x-cpio',
-        'cpt' => 'application/mac-compactpro',
-        'csh' => 'application/x-csh', 'css' => 'text/css',
-        'dcr' => 'application/x-director', 'dif' => 'video/x-dv',
-        'dir' => 'application/x-director', 'djv' => 'image/vnd.djvu',
-        'djvu' => 'image/vnd.djvu',
-        'dll' => 'application/octet-stream',
-        'dmg' => 'application/octet-stream',
-        'dms' => 'application/octet-stream',
-        'doc' => 'application/msword', 'dtd' => 'application/xml-dtd',
-        'dv' => 'video/x-dv', 'dvi' => 'application/x-dvi',
-        'dxr' => 'application/x-director',
-        'eps' => 'application/postscript', 'etx' => 'text/x-setext',
-        'exe' => 'application/octet-stream',
-        'ez' => 'application/andrew-inset', 'flv' => 'video/x-flv',
-        'gif' => 'image/gif', 'gram' => 'application/srgs',
-        'grxml' => 'application/srgs+xml',
-        'gtar' => 'application/x-gtar', 'gz' => 'application/x-gzip',
-        'hdf' => 'application/x-hdf',
-        'hqx' => 'application/mac-binhex40', 'htm' => 'text/html',
-        'html' => 'text/html', 'ice' => 'x-conference/x-cooltalk',
-        'ico' => 'image/x-icon', 'ics' => 'text/calendar',
-        'ief' => 'image/ief', 'ifb' => 'text/calendar',
-        'iges' => 'model/iges', 'igs' => 'model/iges',
-        'jnlp' => 'application/x-java-jnlp-file', 'jp2' => 'image/jp2',
-        'jpe' => 'image/jpeg', 'jpeg' => 'image/jpeg',
-        'jpg' => 'image/jpeg', 'js' => 'application/x-javascript',
-        'kar' => 'audio/midi', 'latex' => 'application/x-latex',
-        'lha' => 'application/octet-stream',
-        'lzh' => 'application/octet-stream',
-        'm3u' => 'audio/x-mpegurl', 'm4a' => 'audio/mp4a-latm',
-        'm4p' => 'audio/mp4a-latm', 'm4u' => 'video/vnd.mpegurl',
-        'm4v' => 'video/x-m4v', 'mac' => 'image/x-macpaint',
-        'man' => 'application/x-troff-man',
-        'mathml' => 'application/mathml+xml',
-        'me' => 'application/x-troff-me', 'mesh' => 'model/mesh',
-        'mid' => 'audio/midi', 'midi' => 'audio/midi',
-        'mif' => 'application/vnd.mif', 'mov' => 'video/quicktime',
-        'movie' => 'video/x-sgi-movie', 'mp2' => 'audio/mpeg',
-        'mp3' => 'audio/mpeg', 'mp4' => 'video/mp4',
-        'mpe' => 'video/mpeg', 'mpeg' => 'video/mpeg',
-        'mpg' => 'video/mpeg', 'mpga' => 'audio/mpeg',
-        'ms' => 'application/x-troff-ms', 'msh' => 'model/mesh',
-        'mxu' => 'video/vnd.mpegurl', 'nc' => 'application/x-netcdf',
-        'oda' => 'application/oda', 'ogg' => 'application/ogg',
-        'ogv' => 'video/ogv', 'pbm' => 'image/x-portable-bitmap',
-        'pct' => 'image/pict', 'pdb' => 'chemical/x-pdb',
-        'pdf' => 'application/pdf',
-        'pgm' => 'image/x-portable-graymap',
-        'pgn' => 'application/x-chess-pgn', 'pic' => 'image/pict',
-        'pict' => 'image/pict', 'png' => 'image/png',
-        'pnm' => 'image/x-portable-anymap',
-        'pnt' => 'image/x-macpaint', 'pntg' => 'image/x-macpaint',
-        'ppm' => 'image/x-portable-pixmap',
-        'ppt' => 'application/vnd.ms-powerpoint',
-        'ps' => 'application/postscript', 'qt' => 'video/quicktime',
-        'qti' => 'image/x-quicktime', 'qtif' => 'image/x-quicktime',
-        'ra' => 'audio/x-pn-realaudio',
-        'ram' => 'audio/x-pn-realaudio', 'ras' => 'image/x-cmu-raster',
-        'rdf' => 'application/rdf+xml', 'rgb' => 'image/x-rgb',
-        'rm' => 'application/vnd.rn-realmedia',
-        'roff' => 'application/x-troff', 'rtf' => 'text/rtf',
-        'rtx' => 'text/richtext', 'sgm' => 'text/sgml',
-        'sgml' => 'text/sgml', 'sh' => 'application/x-sh',
-        'shar' => 'application/x-shar', 'silo' => 'model/mesh',
-        'sit' => 'application/x-stuffit',
-        'skd' => 'application/x-koan', 'skm' => 'application/x-koan',
-        'skp' => 'application/x-koan', 'skt' => 'application/x-koan',
-        'smi' => 'application/smil', 'smil' => 'application/smil',
-        'snd' => 'audio/basic', 'so' => 'application/octet-stream',
-        'spl' => 'application/x-futuresplash',
-        'src' => 'application/x-wais-source',
-        'sv4cpio' => 'application/x-sv4cpio',
-        'sv4crc' => 'application/x-sv4crc', 'svg' => 'image/svg+xml',
-        'swf' => 'application/x-shockwave-flash',
-        't' => 'application/x-troff', 'tar' => 'application/x-tar',
-        'tcl' => 'application/x-tcl', 'tex' => 'application/x-tex',
-        'texi' => 'application/x-texinfo',
-        'texinfo' => 'application/x-texinfo', 'tif' => 'image/tiff',
-        'tiff' => 'image/tiff', 'tr' => 'application/x-troff',
-        'tsv' => 'text/tab-separated-values', 'txt' => 'text/plain',
-        'ustar' => 'application/x-ustar',
-        'vcd' => 'application/x-cdlink', 'vrml' => 'model/vrml',
-        'vxml' => 'application/voicexml+xml', 'wav' => 'audio/x-wav',
-        'wbmp' => 'image/vnd.wap.wbmp',
-        'wbxml' => 'application/vnd.wap.wbxml', 'webm' => 'video/webm',
-        'wml' => 'text/vnd.wap.wml',
-        'wmlc' => 'application/vnd.wap.wmlc',
-        'wmls' => 'text/vnd.wap.wmlscript',
-        'wmlsc' => 'application/vnd.wap.wmlscriptc',
-        'wmv' => 'video/x-ms-wmv', 'wrl' => 'model/vrml',
-        'xbm' => 'image/x-xbitmap', 'xht' => 'application/xhtml+xml',
-        'xhtml' => 'application/xhtml+xml',
-        'xls' => 'application/vnd.ms-excel',
-        'xml' => 'application/xml', 'xpm' => 'image/x-xpixmap',
-        'xsl' => 'application/xml', 'xslt' => 'application/xslt+xml',
-        'xul' => 'application/vnd.mozilla.xul+xml',
-        'xwd' => 'image/x-xwindowdump', 'xyz' => 'chemical/x-xyz',
-        'zip' => 'application/zip',
-        "apk" => "application/vnd.android.package-archive",
-        "bin" => "application/octet-stream",
-        "cab" => "application/vnd.ms-cab-compressed",
-        "gb" => "application/chinese-gb",
-        "gba" => "application/octet-stream",
-        "gbc" => "application/octet-stream",
-        "jad" => "text/vnd.sun.j2me.app-descriptor",
-        "jar" => "application/java-archive",
-        "nes" => "application/octet-stream",
-        "rar" => "application/x-rar-compressed",
-        "sis" => "application/vnd.symbian.install",
-        "sisx" => "x-epoc/x-sisx-app",
-        "smc" => "application/octet-stream",
-        "smd" => "application/octet-stream",
-        "swf" => "application/x-shockwave-flash",
-        "zip" => "application/x-zip-compressed",
-        "wap" => "text/vnd.wap.wml wml", "mrp" => "application/mrp",
-        "wma" => "audio/x-ms-wma",
-        "lrc" => "application/lrc"
-    );
+	public static $mime_types = array(
+		'3gp' => 'video/3gpp', 'ai' => 'application/postscript',
+		'aif' => 'audio/x-aiff', 'aifc' => 'audio/x-aiff',
+		'aiff' => 'audio/x-aiff', 'asc' => 'text/plain',
+		'atom' => 'application/atom+xml', 'au' => 'audio/basic',
+		'avi' => 'video/x-msvideo', 'bcpio' => 'application/x-bcpio',
+		'bin' => 'application/octet-stream', 'bmp' => 'image/bmp',
+		'cdf' => 'application/x-netcdf', 'cgm' => 'image/cgm',
+		'class' => 'application/octet-stream',
+		'cpio' => 'application/x-cpio',
+		'cpt' => 'application/mac-compactpro',
+		'csh' => 'application/x-csh', 'css' => 'text/css',
+		'dcr' => 'application/x-director', 'dif' => 'video/x-dv',
+		'dir' => 'application/x-director', 'djv' => 'image/vnd.djvu',
+		'djvu' => 'image/vnd.djvu',
+		'dll' => 'application/octet-stream',
+		'dmg' => 'application/octet-stream',
+		'dms' => 'application/octet-stream',
+		'doc' => 'application/msword', 'dtd' => 'application/xml-dtd',
+		'dv' => 'video/x-dv', 'dvi' => 'application/x-dvi',
+		'dxr' => 'application/x-director',
+		'eps' => 'application/postscript', 'etx' => 'text/x-setext',
+		'exe' => 'application/octet-stream',
+		'ez' => 'application/andrew-inset', 'flv' => 'video/x-flv',
+		'gif' => 'image/gif', 'gram' => 'application/srgs',
+		'grxml' => 'application/srgs+xml',
+		'gtar' => 'application/x-gtar', 'gz' => 'application/x-gzip',
+		'hdf' => 'application/x-hdf',
+		'hqx' => 'application/mac-binhex40', 'htm' => 'text/html',
+		'html' => 'text/html', 'ice' => 'x-conference/x-cooltalk',
+		'ico' => 'image/x-icon', 'ics' => 'text/calendar',
+		'ief' => 'image/ief', 'ifb' => 'text/calendar',
+		'iges' => 'model/iges', 'igs' => 'model/iges',
+		'jnlp' => 'application/x-java-jnlp-file', 'jp2' => 'image/jp2',
+		'jpe' => 'image/jpeg', 'jpeg' => 'image/jpeg',
+		'jpg' => 'image/jpeg', 'js' => 'application/x-javascript',
+		'kar' => 'audio/midi', 'latex' => 'application/x-latex',
+		'lha' => 'application/octet-stream',
+		'lzh' => 'application/octet-stream',
+		'm3u' => 'audio/x-mpegurl', 'm4a' => 'audio/mp4a-latm',
+		'm4p' => 'audio/mp4a-latm', 'm4u' => 'video/vnd.mpegurl',
+		'm4v' => 'video/x-m4v', 'mac' => 'image/x-macpaint',
+		'man' => 'application/x-troff-man',
+		'mathml' => 'application/mathml+xml',
+		'me' => 'application/x-troff-me', 'mesh' => 'model/mesh',
+		'mid' => 'audio/midi', 'midi' => 'audio/midi',
+		'mif' => 'application/vnd.mif', 'mov' => 'video/quicktime',
+		'movie' => 'video/x-sgi-movie', 'mp2' => 'audio/mpeg',
+		'mp3' => 'audio/mpeg', 'mp4' => 'video/mp4',
+		'mpe' => 'video/mpeg', 'mpeg' => 'video/mpeg',
+		'mpg' => 'video/mpeg', 'mpga' => 'audio/mpeg',
+		'ms' => 'application/x-troff-ms', 'msh' => 'model/mesh',
+		'mxu' => 'video/vnd.mpegurl', 'nc' => 'application/x-netcdf',
+		'oda' => 'application/oda', 'ogg' => 'application/ogg',
+		'ogv' => 'video/ogv', 'pbm' => 'image/x-portable-bitmap',
+		'pct' => 'image/pict', 'pdb' => 'chemical/x-pdb',
+		'pdf' => 'application/pdf',
+		'pgm' => 'image/x-portable-graymap',
+		'pgn' => 'application/x-chess-pgn', 'pic' => 'image/pict',
+		'pict' => 'image/pict', 'png' => 'image/png',
+		'pnm' => 'image/x-portable-anymap',
+		'pnt' => 'image/x-macpaint', 'pntg' => 'image/x-macpaint',
+		'ppm' => 'image/x-portable-pixmap',
+		'ppt' => 'application/vnd.ms-powerpoint',
+		'ps' => 'application/postscript', 'qt' => 'video/quicktime',
+		'qti' => 'image/x-quicktime', 'qtif' => 'image/x-quicktime',
+		'ra' => 'audio/x-pn-realaudio',
+		'ram' => 'audio/x-pn-realaudio', 'ras' => 'image/x-cmu-raster',
+		'rdf' => 'application/rdf+xml', 'rgb' => 'image/x-rgb',
+		'rm' => 'application/vnd.rn-realmedia',
+		'roff' => 'application/x-troff', 'rtf' => 'text/rtf',
+		'rtx' => 'text/richtext', 'sgm' => 'text/sgml',
+		'sgml' => 'text/sgml', 'sh' => 'application/x-sh',
+		'shar' => 'application/x-shar', 'silo' => 'model/mesh',
+		'sit' => 'application/x-stuffit',
+		'skd' => 'application/x-koan', 'skm' => 'application/x-koan',
+		'skp' => 'application/x-koan', 'skt' => 'application/x-koan',
+		'smi' => 'application/smil', 'smil' => 'application/smil',
+		'snd' => 'audio/basic', 'so' => 'application/octet-stream',
+		'spl' => 'application/x-futuresplash',
+		'src' => 'application/x-wais-source',
+		'sv4cpio' => 'application/x-sv4cpio',
+		'sv4crc' => 'application/x-sv4crc', 'svg' => 'image/svg+xml',
+		'swf' => 'application/x-shockwave-flash',
+		't' => 'application/x-troff', 'tar' => 'application/x-tar',
+		'tcl' => 'application/x-tcl', 'tex' => 'application/x-tex',
+		'texi' => 'application/x-texinfo',
+		'texinfo' => 'application/x-texinfo', 'tif' => 'image/tiff',
+		'tiff' => 'image/tiff', 'tr' => 'application/x-troff',
+		'tsv' => 'text/tab-separated-values', 'txt' => 'text/plain',
+		'ustar' => 'application/x-ustar',
+		'vcd' => 'application/x-cdlink', 'vrml' => 'model/vrml',
+		'vxml' => 'application/voicexml+xml', 'wav' => 'audio/x-wav',
+		'wbmp' => 'image/vnd.wap.wbmp',
+		'wbxml' => 'application/vnd.wap.wbxml', 'webm' => 'video/webm',
+		'wml' => 'text/vnd.wap.wml',
+		'wmlc' => 'application/vnd.wap.wmlc',
+		'wmls' => 'text/vnd.wap.wmlscript',
+		'wmlsc' => 'application/vnd.wap.wmlscriptc',
+		'wmv' => 'video/x-ms-wmv', 'wrl' => 'model/vrml',
+		'xbm' => 'image/x-xbitmap', 'xht' => 'application/xhtml+xml',
+		'xhtml' => 'application/xhtml+xml',
+		'xls' => 'application/vnd.ms-excel',
+		'xml' => 'application/xml', 'xpm' => 'image/x-xpixmap',
+		'xsl' => 'application/xml', 'xslt' => 'application/xslt+xml',
+		'xul' => 'application/vnd.mozilla.xul+xml',
+		'xwd' => 'image/x-xwindowdump', 'xyz' => 'chemical/x-xyz',
+		'zip' => 'application/zip',
+		"apk" => "application/vnd.android.package-archive",
+		"bin" => "application/octet-stream",
+		"cab" => "application/vnd.ms-cab-compressed",
+		"gb" => "application/chinese-gb",
+		"gba" => "application/octet-stream",
+		"gbc" => "application/octet-stream",
+		"jad" => "text/vnd.sun.j2me.app-descriptor",
+		"jar" => "application/java-archive",
+		"nes" => "application/octet-stream",
+		"rar" => "application/x-rar-compressed",
+		"sis" => "application/vnd.symbian.install",
+		"sisx" => "x-epoc/x-sisx-app",
+		"smc" => "application/octet-stream",
+		"smd" => "application/octet-stream",
+		"swf" => "application/x-shockwave-flash",
+		"zip" => "application/x-zip-compressed",
+		"wap" => "text/vnd.wap.wml wml", "mrp" => "application/mrp",
+		"wma" => "audio/x-ms-wma",
+		"lrc" => "application/lrc"
+	);
 
-    public static function getMimetype($ext)
-    {
-        $ext = strtolower($ext);
-        return (isset(self::$mime_types[$ext]) ? self::$mime_types[$ext] : 'application/octet-stream');
-    }
+	public static function getMimetype($ext)
+	{
+		$ext = strtolower($ext);
+		return (isset(self::$mime_types[$ext]) ? self::$mime_types[$ext] : 'application/octet-stream');
+	}
 }

sdk/Utils/EncodeUtils.php

Indentation +18 added lines, -18 removed lines

@@ -4,27 +4,27 @@
 class EncodeUtils
 {
 
-    /*
+	/*
      * URL安全的Base64编码适用于以URL方式传递Base64编码结果的场景。
      * 该编码方式的基本过程是先将内容以Base64格式编码为字符串，
      * 然后检查该结果字符串，将字符串中的加号+换成中划线-，并且将斜杠/换成下划线_，同时尾部去除等号padding。
      */
-    public static function encodeWithURLSafeBase64($arg)
-    {
-        if ($arg === null || empty($arg)) {
-            return null;
-        }
-        $result = base64_encode($arg);
-        $result = str_replace(array('+', '/', '='), array('-', '_', ''), $result);
-        return $result;
-    }
+	public static function encodeWithURLSafeBase64($arg)
+	{
+		if ($arg === null || empty($arg)) {
+			return null;
+		}
+		$result = base64_encode($arg);
+		$result = str_replace(array('+', '/', '='), array('-', '_', ''), $result);
+		return $result;
+	}
 
-    public static function newEncodeWithUrlSafeBase64($arg)
-    {
-        if ($arg === null || empty($arg)) {
-            return null;
-        }
-        $result = preg_replace(array("/\r/", "/\n/"), "", rtrim(base64_encode($arg), '='));
-        return $result;
-    }
+	public static function newEncodeWithUrlSafeBase64($arg)
+	{
+		if ($arg === null || empty($arg)) {
+			return null;
+		}
+		$result = preg_replace(array("/\r/", "/\n/"), "", rtrim(base64_encode($arg), '='));
+		return $result;
+	}
 }

sdk/Utils/MediaEncodeOption.php

Indentation +83 added lines, -83 removed lines

@@ -5,88 +5,88 @@
 /**多媒体转码的参数*/
 class MediaEncodeOption extends MediaResOption
 {
-    /* 以下属性是"视频转码"方法必须的属性 */
-    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 $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;                //截取音视频的长度
 
-    /**设置转码模板。必须。模板在顽兔控制台"多媒体处理"中配置*/
-    public function setEncodeTemplate($encodeTemplate)
-    {
-        $this->encodeTemplate = $encodeTemplate;
-    }
-    /**检测多媒体转码选项是否合法。如果合法，则返回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
-        }
-        return $this->getOptionsHttpBody(); //返回http请求体
-    }
-    /**构建多媒体转码所需的http请求体*/
-    public function getOptionsHttpBody()
-    {
-        //必须的参数
-        $httpBody = 'input=' . $this->getInputResId();
-        $httpBody .= '&output=' . $this->getOutputResId();
-        $httpBody .= '&encodeTemplate=' . urlencode($this->encodeTemplate);
-        $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;
-        }
-        return array(true, "valid", $httpBody); //视频转码参数合法，返回http请求体
-    }
-    /*######################以下是可选的参数set方法#######################*/
-    /**设置水印。可选*/
-    public function setWatermark($namespace = null, $dir = null, $name = null)
-    {
-        $this->watermark = new ResourceInfo($namespace, $dir, $name);
-    }
-    /**设置用户自定义水印模板。可选*/
-    public function setWatermarkTemplate($watermarkTemplate)
-    {
-        $this->watermarkTemplate = $watermarkTemplate;
-    }
-    /**设置转码完成后的通知url。可选*/
-    public function setNotifyUrl($notifyUrl)
-    {
-        $this->notifyUrl = $notifyUrl;
-    }
-    /**设置转码起始位置。可选*/
-    public function setSeek($seek)
-    {
-        $this->seek = $seek;
-    }
-    /**设置转码长度。可选*/
-    public function setDuration($duration)
-    {
-        $this->duration = $duration;
-    }
+	/**设置转码模板。必须。模板在顽兔控制台"多媒体处理"中配置*/
+	public function setEncodeTemplate($encodeTemplate)
+	{
+		$this->encodeTemplate = $encodeTemplate;
+	}
+	/**检测多媒体转码选项是否合法。如果合法，则返回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
+		}
+		return $this->getOptionsHttpBody(); //返回http请求体
+	}
+	/**构建多媒体转码所需的http请求体*/
+	public function getOptionsHttpBody()
+	{
+		//必须的参数
+		$httpBody = 'input=' . $this->getInputResId();
+		$httpBody .= '&output=' . $this->getOutputResId();
+		$httpBody .= '&encodeTemplate=' . urlencode($this->encodeTemplate);
+		$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;
+		}
+		return array(true, "valid", $httpBody); //视频转码参数合法，返回http请求体
+	}
+	/*######################以下是可选的参数set方法#######################*/
+	/**设置水印。可选*/
+	public function setWatermark($namespace = null, $dir = null, $name = null)
+	{
+		$this->watermark = new ResourceInfo($namespace, $dir, $name);
+	}
+	/**设置用户自定义水印模板。可选*/
+	public function setWatermarkTemplate($watermarkTemplate)
+	{
+		$this->watermarkTemplate = $watermarkTemplate;
+	}
+	/**设置转码完成后的通知url。可选*/
+	public function setNotifyUrl($notifyUrl)
+	{
+		$this->notifyUrl = $notifyUrl;
+	}
+	/**设置转码起始位置。可选*/
+	public function setSeek($seek)
+	{
+		$this->seek = $seek;
+	}
+	/**设置转码长度。可选*/
+	public function setDuration($duration)
+	{
+		$this->duration = $duration;
+	}
 }

Spacing +9 added lines, -9 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)
@@ -56,7 +56,7 @@ 
             $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;

sdk/Utils/UploadOption.php

Indentation +154 added lines, -154 removed lines

@@ -6,164 +6,164 @@
 
 class UploadOption
 {
-    /*optionType用于标识UploadOption的类型，即：普通上传、初始化分片上传、分片上传、分片上传完成*/
-    public $optionType;
+	/*optionType用于标识UploadOption的类型，即：普通上传、初始化分片上传、分片上传、分片上传完成*/
+	public $optionType;
 
-    /*以下属性是上传时的可选参数。即Rest API中Http请求Body中所需的可选参数*/
-    public $dir;                                    // 顽兔空间的图片路径(如果UploadPolicy中不指定dir属性，则生效)
-    public $name;                                   // 上传到服务端的文件名(如果UploadPolicy中不指定name属性，则生效)
-    public $metaArray;                              // 用户自定义的文件meta信息("meta-"为参数前缀, "*"为用户用于渲染的自定义Meta信息名)
-    public $varArray;                               // 用户自定义的魔法变量("var-"为参数前缀, "*"为用户用于渲染的自定义魔法变量名)
-    private $md5;                                   // 文件md5值(推荐提供此参数进行一致性检查)
-    private $size;                                  // 文件大小
-    private $content;                               // 文件内容(在http请求体Body中必须位于参数的最后一位)
+	/*以下属性是上传时的可选参数。即Rest API中Http请求Body中所需的可选参数*/
+	public $dir;                                    // 顽兔空间的图片路径(如果UploadPolicy中不指定dir属性，则生效)
+	public $name;                                   // 上传到服务端的文件名(如果UploadPolicy中不指定name属性，则生效)
+	public $metaArray;                              // 用户自定义的文件meta信息("meta-"为参数前缀, "*"为用户用于渲染的自定义Meta信息名)
+	public $varArray;                               // 用户自定义的魔法变量("var-"为参数前缀, "*"为用户用于渲染的自定义魔法变量名)
+	private $md5;                                   // 文件md5值(推荐提供此参数进行一致性检查)
+	private $size;                                  // 文件大小
+	private $content;                               // 文件内容(在http请求体Body中必须位于参数的最后一位)
 
-    /*以下属性是用户根据自己应用需求，可选的配置*/
-    public $blockSize;                              // 文件分片的大小。针对分片上传。
-    public $timeout;                                // 进行http连接的超时时间
-    public $httpReTry;                              // http失败自动重试。0 or 1
+	/*以下属性是用户根据自己应用需求，可选的配置*/
+	public $blockSize;                              // 文件分片的大小。针对分片上传。
+	public $timeout;                                // 进行http连接的超时时间
+	public $httpReTry;                              // http失败自动重试。0 or 1
 
-    /*以下属性是用于分片上传时的参数，仅用于分片上传。用户在调用分片上传时可以选择配置。*/
-    private $uploadId;                              // OSS分片上传ID（OSS用于区分上传的id）
-    private $uniqueId;                              // 服务上传唯一ID（多媒体服务用于区分上传的id）
-    private $partNumber;                            // 分片文件块上传成功后返回的文件块编号
-    private $eTag;                                  // 分片文件块上传成功后返回的Tag标签(由md5和其他标记组成)
-    private $array_PartNum_ETag;                    // 分片上传服务端返回的所有 块编号partNumber 和 标记ETag
+	/*以下属性是用于分片上传时的参数，仅用于分片上传。用户在调用分片上传时可以选择配置。*/
+	private $uploadId;                              // OSS分片上传ID（OSS用于区分上传的id）
+	private $uniqueId;                              // 服务上传唯一ID（多媒体服务用于区分上传的id）
+	private $partNumber;                            // 分片文件块上传成功后返回的文件块编号
+	private $eTag;                                  // 分片文件块上传成功后返回的Tag标签(由md5和其他标记组成)
+	private $array_PartNum_ETag;                    // 分片上传服务端返回的所有 块编号partNumber 和 标记ETag
 
-    public function __construct()
-    {
-        $this->optionType = UpOptionType::COMMON_UPLOAD_TYPE; //默认普通上传类型
-        $this->metaArray = array();
-        $this->varArray = array();
-        $this->blockSize = Conf::BLOCK_DEFF_SIZE;   //默认2M
-        $this->timeout = Conf::HTTP_TIMEOUT;        //默认超时30s
-        $this->httpReTry = Conf::HTTP_RETRY;       //默认重试
-        $this->array_PartNum_ETag = array();
-    }
-    /**得到上传时http请求体所需的参数*/
-    public function getParaArray()
-    {
-        switch ($this->optionType) {
-            case UpOptionType::COMMON_UPLOAD_TYPE:
-            case UpOptionType::BLOCK_INIT_UPLOAD:
-                return $this->getParasCommonBlockInit();
-            case UpOptionType::BLOCK_RUN_UPLOAD:
-                return $this->getParasBlockRun();
-            case UpOptionType::BLOCK_COMPLETE_UPLOAD:
-                return $this->getParasBlockComplete();
-            case UpOptionType::BLOCK_CANCEL_UPLOAD:
-                return $this->getParasBlockCancel();
-            default:
-                return null;
-        }
-    }
-    /** 构造 普通上传 或者 初始化分片上传 所需的参数 */
-    private function getParasCommonBlockInit()
-    {
-        $paraArray = array();
-        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;
-        $this->createMetaVars($paraArray, "meta", $this->metaArray);
-        $this->createMetaVars($paraArray, "var", $this->varArray);
-        return $paraArray;
-    }
-    /** 构造 分片上传过程中 所需的参数 */
-    private function getParasBlockRun()
-    {
-        $paraArray = array();
-        $paraArray['uploadId'] = $this->uploadId;
-        $paraArray['id'] = $this->uniqueId;
-        $paraArray['partNumber'] = $this->partNumber;
-        $paraArray['md5'] = md5($this->content); // 计算文件md5
-        $paraArray['size'] = strlen($this->content); // 计算文件大小
-        $paraArray['content'] = $this->content;
-        return $paraArray;
-    }
-    /** 构造 分片上传完成时 所需的参数 */
-    private function getParasBlockComplete()
-    {
-        $paraArray = array();
-        $paraArray['uploadId'] = $this->uploadId;
-        $paraArray['id'] = $this->uniqueId;
-        $paraArray['md5'] = $this->md5;
-        $parts = EncodeUtils::encodeWithURLSafeBase64(json_encode($this->array_PartNum_ETag));
-        $paraArray['parts'] = $parts; // 所有文件块的编号partNumber 和 标记ETag，需要进行base64的编码
-        return $paraArray;
-    }
-    /** 构造 分片上传取消 所需的参数 */
-    private function getParasBlockCancel()
-    {
-        return array('id' => $this->uniqueId, 'uploadId' => $this->uploadId);
-    }
-    /**
-     * 构建上传http请求体的meta-*和var-*选项参数。将tempArr中的元素加上前缀prefix，然后保存到paraArr中
-     * @param array $paraArr 最终的数组
-     * @param string $prefix 前缀
-     * @param array $tempArr 待添加的数组
-     * @return array $paraArr 最终的数组
-     */
-    private function createMetaVars($paraArr, $prefix, $tempArr)
-    {
-        foreach ($tempArr as $key => $val) {
-            $key = $prefix . '-' . $key;
-            $paraArr[$key] = $val;
-        }
-        return $paraArr;
-    }
-    /**设置待上传的数据。该方法开发者不需要调用，该方法根据用户数据自动调用
+	public function __construct()
+	{
+		$this->optionType = UpOptionType::COMMON_UPLOAD_TYPE; //默认普通上传类型
+		$this->metaArray = array();
+		$this->varArray = array();
+		$this->blockSize = Conf::BLOCK_DEFF_SIZE;   //默认2M
+		$this->timeout = Conf::HTTP_TIMEOUT;        //默认超时30s
+		$this->httpReTry = Conf::HTTP_RETRY;       //默认重试
+		$this->array_PartNum_ETag = array();
+	}
+	/**得到上传时http请求体所需的参数*/
+	public function getParaArray()
+	{
+		switch ($this->optionType) {
+			case UpOptionType::COMMON_UPLOAD_TYPE:
+			case UpOptionType::BLOCK_INIT_UPLOAD:
+				return $this->getParasCommonBlockInit();
+			case UpOptionType::BLOCK_RUN_UPLOAD:
+				return $this->getParasBlockRun();
+			case UpOptionType::BLOCK_COMPLETE_UPLOAD:
+				return $this->getParasBlockComplete();
+			case UpOptionType::BLOCK_CANCEL_UPLOAD:
+				return $this->getParasBlockCancel();
+			default:
+				return null;
+		}
+	}
+	/** 构造 普通上传 或者 初始化分片上传 所需的参数 */
+	private function getParasCommonBlockInit()
+	{
+		$paraArray = array();
+		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;
+		$this->createMetaVars($paraArray, "meta", $this->metaArray);
+		$this->createMetaVars($paraArray, "var", $this->varArray);
+		return $paraArray;
+	}
+	/** 构造 分片上传过程中 所需的参数 */
+	private function getParasBlockRun()
+	{
+		$paraArray = array();
+		$paraArray['uploadId'] = $this->uploadId;
+		$paraArray['id'] = $this->uniqueId;
+		$paraArray['partNumber'] = $this->partNumber;
+		$paraArray['md5'] = md5($this->content); // 计算文件md5
+		$paraArray['size'] = strlen($this->content); // 计算文件大小
+		$paraArray['content'] = $this->content;
+		return $paraArray;
+	}
+	/** 构造 分片上传完成时 所需的参数 */
+	private function getParasBlockComplete()
+	{
+		$paraArray = array();
+		$paraArray['uploadId'] = $this->uploadId;
+		$paraArray['id'] = $this->uniqueId;
+		$paraArray['md5'] = $this->md5;
+		$parts = EncodeUtils::encodeWithURLSafeBase64(json_encode($this->array_PartNum_ETag));
+		$paraArray['parts'] = $parts; // 所有文件块的编号partNumber 和 标记ETag，需要进行base64的编码
+		return $paraArray;
+	}
+	/** 构造 分片上传取消 所需的参数 */
+	private function getParasBlockCancel()
+	{
+		return array('id' => $this->uniqueId, 'uploadId' => $this->uploadId);
+	}
+	/**
+	 * 构建上传http请求体的meta-*和var-*选项参数。将tempArr中的元素加上前缀prefix，然后保存到paraArr中
+	 * @param array $paraArr 最终的数组
+	 * @param string $prefix 前缀
+	 * @param array $tempArr 待添加的数组
+	 * @return array $paraArr 最终的数组
+	 */
+	private function createMetaVars($paraArr, $prefix, $tempArr)
+	{
+		foreach ($tempArr as $key => $val) {
+			$key = $prefix . '-' . $key;
+			$paraArr[$key] = $val;
+		}
+		return $paraArr;
+	}
+	/**设置待上传的数据。该方法开发者不需要调用，该方法根据用户数据自动调用
      * @param string $data 字符串 */
-    public function setContent($data)
-    {
-        $this->content = $data;
-    }
-    /**设置MD5值。该方法主要用于在分片上传完成时调用
+	public function setContent($data)
+	{
+		$this->content = $data;
+	}
+	/**设置MD5值。该方法主要用于在分片上传完成时调用
      * @param string $value md5值 */
-    public function setMd5($value)
-    {
-        $this->md5 = $value;
-    }
-    /**得到MD5值。该方法主要用于在分片上传完成时调用*/
-    public function getMd5()
-    {
-        return $this->md5;
-    }
-    /*下面四个函数均是用于分片上传时的设置，开发者不需要调用*/
-    /**分片上传时用于设置uploadId */
-    public function setUploadId($uploadId)
-    {
-        $this->uploadId = $uploadId;
-    }
-    /**分片上传时用于设置id */
-    public function setUniqueIdId($id)
-    {
-        $this->uniqueId = $id;
-    }
-    /**分片上传时，用于获取分片上传时的块编号partNumber */
-    public function getPartNumber()
-    {
-        return $this->partNumber;
-    }
-    /**分片上传时，用于设置分片上传时的块编号partNumber */
-    public function setPartNumber($partNumber)
-    {
-        $this->partNumber = $partNumber;
-    }
-    /**分片上传过程中，用于保存所有的 块编号partNumber 和 标记ETag*/
-    public function addPartNumberAndETag($partNumber, $eTag)
-    {
-        $this->eTag = $eTag;
-        array_push($this->array_PartNum_ETag, array("partNumber" => $partNumber, "eTag" => $eTag));
-    }
-    /**检测分片上传的参数。即uploadId、uniqueId是否有值*/
-    public function checkMutipartParas()
-    {
-        return isset($this->uploadId) && isset($this->uniqueId);
-    }
+	public function setMd5($value)
+	{
+		$this->md5 = $value;
+	}
+	/**得到MD5值。该方法主要用于在分片上传完成时调用*/
+	public function getMd5()
+	{
+		return $this->md5;
+	}
+	/*下面四个函数均是用于分片上传时的设置，开发者不需要调用*/
+	/**分片上传时用于设置uploadId */
+	public function setUploadId($uploadId)
+	{
+		$this->uploadId = $uploadId;
+	}
+	/**分片上传时用于设置id */
+	public function setUniqueIdId($id)
+	{
+		$this->uniqueId = $id;
+	}
+	/**分片上传时，用于获取分片上传时的块编号partNumber */
+	public function getPartNumber()
+	{
+		return $this->partNumber;
+	}
+	/**分片上传时，用于设置分片上传时的块编号partNumber */
+	public function setPartNumber($partNumber)
+	{
+		$this->partNumber = $partNumber;
+	}
+	/**分片上传过程中，用于保存所有的 块编号partNumber 和 标记ETag*/
+	public function addPartNumberAndETag($partNumber, $eTag)
+	{
+		$this->eTag = $eTag;
+		array_push($this->array_PartNum_ETag, array("partNumber" => $partNumber, "eTag" => $eTag));
+	}
+	/**检测分片上传的参数。即uploadId、uniqueId是否有值*/
+	public function checkMutipartParas()
+	{
+		return isset($this->uploadId) && isset($this->uniqueId);
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -10,34 +10,34 @@
     public $optionType;
 
     /*以下属性是上传时的可选参数。即Rest API中Http请求Body中所需的可选参数*/
-    public $dir;                                    // 顽兔空间的图片路径(如果UploadPolicy中不指定dir属性，则生效)
-    public $name;                                   // 上传到服务端的文件名(如果UploadPolicy中不指定name属性，则生效)
-    public $metaArray;                              // 用户自定义的文件meta信息("meta-"为参数前缀, "*"为用户用于渲染的自定义Meta信息名)
-    public $varArray;                               // 用户自定义的魔法变量("var-"为参数前缀, "*"为用户用于渲染的自定义魔法变量名)
-    private $md5;                                   // 文件md5值(推荐提供此参数进行一致性检查)
-    private $size;                                  // 文件大小
-    private $content;                               // 文件内容(在http请求体Body中必须位于参数的最后一位)
+    public $dir; // 顽兔空间的图片路径(如果UploadPolicy中不指定dir属性，则生效)
+    public $name; // 上传到服务端的文件名(如果UploadPolicy中不指定name属性，则生效)
+    public $metaArray; // 用户自定义的文件meta信息("meta-"为参数前缀, "*"为用户用于渲染的自定义Meta信息名)
+    public $varArray; // 用户自定义的魔法变量("var-"为参数前缀, "*"为用户用于渲染的自定义魔法变量名)
+    private $md5; // 文件md5值(推荐提供此参数进行一致性检查)
+    private $size; // 文件大小
+    private $content; // 文件内容(在http请求体Body中必须位于参数的最后一位)
 
     /*以下属性是用户根据自己应用需求，可选的配置*/
-    public $blockSize;                              // 文件分片的大小。针对分片上传。
-    public $timeout;                                // 进行http连接的超时时间
-    public $httpReTry;                              // http失败自动重试。0 or 1
+    public $blockSize; // 文件分片的大小。针对分片上传。
+    public $timeout; // 进行http连接的超时时间
+    public $httpReTry; // http失败自动重试。0 or 1
 
     /*以下属性是用于分片上传时的参数，仅用于分片上传。用户在调用分片上传时可以选择配置。*/
-    private $uploadId;                              // OSS分片上传ID（OSS用于区分上传的id）
-    private $uniqueId;                              // 服务上传唯一ID（多媒体服务用于区分上传的id）
-    private $partNumber;                            // 分片文件块上传成功后返回的文件块编号
-    private $eTag;                                  // 分片文件块上传成功后返回的Tag标签(由md5和其他标记组成)
-    private $array_PartNum_ETag;                    // 分片上传服务端返回的所有 块编号partNumber 和 标记ETag
+    private $uploadId; // OSS分片上传ID（OSS用于区分上传的id）
+    private $uniqueId; // 服务上传唯一ID（多媒体服务用于区分上传的id）
+    private $partNumber; // 分片文件块上传成功后返回的文件块编号
+    private $eTag; // 分片文件块上传成功后返回的Tag标签(由md5和其他标记组成)
+    private $array_PartNum_ETag; // 分片上传服务端返回的所有 块编号partNumber 和 标记ETag
 
     public function __construct()
     {
         $this->optionType = UpOptionType::COMMON_UPLOAD_TYPE; //默认普通上传类型
         $this->metaArray = array();
         $this->varArray = array();
-        $this->blockSize = Conf::BLOCK_DEFF_SIZE;   //默认2M
-        $this->timeout = Conf::HTTP_TIMEOUT;        //默认超时30s
-        $this->httpReTry = Conf::HTTP_RETRY;       //默认重试
+        $this->blockSize = Conf::BLOCK_DEFF_SIZE; //默认2M
+        $this->timeout = Conf::HTTP_TIMEOUT; //默认超时30s
+        $this->httpReTry = Conf::HTTP_RETRY; //默认重试
         $this->array_PartNum_ETag = array();
     }
     /**得到上传时http请求体所需的参数*/

sdk/Utils/MediaResOption.php

Indentation +38 added lines, -38 removed lines

@@ -5,42 +5,42 @@
 /**多媒体操作的输入输出资源信息。视频截图和视频转码都继承该类*/
 abstract class MediaResOption
 {
-    private $input;                  //输入的资源
-    private $output;                 //输出的资源
-    /**设置输入的文件。*/
-    public function setInputResource($namespace = null, $dir = null, $name = null)
-    {
-        $this->input = new ResourceInfo($namespace, $dir, $name);
-    }
-    /**设置输出的文件。*/
-    public function setOutputResource($namespace = null, $dir = null, $name = null)
-    {
-        $this->output = new ResourceInfo($namespace, $dir, $name);
-    }
-    /**检测参数选项是否合法*/
-    public function checkOptionParameters()
-    {
-        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);
-        }
-        list($valid, $msg) = $this->output->checkResourceInfo(true, true); //检测输入的资源信息是否合法
-        if (!$valid) {
-            return array($valid, $msg);
-        }
-        return array(true, null);
-    }
-    public function getInputResId()
-    {
-        return $this->input->buildResourceId();
-    }
-    public function getOutputResId()
-    {
-        return $this->output->buildResourceId();
-    }
-    /**得到属性的http请求体*/
-    abstract public function getOptionsHttpBody();
+	private $input;                  //输入的资源
+	private $output;                 //输出的资源
+	/**设置输入的文件。*/
+	public function setInputResource($namespace = null, $dir = null, $name = null)
+	{
+		$this->input = new ResourceInfo($namespace, $dir, $name);
+	}
+	/**设置输出的文件。*/
+	public function setOutputResource($namespace = null, $dir = null, $name = null)
+	{
+		$this->output = new ResourceInfo($namespace, $dir, $name);
+	}
+	/**检测参数选项是否合法*/
+	public function checkOptionParameters()
+	{
+		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);
+		}
+		list($valid, $msg) = $this->output->checkResourceInfo(true, true); //检测输入的资源信息是否合法
+		if (!$valid) {
+			return array($valid, $msg);
+		}
+		return array(true, null);
+	}
+	public function getInputResId()
+	{
+		return $this->input->buildResourceId();
+	}
+	public function getOutputResId()
+	{
+		return $this->output->buildResourceId();
+	}
+	/**得到属性的http请求体*/
+	abstract public function getOptionsHttpBody();
 }

Spacing +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
 /**多媒体操作的输入输出资源信息。视频截图和视频转码都继承该类*/
 abstract class MediaResOption
 {
-    private $input;                  //输入的资源
-    private $output;                 //输出的资源
+    private $input; //输入的资源
+    private $output; //输出的资源
     /**设置输入的文件。*/
     public function setInputResource($namespace = null, $dir = null, $name = null)
     {

sdk/Utils/UpOptionType.php

Indentation +6 added lines, -6 removed lines

@@ -8,10 +8,10 @@
  */
 class UpOptionType
 {
-    //下面的常量用于标识UploadOption对象适用的类型
-    const COMMON_UPLOAD_TYPE = 0;       //普通上传时的UploadOption类型
-    const BLOCK_INIT_UPLOAD = 1;        //分片初始化时的UploadOption类型
-    const BLOCK_RUN_UPLOAD = 2;         //分片上传过程中的UploadOption类型
-    const BLOCK_COMPLETE_UPLOAD = 3;    //分片上传完成时的UploadOption类型
-    const BLOCK_CANCEL_UPLOAD = 4;      //分片上传取消时的UploadOption类型
+	//下面的常量用于标识UploadOption对象适用的类型
+	const COMMON_UPLOAD_TYPE = 0;       //普通上传时的UploadOption类型
+	const BLOCK_INIT_UPLOAD = 1;        //分片初始化时的UploadOption类型
+	const BLOCK_RUN_UPLOAD = 2;         //分片上传过程中的UploadOption类型
+	const BLOCK_COMPLETE_UPLOAD = 3;    //分片上传完成时的UploadOption类型
+	const BLOCK_CANCEL_UPLOAD = 4;      //分片上传取消时的UploadOption类型
 }

Spacing +5 added lines, -5 removed lines

@@ -9,9 +9,9 @@
 class UpOptionType
 {
     //下面的常量用于标识UploadOption对象适用的类型
-    const COMMON_UPLOAD_TYPE = 0;       //普通上传时的UploadOption类型
-    const BLOCK_INIT_UPLOAD = 1;        //分片初始化时的UploadOption类型
-    const BLOCK_RUN_UPLOAD = 2;         //分片上传过程中的UploadOption类型
-    const BLOCK_COMPLETE_UPLOAD = 3;    //分片上传完成时的UploadOption类型
-    const BLOCK_CANCEL_UPLOAD = 4;      //分片上传取消时的UploadOption类型
+    const COMMON_UPLOAD_TYPE = 0; //普通上传时的UploadOption类型
+    const BLOCK_INIT_UPLOAD = 1; //分片初始化时的UploadOption类型
+    const BLOCK_RUN_UPLOAD = 2; //分片上传过程中的UploadOption类型
+    const BLOCK_COMPLETE_UPLOAD = 3; //分片上传完成时的UploadOption类型
+    const BLOCK_CANCEL_UPLOAD = 4; //分片上传取消时的UploadOption类型
 }