Merge pull request KscSDK#13 from KscSDK/trunk

金山云SDK · web-flow · commit 529503724318 · 2016-10-20T16:33:16.000+08:00
merge bug fix code from trunk version
diff --git a/README.rst b/README.rst
@@ -79,6 +79,8 @@ Service 服务
     +-------------------+------------+
     | monitor           |            |
     +-------------------+------------+
+    | offline           |            |
+    +-------------------+------------+
 
 ----------------
 Method 方法
@@ -164,6 +166,50 @@ Examples 示例
 
         print json.dumps(m,sort_keys=True,indent=4)
 
++ OFFLINE
+
+::
+
+    from kscore.session import get_session
+    import json
+    
+    if __name__=="__main__":
+        
+        #初始化
+        s = get_session()
+        client = s.create_client("offline", "cn-beijing-6", use_ssl=False)
+        
+        #创建模板接口调用示例 : preset  
+        presetname = 'testpreset'
+        description = 'just a demo'
+        presetType = 'avop'
+        param = {
+           "preset": presetname,
+           "description": description,
+           "presettype": presetType,
+           "param": {
+               "f": "mp4",
+               "AUDIO": {
+                   "acodec": "aac",
+                   "ar":"44100",
+                   "ab":"64k"
+               },
+               "VIDEO": {
+                   "vr": 25,
+                   "vb": "500k",
+                   "vcodec": "h264",
+                   "width": 640,
+                   "height": 360
+               }
+           }
+        }
+        res = client.preset(**param)
+        print json.dumps(res)
+        
+        #获取模板信息接口调用示例 : get_preset_detail
+        res = client.get_preset_detail(preset = presetname)
+        print json.dumps(res)
+
 + 更多
 
 --------------------
diff --git a/examples/offline.py b/examples/offline.py
@@ -95,4 +95,8 @@
 
 #任务置顶接口调用示例 : top_task_by_task_id
 res = client.top_task_by_task_id(taskid = taskid)
+print json.dumps(res)
+
+#查询任务META列表接口调用示例 : get_task_meta_info
+res = client.get_task_meta_info(taskid = taskid)
 print json.dumps(res)
diff --git a/kscore/data/offline/2016-09-19/service-2.yaml b/kscore/data/offline/2016-09-19/service-2.yaml
@@ -78,6 +78,13 @@ operations:
       requestUri: /
     input:
       shape: TaskIDInstance
+  GetTaskMetaInfo:
+    name: GetTaskMetaInfo
+    http:
+      method: GET
+      requestUri: /
+    input:
+      shape: TaskIDInstance
 
 shapes:  
   Preset:
@@ -90,8 +97,6 @@ shapes:
     max: 45
   PresetInstance:
     type: structure
-    required:
-      - preset
     members:
       preset:
         shape: Preset
@@ -102,10 +107,8 @@ shapes:
         shape: WithDetail
   TaskIDInstance:
     type: structure
-    required:
-      - taskid
     members:
       taskid:
         shape: TaskID
 
-  
+  
