|
@@ -204,10 +204,6 @@ class CloudStorageView(View):
|
|
|
channel = request_dict.get('channel', None)
|
|
|
storeTime = request_dict.get('time', None)
|
|
|
now_time = int(time.time())
|
|
|
- print(uid)
|
|
|
- print(channel)
|
|
|
- print(storeTime)
|
|
|
- print(now_time)
|
|
|
vh_qs = VodHlsModel.objects.filter(uid=uid, channel=channel, time=storeTime, endTime__gte=now_time). \
|
|
|
values("sec", "fg", "bucket__bucket", "bucket__endpoint", "bucket__region", "bucket__mold")
|
|
|
if not vh_qs.exists():
|
|
@@ -216,6 +212,8 @@ class CloudStorageView(View):
|
|
|
fg = vh_qs[0]['fg']
|
|
|
bucket__region = vh_qs[0]['bucket__region']
|
|
|
bucket_name = vh_qs[0]['bucket__bucket']
|
|
|
+ print(bucket__region)
|
|
|
+ print(bucket_name)
|
|
|
aws_access_key_id = 'AKIA2E67UIMD45Y3HL53'
|
|
|
aws_secret_access_key = 'ckYLg4Lo9ZXJIcJEAKkzf2rWvs8Xth1FCjqiAqUw'
|
|
|
session = Session(
|
|
@@ -229,7 +227,7 @@ class CloudStorageView(View):
|
|
|
conn = session.client('s3')
|
|
|
playlist_entries = []
|
|
|
for i in range(fg):
|
|
|
- thumbspng = '{uid}/vod{channel}/{time}/{i}.ts'. \
|
|
|
+ thumbspng = '{uid}/vod{channel}/{time}/ts{i}.ts'. \
|
|
|
format(uid=uid, channel=channel, time=storeTime, i=i)
|
|
|
response_url = conn.generate_presigned_url(
|
|
|
'get_object',
|
|
@@ -246,10 +244,14 @@ class CloudStorageView(View):
|
|
|
'duration': 10,
|
|
|
})
|
|
|
playlist = PlaylistGenerator(playlist_entries).generate()
|
|
|
- response = HttpResponse(playlist, content_type="application/vnd.apple.mpegurl")
|
|
|
- # response = HttpResponse(playlist, content_type="application/octet-stream")
|
|
|
+ response = HttpResponse(playlist)
|
|
|
+ response['Content-Type'] = 'application/octet-stream'
|
|
|
+ response['Content-Disposition'] = 'attachment;filename="play.m3u8"'
|
|
|
return response
|
|
|
- return HttpResponse(status=200, content=playlist)
|
|
|
+
|
|
|
+ # response = HttpResponse(playlist, content_type="application/vnd.apple.mpegurl")
|
|
|
+ # response = HttpResponse(playlist, content_type="application/octet-stream")
|
|
|
+ # return response
|
|
|
|
|
|
def do_get_sign_sts(self, request_dict, ip, response):
|
|
|
uidToken = request_dict.get('uidToken', None)
|