|
|
@@ -105,7 +105,7 @@ class CloudVodView(View):
|
|
|
if operation == 'getHlsList':
|
|
|
return self.do_get_playlist(request_dict, userID, response)
|
|
|
|
|
|
- return self.do_get_hls_list(request_dict, userID, response)
|
|
|
+ # return self.do_get_hls_list(request_dict, userID, response)
|
|
|
elif operation == 'createOrder':
|
|
|
return self.do_create_order(request_dict, userID, response)
|
|
|
elif operation == 'status':
|
|
|
@@ -615,14 +615,19 @@ class CloudVodView(View):
|
|
|
bucket = oss2.Bucket(auth, endpoint, bucket_name)
|
|
|
m3u8 = '{uid}/vod{channel}/{daytime}/{time}/{time}.m3u8'. \
|
|
|
format(uid=UID, channel=channel, daytime=daytime, time=vod['time'])
|
|
|
- ts = '{uid}/vod{channel}/{daytime}/{time}/ts0.ts'.format(uid=UID, channel=channel, daytime=daytime,
|
|
|
- time=vod['time'])
|
|
|
+ ts = '{uid}/vod{channel}/{daytime}/{time}/ts0.ts'.\
|
|
|
+ format(uid=UID, channel=channel, daytime=daytime, time=vod['time'])
|
|
|
url = bucket.sign_url('GET', m3u8, 3600, params={'x-oss-process': 'hls/sign'})
|
|
|
urllst = url.split('?')
|
|
|
url_start = urllib.parse.unquote(urllst[0])
|
|
|
url_end = urllst[1]
|
|
|
- vod_play_url = '{url_start}?{url_end}'.format(url_start=url_start, url_end=url_end)
|
|
|
+ vod_play_url = '{url_start}?{url_end}'.\
|
|
|
+ format(url_start=url_start, url_end=url_end)
|
|
|
thumb = bucket.sign_url('GET', ts, 3600,
|
|
|
params={'x-oss-process': 'video/snapshot,t_10000,m_fast,w_300'})
|
|
|
vod_play_list.append({'name': vod['time'], 'sign_url': vod_play_url, 'thumb': thumb, 'sec': vod['sec']})
|
|
|
return response.json(0, vod_play_list)
|
|
|
+
|
|
|
+ def do_filter_playlist(self,request_dict,userID,response):
|
|
|
+
|
|
|
+ return
|
chenjunkai