Add get_date for lifecycle date and check the object size

Author: dt3310321

qcloud_cos/__init__.py

@@ -3,3 +3,4 @@
 from .cos_exception import CosServiceError
 from .cos_exception import CosClientError
 from .cos_auth import CosS3Auth
+from .cos_comm import get_date

qcloud_cos/cos_client.py

@@ -11,6 +11,7 @@
 import xml.dom.minidom
 import xml.etree.ElementTree
 from requests import Request, Session
+from datetime import datetime
 from urllib import quote
 from hashlib import md5
 from streambody import StreamBody
@@ -152,7 +153,7 @@ def send_request(self, method, url, timeout=30, **kwargs):
             timeout = self._conf._timeout
         if self._conf._token is not None:
             kwargs['headers']['x-cos-security-token'] = self._conf._token
-        kwargs['headers']['User-Agent'] = 'cos-python-sdk-v5.1.4.0'
+        kwargs['headers']['User-Agent'] = 'cos-python-sdk-v5.1.4.1'
         try:
             for j in range(self._retry):
                 if method == 'POST':
@@ -214,6 +215,7 @@ def put_object(self, Bucket, Body, Key, EnableMD5=False, **kwargs):
                 )
                 print response['ETag']
         """
+        check_object_content_length(Body)
         headers = mapped(kwargs)
         if 'Metadata' in headers.keys():
             for i in headers['Metadata'].keys():
@@ -579,6 +581,7 @@ def upload_part(self, Bucket, Key, Body, PartNumber, UploadId, EnableMD5=False,
                     Key='test.txt'
                 )
         """
+        check_object_content_length(Body)
         headers = mapped(kwargs)
         url = self._conf.uri(bucket=Bucket, path=quote(Key, '/-_.~')+"?partNumber={PartNumber}&uploadId={UploadId}".format(
             PartNumber=PartNumber,
@@ -1334,7 +1337,7 @@ def put_bucket_lifecycle(self, Bucket, LifecycleConfiguration={}, **kwargs):
             lifecycle_config = {
                 'Rule': [
                     {
-                        'Expiration': {'Days': 100},
+                        'Expiration': {'Date': get_date(2018, 4, 24)},
                         'ID': '123',
                         'Filter': {'Prefix': ''},
                         'Status': 'Enabled',

qcloud_cos/cos_comm.py

@@ -7,6 +7,7 @@
 import sys
 import xml.dom.minidom
 import xml.etree.ElementTree
+from datetime import datetime
 from urllib import quote
 from urllib import unquote
 from xml2dict import Xml2Dict
@@ -268,6 +269,21 @@ def gen_copy_source_range(begin_range, end_range):
     return range
 
 
+def check_object_content_length(data):
+    """put_object接口和upload_part接口的文件大小不允许超过5G"""
+    content_len = 0
+    if type(data) is str:
+        content_len = len(data)
+    elif type(data) is file and hasattr(data, 'fileno') and hasattr(data, 'tell'):
+        fileno = data.fileno()
+        total_length = os.fstat(fileno).st_size
+        current_position = data.tell()
+        content_len = total_length - current_position
+    if content_len > SINGLE_UPLOAD_LENGTH:
+        raise CosClientError('The object size you upload can not be larger than 5GB in put_object or upload_part')
+    return None
+
+
 def deal_with_empty_file_stream(data):
     """对于文件流的剩余长度为0的情况下，返回空字节流"""
     if hasattr(data, 'fileno') and hasattr(data, 'tell'):
@@ -304,3 +320,10 @@ def decode_result(data, key_lst, multi_key_list):
                 if multi_key[1] in item.keys() and item[multi_key[1]]:
                     item[multi_key[1]] = unquote(item[multi_key[1]])
     return data
+
+
+def get_date(yy, mm, dd):
+    """获取lifecycle中Date字段"""
+    date_str = datetime(yy, mm, dd).isoformat()
+    final_date_str = date_str+'+08:00'
+    return final_date_str

ut/test.py

@@ -8,6 +8,7 @@
 from qcloud_cos import CosS3Client
 from qcloud_cos import CosConfig
 from qcloud_cos import CosServiceError
+from qcloud_cos import get_date
 
 SECRET_ID = os.environ["SECRET_ID"]
 SECRET_KEY = os.environ["SECRET_KEY"]
@@ -429,7 +430,7 @@ def test_put_get_delete_lifecycle():
     lifecycle_config = {
         'Rule': [
             {
-                'Expiration': {'Days': 100},
+                'Expiration': {'Date': get_date(2030, 5, 1)},
                 'ID': '123',
                 'Filter': {'Prefix': ''},
                 'Status': 'Enabled',