Merge pull request #208 from songfei9315/master

add

Author: longbai

examples/batch.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# flake8: noqa
+from qiniu import Auth
+from qiniu import BucketManager,build_batch_rename
+# from qiniu import build_batch_copy,
+# from qiniu import build_batch_move,build_batch_rename
+access_key = 'access_key'
+secret_key = 'secret_key'
+
+# 初始化Auth状态
+q = Auth(access_key, secret_key)
+
+# 初始化BucketManager
+bucket = BucketManager(q)
+keys = {'123.jpg':'123.jpg'}
+
+# ops = build_batch_copy( 'teest', keys, 'teest',force='true')
+# ops = build_batch_move('teest', keys, 'teest', force='true')
+ops = build_batch_rename('teest', keys,force='true')
+
+ret, info = bucket.batch(ops)
+print(ret)
+print(info)
+assert ret == {}
+

examples/fetch.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# flake8: noqa
+
+from qiniu import Auth
+from qiniu import BucketManager
+
+access_key = 'access_key'
+secret_key = 'secret_key'
+bucket_name = 'xxx'
+q = Auth(access_key, secret_key)
+bucket = BucketManager(q)
+url = 'http://7xr875.com1.z0.glb.clouddn.com/test.jpg'
+key = 'test.jpg'
+ret, info = bucket.fetch( url, bucket_name, key)
+print(info)
+assert ret['key'] == key

examples/list.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# flake8: noqa
+from qiniu import Auth
+from qiniu import BucketManager
+
+access_key = 'access_key'
+secret_key = 'secret_key'
+
+q = Auth(access_key, secret_key)
+bucket = BucketManager(q)
+
+bucket_name = 'dontdelete'
+# 前缀
+prefix = None
+# 列举条目
+limit = 10
+# 列举出除'/'的所有文件以及以'/'为分隔的所有前缀
+delimiter = None
+# 标记
+marker = None
+
+ret, eof, info = bucket.list(bucket_name, prefix, marker, limit, delimiter)
+
+print(info)
+
+assert len(ret.get('items')) is not None

qiniu/auth.py

@@ -34,6 +34,7 @@
     'persistentOps',        # 持久化处理操作
     'persistentNotifyUrl',  # 持久化处理结果通知URL
     'persistentPipeline',   # 持久化处理独享队列
+    'deleteAfterDays',      # 文件多少天后自动删除
 ])
 
 _deprecated_policy_fields = set([

qiniu/services/storage/bucket.py

@@ -100,7 +100,7 @@ def delete(self, bucket, key):
         resource = entry(bucket, key)
         return self.__rs_do('delete', resource)
 
-    def rename(self, bucket, key, key_to):
+    def rename(self, bucket, key, key_to, force='false'):
         """重命名文件:
 
         给资源进行重命名，本质为move操作。
@@ -114,9 +114,9 @@ def rename(self, bucket, key, key_to):
             一个dict变量，成功返回NULL，失败返回{"error": "<errMsg string>"}
             一个ResponseInfo对象
         """
-        return self.move(bucket, key, bucket, key_to)
+        return self.move(bucket, key, bucket, key_to, force)
 
-    def move(self, bucket, key, bucket_to, key_to):
+    def move(self, bucket, key, bucket_to, key_to, force='false'):
         """移动文件:
 
         将资源从一个空间到另一个空间，具体规格参考：
@@ -134,9 +134,9 @@ def move(self, bucket, key, bucket_to, key_to):
         """
         resource = entry(bucket, key)
         to = entry(bucket_to, key_to)
-        return self.__rs_do('move', resource, to)
+        return self.__rs_do('move', resource, to, 'force/{0}'.format(force))
 
-    def copy(self, bucket, key, bucket_to, key_to):
+    def copy(self, bucket, key, bucket_to, key_to, force='false'):
         """复制文件:
 
         将指定资源复制为新命名资源，具体规格参考：
@@ -154,7 +154,7 @@ def copy(self, bucket, key, bucket_to, key_to):
         """
         resource = entry(bucket, key)
         to = entry(bucket_to, key_to)
-        return self.__rs_do('copy', resource, to)
+        return self.__rs_do('copy', resource, to, 'force/{0}'.format(force))
 
     def fetch(self, url, bucket, key=None):
         """抓取文件:
@@ -264,16 +264,16 @@ def _build_op(*args):
     return '/'.join(args)
 
 
-def build_batch_copy(source_bucket, key_pairs, target_bucket):
-    return _two_key_batch('copy', source_bucket, key_pairs, target_bucket)
+def build_batch_copy(source_bucket, key_pairs, target_bucket, force='false'):
+    return _two_key_batch('copy', source_bucket, key_pairs, target_bucket, force)
 
 
-def build_batch_rename(bucket, key_pairs):
-    return build_batch_move(bucket, key_pairs, bucket)
+def build_batch_rename(bucket, key_pairs, force='false'):
+    return build_batch_move(bucket, key_pairs, bucket, force)
 
 
-def build_batch_move(source_bucket, key_pairs, target_bucket):
-    return _two_key_batch('move', source_bucket, key_pairs, target_bucket)
+def build_batch_move(source_bucket, key_pairs, target_bucket, force='false'):
+    return _two_key_batch('move', source_bucket, key_pairs, target_bucket, force)
 
 
 def build_batch_delete(bucket, keys):
@@ -288,7 +288,7 @@ def _one_key_batch(operation, bucket, keys):
     return [_build_op(operation, entry(bucket, key)) for key in keys]
 
 
-def _two_key_batch(operation, source_bucket, key_pairs, target_bucket):
+def _two_key_batch(operation, source_bucket, key_pairs, target_bucket, force='false'):
     if target_bucket is None:
         target_bucket = source_bucket
-    return [_build_op(operation, entry(source_bucket, k), entry(target_bucket, v)) for k, v in key_pairs.items()]
+    return [_build_op(operation, entry(source_bucket, k), entry(target_bucket, v), 'force/{0}'.format(force)) for k, v in key_pairs.items()]

test_qiniu.py

@@ -176,6 +176,25 @@ def test_change_mime(self):
         print(info)
         assert ret == {}
 
+    def test_copy(self):
+        key = 'copyto'+rand_string(8)
+        ret, info = self.bucket.copy(bucket_name, 'copyfrom', bucket_name, key)
+        print(info)
+        assert ret == {}
+        ret, info = self.bucket.delete(bucket_name, key)
+        print(info)
+        assert ret == {}
+
+    def test_copy_force(self):
+        ret, info = self.bucket.copy(bucket_name, 'copyfrom', bucket_name, 'copyfrom', force='true')
+        print(info)
+        assert info.status_code == 200
+
+    def test_change_mime(self):
+        ret, info = self.bucket.change_mime(bucket_name, 'python-sdk.html', 'text/html')
+        print(info)
+        assert ret == {}
+
     def test_batch_copy(self):
         key = 'copyto'+rand_string(8)
         ops = build_batch_copy(bucket_name, {'copyfrom': key}, bucket_name)
@@ -187,6 +206,12 @@ def test_batch_copy(self):
         print(info)
         assert ret[0]['code'] == 200
 
+    def test_batch_copy_force(self):
+        ops = build_batch_copy(bucket_name, {'copyfrom': 'copyfrom'}, bucket_name, force='true')
+        ret, info = self.bucket.batch(ops)
+        print(info)
+        assert ret[0]['code'] == 200
+
     def test_batch_move(self):
         key = 'moveto'+rand_string(8)
         self.bucket.copy(bucket_name, 'copyfrom', bucket_name, key)
@@ -199,6 +224,15 @@ def test_batch_move(self):
         print(info)
         assert ret == {}
 
+    def test_batch_move_force(self):
+        ret,info = self.bucket.copy(bucket_name, 'copyfrom', bucket_name, 'copyfrom', force='true')
+        print(info)
+        assert info.status_code == 200
+        ops = build_batch_move(bucket_name, {'copyfrom':'copyfrom'}, bucket_name,force='true')
+        ret, info = self.bucket.batch(ops)
+        print(info)
+        assert ret[0]['code'] == 200
+
     def test_batch_rename(self):
         key = 'rename'+rand_string(8)
         self.bucket.copy(bucket_name, 'copyfrom', bucket_name, key)
@@ -211,6 +245,15 @@ def test_batch_rename(self):
         print(info)
         assert ret == {}
 
+    def test_batch_rename_force(self):
+        ret,info = self.bucket.rename(bucket_name, 'copyfrom', 'copyfrom', force='true')
+        print(info)
+        assert info.status_code == 200
+        ops = build_batch_rename(bucket_name, {'copyfrom':'copyfrom'}, force='true')
+        ret, info = self.bucket.batch(ops)
+        print(info)
+        assert ret[0]['code'] == 200
+
     def test_batch_stat(self):
         ops = build_batch_stat(bucket_name, ['python-sdk.html'])
         ret, info = self.bucket.batch(ops)