From 0ca8c9781b48cf3ea421aab177555de0fe2003bb Mon Sep 17 00:00:00 2001 From: Arslan Hassan Date: Thu, 20 Dec 2012 18:05:08 +0000 Subject: [PATCH] Fixed : Conversion process --- upload/actions/send_subscription_email.php | 10 ++-- upload/actions/video_convert.php | 13 ++--- upload/cb_install/sql/upgrade_3.0.sql | 6 ++- upload/includes/classes/upload.class.php | 11 +++++ upload/includes/functions_videos.php | 57 +++++++++++++++++++--- 5 files changed, 78 insertions(+), 19 deletions(-) diff --git a/upload/actions/send_subscription_email.php b/upload/actions/send_subscription_email.php index 5bdf5674..6f4c78e5 100644 --- a/upload/actions/send_subscription_email.php +++ b/upload/actions/send_subscription_email.php @@ -17,11 +17,11 @@ if($video) { - if( - ($video['broadcast']=='public' || $video['broadcast'] =="logged") - && $video['subscription_email']=='pending') - - $userquery->sendSubscriptionEmail($video,true); + if( + ($video['broadcast']=='public' || $video['broadcast'] =="logged") + && $video['subscription_email']=='pending') + + $userquery->sendSubscriptionEmail($video,true); } ?> \ No newline at end of file diff --git a/upload/actions/video_convert.php b/upload/actions/video_convert.php index d39f3c5f..75427608 100644 --- a/upload/actions/video_convert.php +++ b/upload/actions/video_convert.php @@ -188,16 +188,17 @@ if ($process_running <= $max_processes && $queued_files) break; } } - + + $file_name = $queue['queue_name']; + + if($file_name) + exec(php_path() . " -q " . BASEDIR . "/actions/verify_videos.php $file_name &> /dev/null &"); + + if (!$convert) { $cbupload->update_queue_status($queue, 's', 'File removed from queue'); } - - - $file_name = $queue['queue_name']; - if($file_name) - exec(php_path() . " -q " . BASEDIR . "/actions/verify_videos.php $file_name &> /dev/null &"); } break; diff --git a/upload/cb_install/sql/upgrade_3.0.sql b/upload/cb_install/sql/upgrade_3.0.sql index e724b1d0..395fa624 100644 --- a/upload/cb_install/sql/upgrade_3.0.sql +++ b/upload/cb_install/sql/upgrade_3.0.sql @@ -193,5 +193,7 @@ CREATE TABLE IF NOT EXISTS `{tbl_prefix}notifications` ( --12-18-2012 @author : Fawaz ALTER TABLE `{tbl_prefix}photos` ADD `file_directory` VARCHAR( 25 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `view_exif` ---12-20-2012 @author : Arslan -ALTER TABLE `{tbl_prefix}video` ADD `emails_sent` ENUM( 'yes', 'no' ) NOT NULL DEFAULT 'no'; +--12-20-2012 @author : Arslan [Cancelled] +--ALTER TABLE `{tbl_prefix}video` ADD `emails_sent` ENUM( 'yes', 'no' ) NOT NULL DEFAULT 'no'; + +ALTER TABLE `{tbl_prefix}conversion_queue` ADD `active` ENUM( 'yes', 'no' ) NOT NULL DEFAULT 'yes' AFTER `status`; \ No newline at end of file diff --git a/upload/includes/classes/upload.class.php b/upload/includes/classes/upload.class.php index c7c0c3cb..0afc09af 100644 --- a/upload/includes/classes/upload.class.php +++ b/upload/includes/classes/upload.class.php @@ -1313,6 +1313,17 @@ class Upload { else return false; } + + + /** + * deactivate a queue + */ + function deactivate_queue($filename) + { + db_update(tbl('conversion_queue'),array( + 'active' => 'no' + )," queue_name='$filename' "); + } } diff --git a/upload/includes/functions_videos.php b/upload/includes/functions_videos.php index 3a649a3f..5f819ca4 100644 --- a/upload/includes/functions_videos.php +++ b/upload/includes/functions_videos.php @@ -599,27 +599,46 @@ function get_queued_video($update = TRUE) { /** * Function used to get video being processed */ -function get_video_being_processed($filename = NULL) +function get_video_being_processed($filename = NULL,$active='yes') { global $db; - $query = "SELECT * FROM ".tbl('conversion_queue'); - $query .= "LEFT JOIN ".tbl('video')." ON "; - $query .= tbl("video.file_name")."=".tbl('conversion_queue.queue_name'); + $ct = tbl('conversion_queue'); + $vt = tbl("video"); + + $fields = $ct.'.*,'.$ct.'.status AS queue_status'; + $fields .= ",".$vt.".*"; + + $query = "SELECT $fields FROM ".$ct; + $query .= " LEFT JOIN ".$vt." ON "; + $query .= $vt.".file_name=".$ct.".queue_name"; + + start_where(); if($filename) - $query .= " WHERE queue_name='$filename' "; + add_where(" queue_name='$filename' "); + + if($active) + add_where($ct.".active='$active' "); + + if(get_where()) + $query .= " WHERE ".get_where(); + $results = db_select($query); - $queues = array(); + end_where(); + $queues = array(); + if($results) foreach($results as $queue) { //Get Files of the qeueue... $queue['files'] = get_video_files($filename); $queues[] = $queue; } + + return $queues; } @@ -742,6 +761,7 @@ function get_hq_video_file($vdetails, $return_default = true) { /** * Function used to update processed video * @param Files details + * @deprecated 2012 3.0 */ function update_processed_video($file_array, $status = 'Successful', $ingore_file_status = false, $failed_status = '') { global $db; @@ -778,6 +798,16 @@ function update_processed_video($file_array, $status = 'Successful', $ingore_fil } } +function update_video_status($file_name,$status,$reason=NULL) +{ + db_update(tbl('video'),array( + 'status' => $status, + 'failed_reason' => $reason + )," file_name='$file_name' "); + + return true; +} + /** * This function will activate the video if file exists */ @@ -1213,4 +1243,19 @@ function get_size_by_name($name) return $sizes[$name]; +} + + +/** + * function used to update specific field of the vide + * @param INT videoid + * @param STRING fieldname + * @param STRING value + * + * @return TRUE + */ +function update_video_data($vid,$field,$val) +{ + $vid = mysql_clean($vid); + db_update(tbl('video'),array($field=>$val),"videoid='$vid' "); } \ No newline at end of file