From f8224652aa6af2a3ba70e2f199eb110dd8dc3a7e Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben@sihnon.net>
Date: Sun, 25 Sep 2011 11:07:22 +0100
Subject: [PATCH] Simplify data returned from runAllJobs and fix logging bug in
 run-jobs

---
 source/lib/RippingCluster/Job.class.php | 5 ++++-
 webui/run-jobs.php                      | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/source/lib/RippingCluster/Job.class.php b/source/lib/RippingCluster/Job.class.php
index 7220257..8ec3a2d 100644
--- a/source/lib/RippingCluster/Job.class.php
+++ b/source/lib/RippingCluster/Job.class.php
@@ -244,7 +244,10 @@ class RippingCluster_Job {
             'subtitle_tracks' => $this->subtitle_tracks,
         );
         
-        return array('HandBrake', array('rip_options' => $rip_options));
+        return array(
+        	'method' => 'HandBrake', 
+        	'rip_options' => $rip_options
+        );
     }
 
     protected function loadStatuses() {
diff --git a/webui/run-jobs.php b/webui/run-jobs.php
index 4ed5941..3c48029 100644
--- a/webui/run-jobs.php
+++ b/webui/run-jobs.php
@@ -22,14 +22,14 @@ try {
     
     foreach ($jobs as $job) {
         // Enqueue the job using gearman
-        list($method, $rip_options) = $job->queue();
-        $task = new Net_Gearman_Task($method, $rip_options);
+        $args = $job->queue();
+        $task = new Net_Gearman_Task($args['method'], $args['rip_options']);
         $task->attachCallback('gearman_complete', Net_Gearman_Task::TASK_COMPLETE);
         $task->attachCallback('gearman_fail', Net_Gearman_Task::TASK_FAIL);
         $set->addTask($task);
         
         $job->updateStatus(RippingCluster_JobStatus::QUEUED);
-        RippingCluster_ClientLogEntry::info($log, $rip_options['id'], 'Job queued', 'client');
+        RippingCluster_ClientLogEntry::info($log, $args['rip_options']['id'], 'Job queued', 'client');
     }
     
     $job_count = count($jobs);