Skip to content

Commit 9e6a0b9

Browse files
author
金山云SDK
authored
Merge pull request KscSDK#62 from zhugelaing888/trunk
Trunk
2 parents 8a46604 + 29e7361 commit 9e6a0b9

File tree

3 files changed

+102
-19
lines changed

3 files changed

+102
-19
lines changed

‎examples/kvs.py

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
#ks_access_key_id='xxxxxxxxxxxxxxxxxxxx'
88
#ks_secret_access_key='xxxxxxxxxxxxxxxxxxxxxxx'
99
# 参数：服务service_name,大区region_name
10-
#client = getOfflineClient("offline", "cn-beijing-6",use_ssl=False,ks_access_key_id=ks_access_key_id,ks_secret_access_key=ks_secret_access_key)
10+
#client = getKvsClient("offline", "cn-beijing-6",use_ssl=False,ks_access_key_id=ks_access_key_id,ks_secret_access_key=ks_secret_access_key)
1111

1212
#配置kscore.cfg调用方式
1313

1414
client = getKvsClient("kvs", "cn-beijing-6",use_ssl=False)
1515

1616
#创建模板接口调用示例 : preset
17-
presetname = 'testpreset'
17+
presetname = 'xxxx'
1818
description = 'just a demo'
1919
presetType = 'avop'
2020

@@ -26,16 +26,10 @@
2626
"Param": {
2727
"f": "mp4",
2828
"AUDIO": {
29-
"acodec": "aac",
30-
"ar":"44100",
31-
"ab":"64k"
29+
"acodec": "aac"
3230
},
3331
"VIDEO": {
34-
"vr": 25,
35-
"vb": "500k",
36-
"vcodec": "h264",
37-
"width": 640,
38-
"height": 360
32+
"vcodec": "h264"
3933
}
4034
}
4135
}
@@ -54,7 +48,7 @@
5448
# WithDetail:是否查询模板详情，1-是 0-否
5549
# PresetType:模板类型，多种模板类型以逗号隔开
5650
# Presets:模板名称，多个模板名称以逗号隔开
57-
res = client.GetPresetList(WithDetail=1,PresetType="avop")
51+
res = client.GetPresetList(WithDetail=1,PresetType="xxxx")
5852
print json.dumps(res)
5953

6054
#获取模板信息接口调用示例 : GetPresetDetail
@@ -89,27 +83,31 @@
8983
#具体参数请参考官方文档
9084
task = {
9185
"DstDir": "",
92-
"DstObjectKey": "4.mp4",
93-
"DstBucket": "autotestoffline",
86+
"DstObjectKey": "xxxx",
87+
"DstBucket": "xxxx",
9488
"DstAcl": "public-read",
9589
"Preset": presetname,
9690
"SrcInfo": [
9791
{
98-
"path": "/autotestoffline/11.mp4",
92+
"path": "/xxxxx/xxxxx",
9993
"type": "video",
10094
"index": 0
10195
}
10296
],
10397
"CbMethod": "POST",
104-
"CbUrl": "http://10.4.2.38:19090/"
98+
"CbUrl": "xxxxx"
10599
}
106100

107101
#该接口需要输入json格式数据
108102
res = client.CreateTask(task)
109103
print json.dumps(res)
110104

105+
#该接口需要输入json格式数据
106+
res = client.CreateFlowTask(task)
107+
print json.dumps(res)
108+
111109
#查看任务状态接口调用示例 : GetTaskByTaskID
112-
taskid = "40d309d3b2bf373cd3f08e5b5e1bddf720160816"
110+
taskid = "xxxxxx"
113111
# TaskID:任务ID
114112
res = client.GetTaskByTaskID(TaskID = taskid)
115113
print json.dumps(res)
@@ -120,6 +118,10 @@
120118
# EndDate:截止时间，默认为开始时间加30天；若大于当前时间，则默认为当前时间；格式：20160930
121119
# Marker:请求起始游标，默认为0
122120
# Limit:单次请求的记录数，默认为100，最大值为100
121+
# StartTime:起始时间戳
122+
# EndTime:结束时间戳
123+
# 错误码:ErrorCode
124+
# 任务状态:TaskStatus
123125
res = client.GetTaskList(StartDate=20170100,EndDate=20170112,Marker=0,Limit=50)
124126
print json.dumps(res)
125127

@@ -167,3 +169,16 @@
167169

168170
res = client.GetScreenshotNumber(StartUnixTime, EndUnixTime, Granularity, ResultType)
169171
print json.dumps(res)
172+
173+
#控制台专用
174+
#发起媒体转码
175+
res = client.FetchObjectMediaProcess(task)
176+
print json.dumps(res)
177+
178+
#查询任务列表
179+
res = client.ListFetchObjectMediaProcess(StartUnixTime=StartUnixTime,EndUnixTime=EndUnixTime)
180+
print json.dumps(res)
181+
182+
#查询单个任务详情
183+
res = client.GetFetchObjectMediaProcess(ProcessTaskId="12121212")
184+
print json.dumps(res)

‎kscore/data/kvs/2017-01-01/service-2.yaml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,21 @@ operations:
4444
input:
4545
shape: PresetInstance
4646

47+
CreateFlowTask:
48+
name: CreateFlowTask
49+
http:
50+
method: POST
51+
4752
CreateTask:
4853
name: CreateTask
4954
http:
5055
method: POST
5156

57+
FetchObjectMediaProcess:
58+
name: FetchObjectMediaProcess
59+
http:
60+
method: POST
61+
5262
DelTaskByTaskID:
5363
name: DelTaskByTaskID
5464
http:
@@ -114,6 +124,22 @@ operations:
114124
http:
115125
method: GET
116126

127+
ListFetchObjectMediaProcess:
128+
name: ListFetchObjectMediaProcess
129+
http:
130+
method: GET
131+
requestUri: /
132+
input:
133+
shape: ListFetchObjectMediaProcessInstance
134+
135+
GetFetchObjectMediaProcess:
136+
name: GetFetchObjectMediaProcess
137+
http:
138+
method: GET
139+
requestUri: /
140+
input:
141+
shape: GetFetchObjectMediaProcessInstance
142+
117143
shapes:
118144
Preset:
119145
type: string
@@ -131,6 +157,8 @@ shapes:
131157
type: integer
132158
Marker:
133159
type: integer
160+
Marker1:
161+
type: string
134162
Limit:
135163
type: integer
136164
PipelineName:
@@ -143,6 +171,16 @@ shapes:
143171
type: integer
144172
ResultType:
145173
type: integer
174+
ProcessTaskId:
175+
type: string
176+
ErrorCode:
177+
type: string
178+
TaskStatus:
179+
type: string
180+
StartTime:
181+
type: integer
182+
EndTime:
183+
type: integer
146184
PresetInstance:
147185
type: structure
148186
members:
@@ -173,6 +211,14 @@ shapes:
173211
shape: Marker
174212
Limit:
175213
shape: Limit
214+
ErrorCode:
215+
shape: ErrorCode
216+
TaskStatus:
217+
shape: TaskStatus
218+
StartTime:
219+
shape: StartTime
220+
EndTime:
221+
shape: EndTime
176222
GetTaskByTaskIDInstance:
177223
type: structure
178224
members:
@@ -198,4 +244,20 @@ shapes:
198244
shape: Granularity
199245
ResultType:
200246
shape: ResultType
247+
ListFetchObjectMediaProcessInstance:
248+
type: structure
249+
members:
250+
StartUnixTime:
251+
shape: StartUnixTime
252+
EndUnixTime:
253+
shape: EndUnixTime
254+
Marker:
255+
shape: Marker1
256+
Limit:
257+
shape: Limit
201258

259+
GetFetchObjectMediaProcessInstance:
260+
type: structure
261+
members:
262+
ProcessTaskId:
263+
shape: ProcessTaskId

‎kscore/kvs.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,22 @@ def GetPresetDetail(self,Preset=''):
2828
def CreateTask(self,task):
2929
return self.client.create_task(**task)
3030

31+
def CreateFlowTask(self,task):
32+
return self.client.create_flow_task(**task)
33+
34+
def FetchObjectMediaProcess(self,task):
35+
return self.client.fetch_object_media_process(**task)
36+
3137
def GetTaskByTaskID(self,TaskID=''):
3238
return self.client.get_task_by_task_id(TaskID=TaskID)
3339

34-
def GetTaskList(self,StartDate=0,EndDate=0,Marker=0,Limit=100):
40+
def GetTaskList(self,StartDate=0,EndDate=0,Marker=0,Limit=100,StartTime=0,EndTime=0,ErrorCode='',TaskStatus=''):
3541
if StartDate == 0:
3642
StartDate = int(time.strftime('%Y%m',time.localtime(time.time()))+"01")
3743
if EndDate == 0:
38-
return self.client.get_task_list(StartDate=StartDate,Marker=Marker,Limit=Limit)
44+
return self.client.get_task_list(StartDate=StartDate,Marker=Marker,Limit=Limit,StartTime=StartTime,EndTime=EndTime,ErrorCode=ErrorCode,TaskStatus=TaskStatus)
3945
else:
40-
return self.client.get_task_list(StartDate=StartDate,EndDate=EndDate,Marker=Marker,Limit=Limit)
46+
return self.client.get_task_list(StartDate=StartDate,EndDate=EndDate,Marker=Marker,Limit=Limit,StartTime=StartTime,EndTime=EndTime,ErrorCode=ErrorCode,TaskStatus=TaskStatus)
4147

4248
def DelTaskByTaskID(self,TaskID = ''):
4349
return self.client.del_task_by_task_id(TaskID = TaskID)

0 commit comments

Comments
 (0)