Merge pull request #130 from aliyun/log

Log

Author: hangzws

examples/object_callback.py

@@ -72,7 +72,7 @@
 upload_id = bucket.init_multipart_upload(key).upload_id
 # 上传分片
 result = bucket.upload_part(key, upload_id, 1, content)
-parts.append(oss2.models.PartInfo(1, result.etag))
+parts.append(oss2.models.PartInfo(1, result.etag, size = len(content), part_crc = result.crc))
 # 完成上传并回调
 result = bucket.complete_multipart_upload(key, upload_id, parts, headers)
 

examples/object_check.py

@@ -122,7 +122,7 @@ def _prepare_temp_file(content):
 encode_md5 = calculate_data_md5(content)
 for i in range(3):
     result = bucket.upload_part(key, upload_id, i+1, content, headers={'Content-MD5': encode_md5})
-    parts.append(oss2.models.PartInfo(i+1, result.etag))
+    parts.append(oss2.models.PartInfo(i+1, result.etag, size = len(content), part_crc = result.crc))
 
 # 完成上传并回调
 result = bucket.complete_multipart_upload(key, upload_id, parts)
@@ -156,7 +156,7 @@ def _prepare_temp_file(content):
 # 上传分片，每个分片单独CRC校验
 for i in range(3):
     result = bucket.upload_part(key, upload_id, i+1, content)
-    parts.append(oss2.models.PartInfo(i+1, result.etag))
+    parts.append(oss2.models.PartInfo(i+1, result.etag, size = len(content), part_crc = result.crc))
 
 # 完成上传并回调
 result = bucket.complete_multipart_upload(key, upload_id, parts)
@@ -178,14 +178,14 @@ def _prepare_temp_file(content):
 assert result.client_crc == result.server_crc
 
 
-# 下载文件到本地
+# 下载文件到本地,默认开启CRC校验
 local_file = 'download.txt'
 result = bucket.get_object_to_file(key, local_file)
 os.remove(local_file)
 assert result.client_crc == result.server_crc
 
 
-# 断点续传下载，不支持CRC校验，可以用如下方法校验
+# 断点续传下载, 自动开启CRC校验，也可以用如下方法校验
 oss2.resumable_download(bucket, key, local_file,
                         multiget_threshold=200*1024,
                         part_size=100*1024,

examples/object_progress.py

@@ -80,7 +80,7 @@ def _prepare_temp_file(content):
 # 上传分片
 for i in range(3):
     result = bucket.upload_part(key, upload_id, i+1, content, progress_callback=percentage)
-    parts.append(oss2.models.PartInfo(i+1, result.etag))
+    parts.append(oss2.models.PartInfo(i+1, result.etag, size = len(content), part_crc = result.crc))
 
 # 完成上传并回调
 result = bucket.complete_multipart_upload(key, upload_id, parts)

examples/object_server_crypto.py

@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+
+import os
+import shutil
+
+import oss2
+from oss2.headers import RequestHeader
+
+
+# 以下代码展示了其用服务端加密功能的各项操作
+
+
+# 首先初始化AccessKeyId、AccessKeySecret、Endpoint等信息。
+# 通过环境变量获取，或者把诸如“<你的AccessKeyId>”替换成真实的AccessKeyId等。
+#
+# 以杭州区域为例，Endpoint可以是：
+#   http://oss-cn-hangzhou.aliyuncs.com
+#   https://oss-cn-hangzhou.aliyuncs.com
+# 分别以HTTP、HTTPS协议访问。
+access_key_id = os.getenv('OSS_TEST_ACCESS_KEY_ID', '<你的AccessKeyId>')
+access_key_secret = os.getenv('OSS_TEST_ACCESS_KEY_SECRET', '<你的AccessKeySecret>')
+bucket_name = os.getenv('OSS_TEST_BUCKET', '<你的Bucket>')
+endpoint = os.getenv('OSS_TEST_ENDPOINT', '<你的访问域名>')
+
+
+# 确认上面的参数都填写正确了
+for param in (access_key_id, access_key_secret, bucket_name, endpoint):
+    assert '<' not in param, '请设置参数：' + param
+
+
+key = 'server-crypto.txt'
+content = b'a' * 1024 * 1024
+
+# 创建Bucket对象，所有Object相关的接口都可以通过Bucket对象来进行
+bucket = oss2.Bucket(oss2.Auth(access_key_id, access_key_secret), endpoint, bucket_name)
+
+
+# 上传文件使用服务端AES256进行加密
+myHeader = RequestHeader()
+myHeader.set_server_side_encryption("AES256")
+bucket.put_object(key, content, headers = myHeader)
+
+# 下载文件验证一下
+result = bucket.get_object(key)
+content_got = b''
+for chunk in result:
+    content_got += chunk
+assert content_got == content
+
+# 上传文件使用服务端KMS进行加密
+myHeader = RequestHeader()
+myHeader.set_server_side_encryption("KMS", cmk_id = "11111")
+bucket.put_object(key, content, headers = myHeader)
+
+# 下载文件验证一下
+result = bucket.get_object(key)
+content_got = b''
+for chunk in result:
+    content_got += chunk
+assert content_got == content

examples/upload.py

@@ -69,18 +69,18 @@ def random_string(n):
 upload_id = bucket.init_multipart_upload(key).upload_id
 
 # 逐个上传分片
-# 其中oss2.SizedFileAdapter()把fileobj转换为一个新的文件对象，新的文件对象可读的长度等于num_to_upload
+# 其中oss2.SizedFileAdapter()把fileobj转换为一个新的文件对象，新的文件对象可读的长度等于size_to_upload
 with open(filename, 'rb') as fileobj:
     parts = []
     part_number = 1
     offset = 0
     while offset < total_size:
-        num_to_upload = min(part_size, total_size - offset)
+        size_to_upload = min(part_size, total_size - offset)
         result = bucket.upload_part(key, upload_id, part_number,
-                                    oss2.SizedFileAdapter(fileobj, num_to_upload))
-        parts.append(oss2.models.PartInfo(part_number, result.etag))
+                                    oss2.SizedFileAdapter(fileobj, size_to_upload))
+        parts.append(oss2.models.PartInfo(part_number, result.etag, size = size_to_upload, part_crc = result.crc))
 
-        offset += num_to_upload
+        offset += size_to_upload
         part_number += 1
 
     # 完成分片上传
@@ -91,4 +91,4 @@ def random_string(n):
     assert bucket.get_object(key).read() == fileobj.read()
 
 
-os.remove(filename)
+os.remove(filename)

oss2/__init__.py

@@ -28,3 +28,35 @@
 from .models import BUCKET_STORAGE_CLASS_STANDARD, BUCKET_STORAGE_CLASS_IA, BUCKET_STORAGE_CLASS_ARCHIVE
 
 from .crypto import LocalRsaProvider, AliKMSProvider
+import logging
+
+logger = logging.getLogger('oss2')
+
+
+def set_file_logger(file_path, name="oss2", level=logging.INFO, format_string=None):
+    global logger
+    if not format_string:
+        format_string = "%(asctime)s %(name)s [%(levelname)s] %(thread)d : %(message)s"
+    logger = logging.getLogger(name)
+    logger.setLevel(level)
+    fh = logging.FileHandler(file_path)
+    fh.setLevel(level)
+    formatter = logging.Formatter(format_string)
+    fh.setFormatter(formatter)
+    logger.addHandler(fh)
+
+
+def set_stream_logger(name='oss2', level=logging.DEBUG, format_string=None):
+    global logger
+    if not format_string:
+        format_string = "%(asctime)s %(name)s [%(levelname)s] %(thread)d : %(message)s"
+    logger = logging.getLogger(name)
+    logger.setLevel(level)
+    fh = logging.StreamHandler()
+    fh.setLevel(level)
+    formatter = logging.Formatter(format_string)
+    fh.setFormatter(formatter)
+    logger.addHandler(fh)
+
+
+set_stream_logger('oss2', logging.INFO)