Merge pull request #70 from dt3310321/s3

S3

Author: dt3310321

qcloud_cos/cos_client.py

@@ -515,6 +515,9 @@ def copy_object(self, Bucket, Key, CopySource, CopyStatus='Copy', **kwargs):
             auth=CosS3Auth(self._conf._secret_id, self._conf._secret_key, Key),
             headers=headers)
         body = xml_to_dict(rt.content)
+        if 'ETag' not in body:
+            logger.error(rt.content)
+            raise CosServiceError('PUT', rt.content, 200)
         data = rt.headers
         data.update(body)
         return data
@@ -692,6 +695,10 @@ def complete_multipart_upload(self, Bucket, Key, UploadId, MultipartUpload={}, *
                 headers=headers,
                 params=params)
         body = xml_to_dict(rt.content)
+        # 分块上传文件返回200OK并不能代表文件上传成功,返回的body里面如果没有ETag则认为上传失败
+        if 'ETag' not in body:
+            logger.error(rt.content)
+            raise CosServiceError('POST', rt.content, 200)
         data = rt.headers
         data.update(body)
         return data

qcloud_cos/streambody.py

@@ -12,18 +12,19 @@ def get_stream(self, chunk_size=1024):
         return self._rt.iter_content(chunk_size=chunk_size)
 
     def get_stream_to_file(self, file_name):
+        use_chunked = False
         if 'Content-Length' in self._rt.headers:
             content_len = int(self._rt.headers['Content-Length'])
+        elif 'Transfer-Encoding' in self._rt.headers and self._rt.headers['Transfer-Encoding'] == "chunked":
+            use_chunked = True
         else:
-            raise IOError("download failed without Content-Length header")
+            raise IOError("download failed without Content-Length header or Transfer-Encoding header")
 
         file_len = 0
         with open(file_name, 'wb') as fp:
             for chunk in self._rt.iter_content(chunk_size=1024):
                 if chunk:
                     file_len += len(chunk)
                     fp.write(chunk)
-            fp.flush()
-            fp.close()
-        if file_len != content_len:
+        if not use_chunked and file_len != content_len:
             raise IOError("download failed with incomplete file")