Deal with empty file to set Content-Length to 0

Author: dt3310321

qcloud_cos/cos_client.py

@@ -180,6 +180,7 @@ def put_object(self, Bucket, Body, Key, **kwargs):
         logger.info("put object, url=:{url} ,headers=:{headers}".format(
             url=url,
             headers=headers))
+        Body = deal_with_empty_file_stream(Body)
         rt = self.send_request(
             method='PUT',
             url=url,
@@ -413,6 +414,7 @@ def upload_part(self, Bucket, Key, Body, PartNumber, UploadId, **kwargs):
         logger.info("put object, url=:{url} ,headers=:{headers}".format(
             url=url,
             headers=headers))
+        Body = deal_with_empty_file_stream(Body)
         rt = self.send_request(
                 method='PUT',
                 url=url,

qcloud_cos/cos_comm.py

@@ -3,6 +3,7 @@
 import hashlib
 import base64
 import os
+import io
 import sys
 import xml.dom.minidom
 import xml.etree.ElementTree
@@ -216,3 +217,17 @@ def gen_copy_source_range(begin_range, end_range):
             end=end_range
             )
     return range
+
+
+def deal_with_empty_file_stream(data):
+    """对于文件流的剩余长度为0的情况下，返回空字节流"""
+    if hasattr(data, 'fileno') and hasattr(data, 'tell'):
+        try:
+            fileno = data.fileno()
+            total_length = os.fstat(fileno).st_size
+            current_position = data.tell()
+            if total_length - current_position == 0:
+                return ""
+        except io.UnsupportedOperation:
+            return ""
+    return data

qcloud_cos/test.py

@@ -56,7 +56,7 @@ def tearDown():
 
 def test_put_get_delete_object_10MB():
     """简单上传下载删除10MB小文件"""
-    file_size = 10
+    file_size = 5
     file_id = str(random.randint(0, 1000)) + str(random.randint(0, 1000))
     file_name = "tmp" + file_id + "_" + str(file_size) + "MB"
     gen_file(file_name, 10)
@@ -545,7 +545,7 @@ def test_list_multipart_uploads():
 def test_upload_file_multithreading():
     """根据文件大小自动选择分块大小,多线程并发上传提高上传速度"""
     file_name = "thread_1GB"
-    gen_file(file_name, 12)  # set 12MB beacuse travis too slow
+    gen_file(file_name, 5)  # set 5MB beacuse travis too slow
     st = time.time()  # 记录开始时间
     response = client.upload_file(
         Bucket=test_bucket,
@@ -572,8 +572,24 @@ def test_copy_file_automatically():
     )
 
 
+def test_upload_empty_file():
+    """上传一个空文件,不能返回411错误"""
+    file_name = "empty.txt"
+    with open(file_name, 'wb') as f:
+        pass
+    with open(file_name, 'rb') as fp:
+        response = client.put_object(
+            Bucket=test_bucket,
+            Body=fp,
+            Key=file_name,
+            CacheControl='no-cache',
+            ContentDisposition='download.txt'
+        )
+
+
 if __name__ == "__main__":
     setUp()
+    test_upload_empty_file()
     test_put_get_delete_object_10MB()
     test_put_get_versioning()
     test_put_get_delete_replication()