ben/handbrake-cluster-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added optional limits to Job Lists and hid dummy

Browse Source 
Added optional limit to the number of jobs retrieved for a given status.
Added conditions to hide a dummy job used to keep the database
consistent when logging client-side info not tied to a specific job.
This commit is contained in:
Ben Roberts
2010-08-22 22:59:49 +01:00
parent 0ca5a716d6
commit d6c2c1b9b3
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/HandBrakeCluster/Job.class.php
View File

@@ -52,7 +52,7 @@ class HandBrakeCluster_Job {
public static function fromDatabaseRow($row) {
return new HandBrakeCluster_Job(
HandBrakeCluster_Rips_Source::load($row['source']),
HandBrakeCluster_Rips_Source::load($row['source'], false),
$row['id'],
$row['name'],
$row['source'],
@@ -101,7 +101,7 @@ class HandBrakeCluster_Job {
$jobs = array();
$database = HandBrakeCluster_Main::instance()->database();
foreach ($database->selectList('SELECT * FROM jobs') as $row) {
foreach ($database->selectList('SELECT * FROM jobs WHERE id > 0') as $row) {
$job = self::fromDatabaseRow($row);
self::$cache[$job->id] = $job;
@@ -111,13 +111,21 @@ class HandBrakeCluster_Job {
return $jobs;
}
public static function allWithStatus($status) {
public static function allWithStatus($status, $limit = null) {
$jobs = array();
$database = HandBrakeCluster_Main::instance()->database();
foreach ($database->selectList('SELECT * FROM jobs WHERE id IN (SELECT job_id FROM job_status_current WHERE status=:status)', array(
array('name' => 'status', 'value' => $status, 'type' => PDO::PARAM_INT)
)) as $row) {
$params = array(
array('name' => 'status', 'value' => $status, 'type' => PDO::PARAM_INT),
);
$limitSql = '';
if ($limit) {
$limitSql = 'LIMIT :limit';
$params[] = array('name' => 'limit', 'value' => $limit, 'type' => PDO::PARAM_INT);
}
foreach ($database->selectList("SELECT * FROM jobs WHERE id IN (SELECT job_id FROM job_status_current WHERE id > 0 AND status=:status) ORDER BY id {$limitSql}", $params) as $row) {
$jobs[] = self::fromDatabaseRow($row);
}