Merge branch 'master' into s3

Author: dt3310321

README.rst

@@ -27,9 +27,10 @@ cos最新可用地域,参照https://www.qcloud.com/document/product/436/6224
 .. code:: python
 
     # 设置用户属性, 包括secret_id, secret_key, region
+    # appid已在配置中移除,请在参数Bucket中带上appid。Bucket由bucketname-appid组成
     secret_id = 'xxxxxxxx'     # 替换为用户的secret_id
     secret_key = 'xxxxxxx'     # 替换为用户的secret_key
-    region = 'ap-beiging-1'    # 替换为用户的region 
+    region = 'ap-beijing-1'    # 替换为用户的region 
     token = ''                 # 使用临时秘钥需要传入Token，默认为空,可不填
     config = CosConfig(Region=region, Secret_id=secret_id, Secret_key=secret_key, Token=token)  #获取配置对象
     client = CosS3Client(config)                                                                #获取客户端对象
@@ -40,7 +41,7 @@ cos最新可用地域,参照https://www.qcloud.com/document/product/436/6224
     ############################################################################
     # 1. 上传单个文件
     response = client.put_object(
-        Bucket='test01-123456789',
+        Bucket='test01-123456789',  # Bucket由bucketname-appid组成
         Body='TY'*1024*512*file_size,
         Key=file_name,
         CacheControl='no-cache',

qcloud_cos/cos_client.py

@@ -12,6 +12,7 @@
 import xml.etree.ElementTree
 from requests import Request, Session
 from urllib import quote
+from hashlib import md5
 from streambody import StreamBody
 from xml2dict import Xml2Dict
 from dicttoxml import dicttoxml
@@ -49,7 +50,7 @@ def __init__(self, Appid=None, Region=None, Secret_id=None, Secret_key=None, Tok
         if Scheme is None:
             Scheme = 'http'
         if(Scheme != 'http' and Scheme != 'https'):
-            raise CosCosClientError('Scheme can be only set to http/https')
+            raise CosClientError('Scheme can be only set to http/https')
         self._scheme = Scheme
 
         # 兼容(SecretId,SecretKey)以及(AccessId,AccessKey)
@@ -597,6 +598,10 @@ def upload_part(self, Bucket, Key, Body, PartNumber, UploadId, EnableMD5=False,
                 auth=CosS3Auth(self._conf._secret_id, self._conf._secret_key, Key),
                 data=Body)
         response = dict()
+        logger.debug("local md5: {key}".format(key=rt.headers['ETag'][1:-1]))
+        logger.debug("cos md5: {key}".format(key=md5(Body).hexdigest()))
+        if md5(Body).hexdigest() != rt.headers['ETag'][1:-1]:
+            raise CosClientError("MD5 inconsistencies")
         response['ETag'] = rt.headers['ETag']
         return response
 
@@ -2011,5 +2016,36 @@ def upload_file_from_buffer(self, Bucket, Key, Body, MaxBufferSize=100, PartSize
             raise e
         return rt
 
+    def append_object(self, Bucket, Key, Position, Data, **kwargs):
+        """文件块追加接口
+
+        :param Bucket(string): 存储桶名称.
+        :param Key(string): COS路径.
+        :param Position(int): 追加内容的起始位置.
+        :param Data(string): 追加的内容
+        :kwargs(dict): 设置上传的headers.
+        :return(dict): 上传成功返回的结果，包含ETag等信息.
+        """
+        headers = mapped(kwargs)
+        if 'Metadata' in headers.keys():
+            for i in headers['Metadata'].keys():
+                headers[i] = headers['Metadata'][i]
+            headers.pop('Metadata')
+
+        url = self._conf.uri(bucket=Bucket, path=quote(Key, '/-_.~')+"?append&position="+str(Position))
+        logger.info("append object, url=:{url} ,headers=:{headers}".format(
+            url=url,
+            headers=headers))
+        Body = deal_with_empty_file_stream(Data)
+        rt = self.send_request(
+            method='POST',
+            url=url,
+            auth=CosS3Auth(self._conf._secret_id, self._conf._secret_key, Key),
+            data=Body,
+            headers=headers)
+        response = rt.headers
+        return response
+
+
 if __name__ == "__main__":
     pass

qcloud_cos/demo.py

@@ -15,6 +15,7 @@
 logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
 
 # 设置用户属性, 包括secret_id, secret_key, region
+# appid已在配置中移除,请在参数Bucket中带上appid。Bucket由bucketname-appid组成
 secret_id = 'AKID15IsskiBQACGbAo6WhgcQbVls7HmuG00'     # 替换为用户的secret_id
 secret_key = 'csivKvxxrMvSvQpMWHuIz12pThQQlWRW'     # 替换为用户的secret_key
 region = 'ap-beijing-1'    # 替换为用户的region
@@ -26,7 +27,7 @@
 file_name = 'test.txt'
 with open('test.txt', 'rb') as fp:
     response = client.put_object(
-        Bucket='test04-123456789',
+        Bucket='test04-123456789',  # Bucket由bucketname-appid组成
         Body=fp,
         Key=file_name,
         StorageClass='STANDARD',