vanzhiganov/clipbucket
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed : Updated sql

Browse source 
Foxed : Baseurl
ADded : get_videos_files in functions_videos.php
This commit is contained in:
Arslan Hassan 2012-12-20 15:54:42 +00:00
parent 817d0bdf0d
commit 3d66b27521
6 changed files with 49 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
upload/actions/video_convert.php
View file

@ -20,7 +20,7 @@ $max_processes = 5;
//Get Vido
$queued_files = $cbupload->get_queued_files();
define('CONV_TEST_MODE', true);
define('CONV_TEST_MODE', false);
//Total Running proccesses...
$process_running = $cbupload->conversion_count();
@ -179,6 +179,8 @@ if ($process_running <= $max_processes && $queued_files)
'output_results' => json_encode($output_details),
'date_completed' => $time_finished,
);
$cbupload->update_video_file($fid, $fields);
@ -191,6 +193,11 @@ if ($process_running <= $max_processes && $queued_files)
{
$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;

3
upload/cb_install/sql/upgrade_3.0.sql
View file

@ -192,3 +192,6 @@ 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';

2
upload/includes/classes/upload.class.php
View file

@ -1277,7 +1277,7 @@ class Upload {
*/
function update_video_file($fid, $values) {
global $db;
db_update(tbl('video_files'),$values,"file_id='$fid' ");
//$db->update(tbl('video_files'), $flds, $vals, "file_id='$fid' ");

2
upload/includes/classes/video.class.php
View file

@ -2302,7 +2302,7 @@ class CBvideo extends CBCategory {
}
$query = "SELECT * FROM " .
$query .= tbl('video_files');
$query .= tbl('video_files');
$query .= " LEFT JOIN " . tbl('video_profiles');
$query .= " ON " . tbl('video_files.profile_id') . " = " . tbl('video_profiles.profile_id');
$query .= " WHERE " . tbl('video_files.file_name') . "='$file'";

8
upload/includes/common.php
View file

@ -128,15 +128,17 @@ if (count($matches) > 0)
}
//define('BASEURL',baseurl(BACK_END));
$clean_base = false;
if (defined("CLEAN_BASEURL"))
$clean_base = CLEAN_BASEURL;
if(@$_REQUEST['api']=='yes')
{
define('BASEURL',$pages->GetBaseUrl($clean_base));
}else
define('BASEURL', $baseurl);
///define('BASEURL',$pages->GetBaseUrl($clean_base));
}
define('BASEURL', $baseurl);
$userquery = new userquery();
$lang_obj = new language;

38
upload/includes/functions_videos.php
View file

@ -599,16 +599,40 @@ 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)
{
global $db;
if ($fileName) {
$queueName = getName($fileName);
$ext = getExt($fileName);
$fileNameQuery = " AND cqueue_name ='$queueName' AND cqueue_ext ='$ext' ";
$query = "SELECT * FROM ".tbl('conversion_queue');
$query .= "LEFT JOIN ".tbl('video')." ON ";
$query .= tbl("video.file_name")."=".tbl('conversion_queue.queue_name');
if($filename)
$query .= " WHERE queue_name='$filename' ";
$results = db_select($query);
$queues = array();
foreach($results as $queue)
{
//Get Files of the qeueue...
$queue['files'] = get_video_files($filename);
$queues[] = $queue;
}
}
$results = $db->select(tbl("conversion_queue"), "*", "cqueue_conversion='p' $fileNameQuery");
function get_video_files($filename)
{
$query = "SELECT * FROM " .
$query .= tbl('video_files');
$query .= " LEFT JOIN " . tbl('video_profiles');
$query .= " ON " . tbl('video_files.profile_id') . " = " . tbl('video_profiles.profile_id');
$query .= " WHERE " . tbl('video_files.file_name') . "='$filename'";
$results = db_select($query);
return $results;
}