Merge pull request qiniu#209 from loyachen/dev

longbai · web-flow · commit 4e92a03311e3 · 2016-08-03T09:31:13.000+08:00
add upload_pfops.py
diff --git a/examples/batch.py b/examples/batch.py
@@ -1,11 +1,13 @@
 # -*- 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'
+
+access_key = '...'
+secret_key = '...'
 
 # 初始化Auth状态
 q = Auth(access_key, secret_key)
@@ -22,4 +24,3 @@
 print(ret)
 print(info)
 assert ret == {}
-
diff --git a/examples/copy_to.py b/examples/copy_to.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
+
 from qiniu import Auth
 from qiniu import BucketManager
 
-access_key = 'Access_Key'
-secret_key = 'Secret_Key'
+access_key = '...'
+secret_key = '...'
 
 #初始化Auth状态
 q = Auth(access_key, secret_key)
@@ -21,4 +22,4 @@
 
 ret, info = bucket.copy(bucket_name, key, bucket_name, key2)
 print(info)
-assert ret == {}
+assert ret == {}
diff --git a/examples/delete.py b/examples/delete.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
+
 from qiniu import Auth
 from qiniu import BucketManager
 
-access_key = 'Access_Key'
-secret_key = 'Secret_Key'
+access_key = '...'
+secret_key = '...'
 
 #初始化Auth状态
 q = Auth(access_key, secret_key)
@@ -19,4 +20,4 @@
 #删除bucket_name 中的文件 key
 ret, info = bucket.delete(bucket_name, key)
 print(info)
-assert ret == {}
+assert ret == {}
diff --git a/examples/download.py b/examples/download.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
-import requests
 
+import requests
 from qiniu import Auth
 
-access_key = 'AK'
-secret_key = 'SK'
+access_key = '...'
+secret_key = '...'
 
 q = Auth(access_key, secret_key)
 
@@ -20,4 +20,4 @@
 
 print(private_url)
 r = requests.get(private_url)
-assert r.status_code == 200
+assert r.status_code == 200
diff --git a/examples/fetch.py b/examples/fetch.py
@@ -4,13 +4,19 @@
 from qiniu import Auth
 from qiniu import BucketManager
 
-access_key = 'access_key'
-secret_key = 'secret_key'
-bucket_name = 'xxx'
+access_key = '...'
+secret_key = '...'
+
+bucket_name = 'Bucket_Name'
+
 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
diff --git a/examples/fops.py b/examples/fops.py
@@ -2,17 +2,17 @@
 # flake8: noqa
 from qiniu import Auth, PersistentFop, build_op, op_save, urlsafe_base64_encode
 
-#对已经上传到七牛的视频发起异步转码操作 
-access_key = 'Access_Key'
-secret_key = 'Secret_Key'
+#对已经上传到七牛的视频发起异步转码操作
+access_key = '...'
+secret_key = '...'
 q = Auth(access_key, secret_key)
 
 #要转码的文件所在的空间和文件名。
-bucket = 'Bucket_Name'
+bucket_name = 'Bucket_Name'
 key = '1.mp4'
 
 #转码是使用的队列名称。
-pipeline = 'mpsdemo'
+pipeline = 'your_pipeline'
 
 #要进行转码的转码操作。
 fops = 'avthumb/mp4/s/640x360/vb/1.25m'
@@ -21,9 +21,9 @@
 saveas_key = urlsafe_base64_encode('目标Bucket_Name:自定义文件key')
 fops = fops+'|saveas/'+saveas_key
 
-pfop = PersistentFop(q, bucket, pipeline)
+pfop = PersistentFop(q, bucket_name, pipeline)
 ops = []
 ops.append(fops)
 ret, info = pfop.execute(key, ops, 1)
 print(info)
-assert ret['persistentId'] is not None
+assert ret['persistentId'] is not None
diff --git a/examples/list.py b/examples/list.py
@@ -3,13 +3,13 @@
 from qiniu import Auth
 from qiniu import BucketManager
 
-access_key = 'access_key'
-secret_key = 'secret_key'
+access_key = '...'
+secret_key = '...'
 
 q = Auth(access_key, secret_key)
 bucket = BucketManager(q)
 
-bucket_name = 'dontdelete'
+bucket_name = 'Bucket_Name'
 # 前缀
 prefix = None
 # 列举条目
diff --git a/examples/move_to.py b/examples/move_to.py
@@ -3,8 +3,8 @@
 from qiniu import Auth
 from qiniu import BucketManager
 
-access_key = 'Access_Key'
-secret_key = 'Secret_Key'
+access_key = '...'
+secret_key = '...'
 
 #初始化Auth状态
 q = Auth(access_key, secret_key)
@@ -19,6 +19,6 @@
 #将文件从文件key 移动到文件key2，可以实现文件的重命名 可以在不同bucket移动
 key2 = 'python-logo2.png'
 
-ret, info = bucket.move(bucket_name, key, bucket_name, key2)
+ret, info = bucket.move(bucket_name, key, bucket, key2)
 print(info)
-assert ret == {}
+assert ret == {}
diff --git a/examples/stat.py b/examples/stat.py
@@ -3,8 +3,8 @@
 from qiniu import Auth
 from qiniu import BucketManager
 
-access_key = 'Access_Key'
-secret_key = 'Secret_Key'
+access_key = '...'
+secret_key = '...'
 
 #初始化Auth状态
 q = Auth(access_key, secret_key)
@@ -19,4 +19,4 @@
 #获取文件的状态信息
 ret, info = bucket.stat(bucket_name, key)
 print(info)
-assert 'hash' in ret
+assert 'hash' in ret
diff --git a/examples/upload.py b/examples/upload.py
@@ -5,8 +5,8 @@
 import qiniu.config
 
 #需要填写你的 Access Key 和 Secret Key
-access_key = 'Access_Key'
-secret_key = 'Secret_Key'
+access_key = '...'
+secret_key = '...'
 
 #构建鉴权对象
 q = Auth(access_key, secret_key)
@@ -26,4 +26,4 @@
 ret, info = put_file(token, key, localfile)
 print(info)
 assert ret['key'] == key
-assert ret['hash'] == etag(localfile)
+assert ret['hash'] == etag(localfile)
diff --git a/examples/upload_callback.py b/examples/upload_callback.py
@@ -4,8 +4,8 @@
 from qiniu import Auth, put_file, etag,
 import qiniu.config
 
-access_key = 'Access_Key'
-secret_key = 'Secret_Key'
+access_key = '...'
+secret_key = ...'
 
 q = Auth(access_key, secret_key)
 
@@ -26,4 +26,4 @@
 ret, info = put_file(token, key, localfile)
 print(info)
 assert ret['key'] == key
-assert ret['hash'] == etag(localfile)
+assert ret['hash'] == etag(localfile)
diff --git a/examples/upload_pfops.py b/examples/upload_pfops.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+# flake8: noqa
+from qiniu import Auth, put_file, etag, urlsafe_base64_encode
+import qiniu.config
+
+# access_key = '...'
+# secret_key = '...'
+
+# 初始化Auth状态
+q = Auth(access_key, secret_key)
+
+# 你要测试的空间， 并且这个key在你空间中存在
+bucket_name = 'Bucket_Name'
+key = 'python_video.flv'
+
+# 指定转码使用的队列名称
+pipeline = 'your_pipeline'
+
+# 设置转码参数（以视频转码为例）
+fops = 'avthumb/mp4/vcodec/libx264'
+
+# 通过添加'|saveas'参数，指定处理后的文件保存的bucket和key，不指定默认保存在当前空间，bucket_saved为目标bucket，bucket_saved为目标key
+saveas_key = urlsafe_base64_encode('bucket_saved:bucket_saved')#
+
+fops = fops+'|saveas/'+saveas_key
+
+# 在上传策略中指定fobs和pipeline
+policy={
+  'persistentOps':fops,
+  'persistentPipeline':pipeline
+ }
+
+token = q.upload_token(bucket_name, key, 3600, policy)
+
+localfile = './python_video.flv'
+
+ret, info = put_file(token, key, localfile)
+print(info)
+assert ret['key'] == key
+assert ret['hash'] == etag(localfile)
