From 850ca99924d0f4235ebd0fa122b055ce162a5321 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 15 Nov 2021 11:23:48 +0000 Subject: [PATCH] url changes : ps --- api/application/helpers/video_grabber_helper.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/api/application/helpers/video_grabber_helper.php b/api/application/helpers/video_grabber_helper.php index 8183aa35..52a20857 100644 --- a/api/application/helpers/video_grabber_helper.php +++ b/api/application/helpers/video_grabber_helper.php @@ -12,7 +12,7 @@ class video_grabber_helper public function grabAllVideo($pdid,$random_string,$pd_master_details = array()) { $CI =&get_instance(); - $CI->load->helper('url_shortener'); + // $CI->load->helper('url_shortener'); if(!count($pd_master_details)) { @@ -26,23 +26,26 @@ class video_grabber_helper if($video_info->num_rows()) { $video_info = $video_info->result_array(); - $uri = url_shortener::url_shorten($pdid,$random_string); + // $uri = url_shortener::url_shorten($pdid,$random_string); //print_r($video_info);die(); foreach ($video_info as $key => $value) { $video_name = $value['composition_id'].'.mp4'; if($value['is_uploaded']){$video_name = $value['composition_id'];} $file_name = $video_name; - $shorten_url = (!empty($uri['vdo']) && ($uri[$key]['video_name'] = $value['composition_id'])) ? PDF_ATTACHEMENT_URL.$uri['vdo'][$key]['url'] : ""; + $date_of_creation = date('Ymd'); + $shorten_url = custom_encryption::encode( 'vdo/'.$date_of_creation.'/'.$pdid.'/'.$value['composition_id']); + $shorten_url = PDF_ATTACHEMENT_URL.$shorten_url; + // $shorten_url = (!empty($uri['vdo']) && ($uri[$key]['video_name'] = $value['composition_id'])) ? PDF_ATTACHEMENT_URL.$uri['vdo'][$key]['url'] : ""; if($value['s3_copied']) { $final_key = 'pd'.$pd_master_details[0]['pd_id'].'/video/'.$file_name; $singed_uri = $CI->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$final_key,'+7 days'); - $result_data[] = array('video_name' => $video_name,'url' => $singed_uri,'shorten_url'=>$shorten_url,'status' => $value['twilo_status'],'room_id' => $value['room_id'],'id' => $value['video_room_info_id']); + $result_data[] = array('video_name' => $video_name,'s3_url' => $singed_uri,'url'=>$shorten_url,'status' => $value['twilo_status'],'room_id' => $value['room_id'],'id' => $value['video_room_info_id']); } else { - $result_data[] = array('video_name' => $video_name, 'url' => '','shorten_url'=>$shorten_url,'status' =>'processing','room_id' => $value['room_id'],'id' => $value['video_room_info_id']); + $result_data[] = array('video_name' => $video_name, 's3_url' => '','url'=>'','status' =>'processing','room_id' => $value['room_id'],'id' => $value['video_room_info_id']); } }