Updated worker to copy rather than move output to final location

This causes ACLs to be inherited from the destination, rather than
preserving permissions from the temporary build location on the local
machine.

source/lib/Net/Gearman/Job/HandBrake.class.php

@@ -30,11 +30,14 @@ class Net_Gearman_Job_HandBrake extends Net_Gearman_Job_Common implements Rippin
         
         $this->job = RippingCluster_Job::fromId($args['rip_options']['id']);
         
+        // Substitute a temporary output filename into the rip options
+        $args['temp_output_filename'] = tempnam($config->get('rips.temp_dir', '/tmp'), 'hbr_');  
+        
         $handbrake_cmd_raw = array(
             '-n', $config->get('rips.nice'),
             $config->get('rips.handbrake_binary'),
             self::evaluateOption($args['rip_options'], 'input_filename', '-i'),
-            self::evaluateOption($args['rip_options'], 'output_filename', '-o'),
+            self::evaluateOption($args, 'temp_output_filename', '-o'),
             self::evaluateOption($args['rip_options'], 'title'),
             self::evaluateOption($args['rip_options'], 'format', '-f'),
             self::evaluateOption($args['rip_options'], 'video_codec', '-e'),
@@ -61,12 +64,34 @@ class Net_Gearman_Job_HandBrake extends Net_Gearman_Job_Common implements Rippin
 
         list($return_val, $stdout, $stderr) = RippingCluster_ForegroundTask::execute($handbrake_cmd, null, null, null, array($this, 'callbackOutput'), array($this, 'callbackOutput'), $this);
         if ($return_val) {
+            // Remove any temporary output files
+            if (file_exists($args['temp_output_filename'])) {
+                $result = unlink($args['temp_output_filename']);
+                if ($result) {
+                    RippingCluster_WorkerLogEntry::warning($log, $this->job->id(), "Failed to remove temporary output file, still exists at '{$args['temp_output_filename']}'.");
+                }
+            }
             $this->fail($return_val);
         } else {
+            // Copy the temporary output file to the desired destination
+            $move = copy($args['temp_output_filename'], $args['rip_options']['output_filename']);
+            if ($move) {
+                // Remove the temporary output file
+                $result = unlink($args['temp_output_filename']);
+                if ($result) {
+                    RippingCluster_WorkerLogEntry::warning($log, $this->job->id(), "Failed to remove temporary output file, still exists at '{$args['temp_output_filename']}'.");
+                }
+                                
+                //Report success
                 $this->job->updateStatus(RippingCluster_JobStatus::COMPLETE);
                 $this->complete( array(
                 	'id' => $this->job->id()
                 ));
+            } else {
+                RippingCluster_WorkerLogEntry::error($log, $this->job->id(), "Failed to copy temporary output file to proper destination. File retained as '{$args['temp_output_filename']}'.");
+                $this->job->updateStatus(RippingCluster_JobStatus::FAILED);
+                $this->fail('-1');
+            }
         }
     }
     

source/lib/RippingCluster/Job.class.php

@@ -272,6 +272,19 @@ class RippingCluster_Job {
         return $new_status;
     }
     
+    public function isFinished() {
+        $current_status = $this->currentStatus()->status();
+        return ($current_status == RippingCluster_JobStatus::COMPLETE || $current_status == RippingCluster_JobStatus::FAILED);
+    }
+    
+    public function outputFilesize() {
+        if (file_exists($this->destination_filename)) {
+            return filesize($this->destination_filename);
+        }
+        
+        return null;
+    }
+    
     public function calculateETA() {
         $current_status = $this->currentStatus();
         if ($current_status->status() != RippingCluster_JobStatus::RUNNING) {

source/lib/RippingCluster/Main.class.php

@@ -18,13 +18,15 @@ class RippingCluster_Main extends SihnonFramework_Main {
 
         switch (HBC_File) {
             case 'index': {
+                $smarty_tmp = '/tmp/ripping-cluster';
                 $this->smarty = new Smarty();
-                $this->smarty->template_dir = './source/templates';
+                $this->smarty->template_dir = static::makeAbsolutePath('./source/templates');
-                $this->smarty->compile_dir  = './tmp/templates';
+                $this->smarty->compile_dir  = static::makeAbsolutePath($smarty_tmp . '/tmp/templates');
-                $this->smarty->cache_dir    = './tmp/cache';
+                $this->smarty->cache_dir    = static::makeAbsolutePath($smarty_tmp . '/tmp/cache');
-                $this->smarty->config_dir   = './config';
+                $this->smarty->config_dir   = static::makeAbsolutePath($smarty_tmp . '/config');
                  
                 $this->smarty->registerPlugin('modifier', 'formatDuration', array('RippingCluster_Main', 'formatDuration'));
+                $this->smarty->registerPlugin('modifier', 'formatFilesize', array('RippingCluster_Main', 'formatFilesize'));
 
                 $this->smarty->assign('version', '0.1');
                 $this->smarty->assign('messages', array());

webui/source/templates/jobs.tpl

@@ -43,7 +43,12 @@
                 {assign var=current_status value=$job->currentStatus()}
                 <tr>
                     <td><a href="{$base_uri}job-details/id/{$job->id()}" title="View job details">{$job->name()}</a></td>
-                    <td>{$job->destinationFilename()}</td>
+                    <td>
+                    	{$job->destinationFilename()}
+                    	{if $job->isFinished()}
+                    		({$job->outputFilesize()|formatFilesize})
+                    	{/if}
+                    </td>
                     <td>{$job->title()}</td>
                     <td>
                         {$current_status->statusName()}