refine FileLikeAdapter code

Author: liyanzhang505

oss2/utils.py

@@ -405,7 +405,12 @@ def next(self):
         if self.read_all:
             raise StopIteration
 
-        return self.read(_CHUNK_SIZE)
+        content = self.read(_CHUNK_SIZE)
+
+        if content:
+            return content
+        else:
+            raise StopIteration
 
     def read(self, amt=None):
         offset_start = self.offset
@@ -416,7 +421,6 @@ def read(self, amt=None):
         if not content:
             self.read_all = True
             _invoke_progress_callback(self.progress_callback, self.offset, None)
-            return to_bytes('')
         else:
             _invoke_progress_callback(self.progress_callback, self.offset, None)
 
@@ -433,7 +437,7 @@ def read(self, amt=None):
             content = _invoke_cipher_callback(self.cipher_callback, content, real_discard)
 
             self.discard -= real_discard
-            return content
+        return content
 
     @property
     def crc(self):

tests/test_crypto_object.py

@@ -11,6 +11,7 @@
 
 from .common import *
 from .test_object import now
+from oss2.compat import to_bytes
 
 
 class TestCryptoObject(OssTestCase):
@@ -346,6 +347,40 @@ def test_crypto_object_incorrect_description(self):
         get_result = crypto_bucket_2.get_object(key)
         self.assertEqual(get_result.read(), content)
 
+    def test_put_object_chunked(self):
+        class FakeFileObj(object):
+            def __init__(self, data, size):
+                self.data = to_bytes(data)
+                self.offset = 0
+                self.size = size
+
+            def read(self, amt=None):
+                if self.offset >= self.size:
+                    return to_bytes('')
+
+                if amt is None or amt < 0:
+                    bytes_to_read = self.size - self.offset
+                else:
+                    bytes_to_read = min(amt, self.size - self.offset)
+
+                content = self.data[self.offset:self.offset + bytes_to_read]
+
+                self.offset += bytes_to_read
+
+                return content
+
+        object_name = 'test-put-file-like-object-chunked'
+
+        count = 1
+        while count <= 100:
+            count += 1
+            cnt = random.randint(count, 1024)
+            data = FakeFileObj(b'a' * cnt, count)
+            self.rsa_crypto_bucket.put_object(object_name + str(count) + '.txt', data)
+            get_result = self.rsa_crypto_bucket.get_object(object_name + str(count) + '.txt')
+            self.assertEqual(get_result.read(), b'a' * count)
+
+
     '''
     # 测试CryptoBucket类的Copy方法, 并使用"REPLACE"模式修改meta
     def test_copy_crypto_object_with_replace_meta(self):

tests/test_put_object_chunked.py

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+
+from .common import *
+from oss2.compat import to_bytes
+
+
+class TestPutObjectChunked(OssTestCase):
+    def test_put_object_chunked(self):
+        class FakeFileObj(object):
+            def __init__(self, data, size):
+                self.data = to_bytes(data)
+                self.offset = 0
+                self.size = size
+
+            def read(self, amt=None):
+                if self.offset >= self.size:
+                    return to_bytes('')
+
+                if amt is None or amt < 0:
+                    bytes_to_read = self.size - self.offset
+                else:
+                    bytes_to_read = min(amt, self.size - self.offset)
+
+                content = self.data[self.offset:self.offset + bytes_to_read]
+
+                self.offset += bytes_to_read
+
+                return content
+
+        object_name = 'test-put-file-like-object-chunked'
+
+        count = 1
+        while count <= 1500:
+            try:
+                count += 1
+
+                cnt = random.randint(count, 102400)
+                data = FakeFileObj(b'a' * cnt, count)
+                self.bucket.put_object(object_name + str(count) + '.txt', data)
+                cnt = random.randint(count, 102400)
+                data = FakeFileObj(b'a' * cnt, cnt)
+                self.bucket.put_object(object_name + str(count) + '11.txt', data)
+            except oss2.exceptions.ServerError as e:
+                if e.code == 'BadRequest':
+                    raise
+            except Exception:
+                continue
+
+
+if __name__ == '__main__':
+    unittest.main()