Merge branch 'release-0.3'

Version bump to 0.3
Merge branch 'feature-settings' into develop
2011-08-29 19:28:03 +01:00 · 2011-08-29 19:27:40 +01:00 · 2011-08-29 19:24:09 +01:00 · 2011-08-29 19:22:56 +01:00 · 2011-08-29 19:20:28 +01:00 · 2011-08-28 16:19:52 +01:00
119 changed files with 2324 additions and 1790 deletions
--- a/build/ripping-cluster-worker.init-gentoo
+++ b/build/ripping-cluster-worker.init-gentoo
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PID_FILE="/var/run/ripping-cluster-worker.pid"
+
+depend() {
+	need localmount net
+	use dns logger puppetmaster netmount nfsmount
+}
+
+start() {
+	ebegin "Starting ripping-cluster-worker"
+	start-stop-daemon --start --quiet \
+		--background --make-pidfile --pidfile ${PID_FILE} \
+		--exec /usr/bin/php /usr/lib/ripping-cluster/worker/ripping-cluster-worker.php
+	eend $? "Failed to start ripping-cluster-worker"
+}
+
+stop() {
+	ebegin "Stopping ripping-cluster-worker"
+	start-stop-daemon --stop --quiet \
+		--pidfile ${PID_FILE}
+	local ret=$?
+	eend ${ret} "Failed to stop puppet"
+	rm -f ${PID_FILE}
+	return ${ret}
+}
+
--- a/config.php.dist
+++ b/config.php.dist
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * RippingCluster Library path
- * 
- * Specifies the absolute or relative path to the RippingCluster library directory, relative to the webui root directory.
- * Path must end with a trailing slash.
- * 
- * @var string
- */
-define('RippingCluster_Lib', '../lib/');
-
-/**
- * RippingCluster Database Configuration
- * 
- * Specifies the absolute or relative path to the RippingCluster database configuration file. 
- * This is a standard ini type file, containing the config required to connect to the database.
- * 
- * @var string
- */
-define('RippingCluster_DBConfig', '../dbconfig.conf');
-
-?>
--- a/dbconfig.conf.dist
+++ b/dbconfig.conf.dist
@@ -1,5 +0,0 @@
-hostname = localhost
-username = handbrake
-password = handbrake
-dbname   = handbrake_cluster
-
--- a/lib/RippingCluster/BackgroundTask.class.php
+++ b/lib/RippingCluster/BackgroundTask.class.php
@@ -1,17 +0,0 @@
-<?php
-
-class RippingCluster_BackgroundTask {
-
-    protected function __construct() {
-        
-    }
-
-    public static function run($command) {
-        $pipes = array();
-        $pid = proc_open($command . ' &', array(), $pipes);
-        proc_close($pid);
-    }
-    
-};
-
-?>
--- a/lib/RippingCluster/Cache.class.php
+++ b/lib/RippingCluster/Cache.class.php
@@ -1,62 +0,0 @@
-<?php
-
-class RippingCluster_Cache {
-    
-    protected $config;
-    protected $cache_dir;
-    
-    public function __construct(RippingCluster_Config $config) {
-        $this->config = $config;
-        $this->cache_dir = $config->get('cache.base_dir');
-        
-        if (is_dir($this->cache_dir)) {
-            if ( ! is_writeable($this->cache_dir)) {
-                throw new RippingCluster_Exception_InvalidCacheDir();
-            }
-        } else {
-            if ( ! RippingCluster_Main::mkdir_recursive($this->cache_dir)) {
-                throw new RippingCluster_Exception_InvalidCacheDir();
-            }
-        }
-    }
-    
-    protected function cacheFilename($source_filename) {
-        return $this->cache_dir . sha1($source_filename);
-    }
-    
-    public function exists($source_filename, $ttl = 3600) {
-        $cache_filename = $this->cacheFilename($source_filename);
-        
-        // Check to see if the file is cached
-        if (!file_exists($cache_filename)) {
-            return false;
-        }
-        
-        // Check to see if the cache has expired
-        if (filemtime($cache_filename) + $ttl < time()) {
-            // Delete the cached item
-            unlink($cache_filename);
-            return false;
-        }
-        
-        return true;
-    }
-    
-    public function store($source_filename, $content) {
-        $cache_filename = $this->cacheFilename($source_filename);
-        return file_put_contents($cache_filename, $content);
-    }
-    
-    public function fetch($source_filename, $ttl = 3600) {
-        $cache_filename = $this->cacheFilename($source_filename);
-        
-        if (!$this->exists($source_filename)) {
-            throw new RippingCluster_Exception_CacheObjectNotFound($source_filename);
-        }
-        
-        return file_get_contents($cache_filename);
-    }
-    
-};
-
-?>
--- a/lib/RippingCluster/ClientLogEntry.class.php
+++ b/lib/RippingCluster/ClientLogEntry.class.php
@@ -1,13 +0,0 @@
-<?php
-
-class RippingCluster_ClientLogEntry extends RippingCluster_LogEntry {
-
-    public static function initialise() {
-        parent::$table_name = 'client_log';
-    }
-
-};
-
-RippingCluster_ClientLogEntry::initialise();
-
-?>
--- a/lib/RippingCluster/Config.class.php
+++ b/lib/RippingCluster/Config.class.php
@@ -1,145 +0,0 @@
-<?php
-
-class RippingCluster_Config {
-    
-    /**
-     * Boolean value type
-     * @var bool
-     */
-    const TYPE_BOOL        = 'bool';
-    
-    /**
-     * Integer value type
-     * @var int
-     */
-    const TYPE_INT         = 'int';
-    
-    /**
-     * Float value type
-     * @var float
-     */
-    const TYPE_FLOAT       = 'float';
-    
-    /**
-     * String value type
-     * @var string
-     */
-    const TYPE_STRING      = 'string';
-    
-    /**
-     * String List value type; list of newline separated strings
-     * @var array(string)
-     */
-    const TYPE_STRING_LIST = 'array(string)';
-
-    /**
-     * Contents of the dbconfig file 
-     * @var string
-     */
-    private $dbconfig;
-    
-    /**
-     * Database object created for the lifetime of this script
-     * @var RippingCluster_Database
-     */
-    private $database;
-
-    /**
-     * Associative array of connection parameters for the database configuration
-     * @var array(string=>string)
-     */
-    private $databaseConfig = array();
-    
-    /**
-     * Associative array of settings loaded from the database
-     * @var array(string=>array(string=>string))
-     */
-    private $settings       = array();
-
-    /**
-     * Constructs a new instance of the Config class
-     *
-     * @param string $dbconfig Database configuration file contents
-     * @return RippingCluster_Config
-     */
-    public function __construct($dbconfig) {
-        $this->dbconfig = $dbconfig;
-        
-        $this->parseDatabaseConfig();
-    }
-
-    /**
-     * Parses the contents of the database configuration file so that individual settings can be retrieved.
-     *
-     */
-    public function parseDatabaseConfig() {
-        $this->databaseConfig = parse_ini_file($this->dbconfig);
-    }
-
-    /**
-     * Returns the value of the named item from the database configuration file
-     *
-     * @param string $key Name of the setting to retrieve
-     */
-    public function getDatabase($key) {
-        if (!isset($this->databaseConfig[$key])) {
-            throw new RippingCluster_Exception_DatabaseConfigMissing($key);
-        }
-
-        return $this->databaseConfig[$key];
-    }
-
-    /**
-     * Sets the database instance used by this object
-     * 
-     * @param RippingCluster_Database $database Database instance
-     */
-    public function setDatabase(RippingCluster_Database $database) {
-        $this->database = $database;
-        $this->preload();
-    }
-
-    /**
-     * Loads the entire list of settings from the database
-     * 
-     */
-    private function preload() {
-        if (!$this->database) {
-            throw new RippingCluster_Exception_NoDatabaseConnection();
-        }
-
-        $this->settings = $this->database->selectAssoc('SELECT name,type,value FROM settings', 'name', array('name', 'value', 'type'));
-    }
-
-    /**
-     * Identifies whether the named setting exists
-     * 
-     * @param string $key Name of the setting
-     * @return bool
-     */
-    public function exists($key) {
-        return isset($this->settings[$key]);
-    }
-
-    /**
-     * Fetches the value of the named setting
-     * 
-     * @param string $key Name of the setting
-     */
-    public function get($key) {
-        if (!isset($this->settings[$key])) {
-            throw new RippingCluster_Exception_UnknownSetting($key);
-        }
-
-        switch ($this->settings[$key]['type']) {
-            case self::TYPE_STRING_LIST:
-                return array_map('trim', explode("\n", $this->settings[$key]['value']));
-                
-            default:
-               return $this->settings[$key]['value'];
-        }
-    }
-
-};
-
-?>
--- a/lib/RippingCluster/Database.class.php
+++ b/lib/RippingCluster/Database.class.php
@@ -1,141 +0,0 @@
-<?php
-
-class RippingCluster_Database {
-
-    private $config;
-    private $dbh;
-
-    private $hostname;
-    private $username;
-    private $password;
-    private $dbname;
-
-    private $prepared_statements = array();
-
-    public function __construct(RippingCluster_Config $config) {
-        $this->config   = $config;
-
-        $this->hostname = $this->config->getDatabase('hostname');
-        $this->username = $this->config->getDatabase('username');
-        $this->password = $this->config->getDatabase('password');
-        $this->dbname   = $this->config->getDatabase('dbname');
-
-        try {
-            $this->dbh  = new PDO("mysql:host={$this->hostname};dbname={$this->dbname}", $this->username, $this->password);
-        } catch (PDOException $e) {
-            throw new RippingCluster_Exception_DatabaseConnectFailed($e->getMessage());
-        }
-
-    }
-
-    public function __destruct() {
-        $this->dbh = null;
-    }
-
-    public function selectAssoc($sql, $key_col, $value_cols) {
-        $results = array();
-
-        foreach ($this->dbh->query($sql) as $row) {
-            if (is_array($value_cols)) {
-                $values = array();
-                foreach ($value_cols as $value_col) {
-                    $values[$value_col] = $row[$value_col];
-                }
-                
-                $results[$row[$key_col]] = $values;
-            } else {
-                $results[$row[$key_col]] = $row[$value_col];
-            }
-        }
-
-        return $results;
-    }
-
-	public function selectList($sql, $bind_params = null) {
-		if ($bind_params) {
-	        $stmt = $this->dbh->prepare($sql);
-
-            foreach ($bind_params as $param) {
-                $stmt->bindValue(':'.$param['name'], $param['value'], $param['type']);
-            }
-
-			$result = $stmt->execute();
-			if (!$result) {
-                list($dummy, $code, $message) = $stmt->errorInfo();
-                throw new RippingCluster_Exception_DatabaseQueryFailed($message, $code);
-			}
-
-			return $stmt->fetchAll();
-
-		} else {
-			$results = array();
-
-			$result = $this->dbh->query($sql);
-			foreach ($result as $row) {
-				$results[] = $row;
-			}
-
-			return $results;
-		}
-	}
-
-	public function selectOne($sql, $bind_params = null) {
-		$rows = $this->selectList($sql, $bind_params);
-		if (count($rows) != 1) {
-			throw new RippingCluster_Exception_ResultCountMismatch(count($rows));
-		}
-
-		return $rows[0];
-	}
-
-    public function insert($sql, $bind_params = null) {
-        $stmt = $this->dbh->prepare($sql);
-
-        if ($bind_params) {
-            foreach ($bind_params as $param) {
-                if (isset($param['type'])) {
-                    $stmt->bindValue(':'.$param['name'], $param['value'], $param['type']);
-                } else {
-                    $stmt->bindValue(':'.$param['name'], $param['value']);
-                }
-            }
-        }
-
-        $result = $stmt->execute();
-        if (!$result) {
-            list($code, $dummy, $message) = $stmt->errorInfo();
-            throw new RippingCluster_Exception_DatabaseQueryFailed($message, $code);
-        }
-    }
-    
-    public function update($sql, $bind_params = null) {
-        $stmt = $this->dbh->prepare($sql);
-
-        if ($bind_params) {
-            foreach ($bind_params as $param) {
-                if (isset($param['type'])) {
-                    $stmt->bindValue(':'.$param['name'], $param['value'], $param['type']);
-                } else {
-                    $stmt->bindValue(':'.$param['name'], $param['value']);
-                }
-            }
-        }
-
-        $result = $stmt->execute();
-        if (!$result) {
-            list($code, $dummy, $message) = $stmt->errorInfo();
-            throw new RippingCluster_Exception_DatabaseQueryFailed($message, $code);
-        }
-    }
-
-    public function errorInfo() {
-        return $this->dbh->errorInfo();
-    }
-    
-    public function lastInsertId() {
-        return $this->dbh->lastInsertId();
-    }
-
-}
-
-?>
--- a/lib/RippingCluster/Exceptions.class.php
+++ b/lib/RippingCluster/Exceptions.class.php
@@ -1,32 +0,0 @@
-<?php
-
-class RippingCluster_Exception extends Exception {};
-
-class RippingCluster_Exception_DatabaseException      extends RippingCluster_Exception {};
-class RippingCluster_Exception_DatabaseConfigMissing  extends RippingCluster_Exception_DatabaseException {};
-class RippingCluster_Exception_DatabaseConnectFailed  extends RippingCluster_Exception_DatabaseException {};
-class RippingCluster_Exception_NoDatabaseConnection   extends RippingCluster_Exception_DatabaseException {};
-class RippingCluster_Exception_DatabaseQueryFailed    extends RippingCluster_Exception_DatabaseException {};
-class RippingCluster_Exception_ResultCountMismatch    extends RippingCluster_Exception_DatabaseException {};
-
-class RippingCluster_Exception_ConfigException        extends RippingCluster_Exception {};
-class RippingCluster_Exception_UnknownSetting         extends RippingCluster_Exception_ConfigException {};
-
-class RippingCluster_Exception_TemplateException      extends RippingCluster_Exception {};
-class RippingCluster_Exception_AbortEntirePage        extends RippingCluster_Exception_TemplateException {}; 
-class RippingCluster_Exception_Unauthorized           extends RippingCluster_Exception_TemplateException {};
-class RippingCluster_Exception_FileNotFound           extends RippingCluster_Exception_TemplateException {};
-class RippingCluster_Exception_InvalidParameters      extends RippingCluster_Exception_TemplateException {};
-
-class RippingCluster_Exception_InvalidSourceDirectory extends RippingCluster_Exception {};
-
-class RippingCluster_Exception_CacheException         extends RippingCluster_Exception {};
-class RippingCluster_Exception_InvalidCacheDir        extends RippingCluster_Exception_CacheException {};
-class RippingCluster_Exception_CacheObjectNotFound    extends RippingCluster_Exception_CacheException {};
-
-class RippingCluster_Exception_LogicException         extends RippingCluster_Exception {};
-class RippingCluster_Exception_JobNotRunning          extends RippingCluster_Exception_LogicException {};
-
-class RippingCluster_Exception_InvalidPluginName      extends RippingCluster_Exception {};
-
-?>
--- a/lib/RippingCluster/ForegroundTask.class.php
+++ b/lib/RippingCluster/ForegroundTask.class.php
@@ -1,113 +0,0 @@
-<?php
-
-class RippingCluster_ForegroundTask {
-    
-    const PIPE_STDIN  = 0;
-    const PIPE_STDOUT = 1;
-    const PIPE_STDERR = 2;
-    
-    private function __construct() {
-    
-    }
-    
-    /**
-     * 
-     * Code largely taken from user submitted comment on http://php.sihnon.net/manual/en/function.proc-open.php
-     * @param unknown_type $command
-     * @param unknown_type $cwd
-     * @param unknown_type $env
-     * @param unknown_type $stdin
-     * @param unknown_type $callback_stdout
-     * @param unknown_type $callback_stderr
-     */
-    public static function execute($command, $cwd = null, $env = null, $stdin = null, $callback_stdout = null, $callback_stderr = null, $identifier = null) {
-        $txOff = 0;
-        $txLen = strlen($stdin);
-        $stdout = '';
-        $stdoutDone = FALSE;
-        $stderr = '';
-        $stderrDone = FALSE;
-        
-        $descriptors = array(
-            self::PIPE_STDIN  => array('pipe', 'r'),
-            self::PIPE_STDOUT => array('pipe', 'w'),
-            self::PIPE_STDERR => array('pipe', 'w'),
-        );
-        
-        $pipes = array();
-        $process = proc_open($command, $descriptors, $pipes);
-        
-        stream_set_blocking($pipes[self::PIPE_STDIN], 0); // Make stdin/stdout/stderr non-blocking
-        stream_set_blocking($pipes[self::PIPE_STDOUT], 0);
-        stream_set_blocking($pipes[self::PIPE_STDERR], 0);
-        
-        if ($txLen == 0) {
-            fclose($pipes[0]);
-        }
-        
-        while (true) {
-            $rx = array(); // The program's stdout/stderr
-            if (!$stdoutDone) {
-                $rx[] = $pipes[self::PIPE_STDOUT];
-            }
-            if (!$stderrDone) {
-                $rx[] = $pipes[self::PIPE_STDERR];
-            }
-            
-            $tx = array(); // The program's stdin
-            if ($txOff < $txLen) {
-                $tx[] = $pipes[self::PIPE_STDIN];
-            }
-            
-            $ex = array();
-            
-            stream_select($rx, $tx, $ex, null, null); // Block til r/w possible
-            if (!empty($tx)) {
-                $txRet = fwrite($pipes[self::PIPE_STDIN], substr($stdin, $txOff, 8192));
-                if ($txRet !== false) {
-                    $txOff += $txRet;
-                }
-                if ($txOff >= $txLen) {
-                    fclose($pipes[self::PIPE_STDIN]);
-                }
-            }
-            
-            foreach ($rx as $r) {
-                if ($r == $pipes[self::PIPE_STDOUT]) {
-                    $chunk = fread($pipes[self::PIPE_STDOUT], 8192);
-                    if (feof($pipes[self::PIPE_STDOUT])) { 
-                        fclose($pipes[self::PIPE_STDOUT]); $stdoutDone = true;
-                    }
-                    
-                    if ($callback_stdout) {
-                        call_user_func($callback_stdout, $identifier, $chunk);
-                    } else {
-                        $stdout .= $chunk;
-                    }
-                    
-                } else if ($r == $pipes[self::PIPE_STDERR]) {
-                    $chunk = fread($pipes[self::PIPE_STDERR], 8192);
-                    if (feof($pipes[self::PIPE_STDERR])) {
-                        fclose($pipes[self::PIPE_STDERR]); $stderrDone = true;
-                    }
-                    
-                    if ($callback_stderr) {
-                        call_user_func($callback_stderr, $identifier, $chunk);
-                    } else {
-                        $stderr .= $chunk;
-                    }
-                }
-            }
-            
-            if (!is_resource($process))
-                break;
-                
-            if ($txOff >= $txLen && $stdoutDone && $stderrDone)
-                break;
-        }
-        
-        return array(proc_close($process), $stdout, $stderr);
-    }
-    
-}
-
--- a/lib/RippingCluster/IPlugin.class.php
+++ b/lib/RippingCluster/IPlugin.class.php
@@ -1,11 +0,0 @@
-<?php
-
-interface RippingCluster_IPlugin {
-    
-    public static function init();
-    
-    public static function name();
-    
-}
-
-?>
--- a/lib/RippingCluster/IPluginFactory.class.php
+++ b/lib/RippingCluster/IPluginFactory.class.php
@@ -1,9 +0,0 @@
-<?php
-
-interface RippingCluster_IPluginFactory {
-
-    public static function init();
-    
-}
-
-?>
--- a/lib/RippingCluster/Log.class.php
+++ b/lib/RippingCluster/Log.class.php
@@ -1,61 +0,0 @@
-<?php
-
-class RippingCluster_Log {
-
-    private static $hostname = '';
-    
-    private $database;
-    private $config;
-    private $table;
-
-    public function __construct(RippingCluster_Database $database, RippingCluster_Config $config, $table) {
-        $this->database = $database;
-        $this->config = $config;
-        $this->table = $table;
-
-    }
-
-    public function log($severity, $message, $job_id = 0) {
-        $this->database->insert("INSERT INTO {$this->table} (job_id,level,ctime,pid,hostname,progname,line,message) VALUES(:job_id, :level, :ctime, :pid, :hostname, :progname, :line, :message)",
-            array(
-                array('name' => 'job_id', 'value' => $job_id, 'type' => PDO::PARAM_INT),
-                array('name' => 'level', 'value' => $severity, 'type' => PDO::PARAM_STR),
-                array('name' => 'ctime', 'value' => time(), 'type' => PDO::PARAM_INT),
-                array('name' => 'pid', 'value' => 0, 'type' => PDO::PARAM_INT),
-                array('name' => 'hostname', 'value' => self::$hostname, 'type' => PDO::PARAM_STR),
-                array('name' => 'progname', 'value' => 'webui', 'type' => PDO::PARAM_STR),
-                array('name' => 'line', 'value' => 0, 'type' => PDO::PARAM_INT),
-                array('name' => 'message', 'value' => $message, 'type' => PDO::PARAM_STR)
-            )
-        );
-        
-        if (HBC_File == 'worker') {
-            echo date("r") . ' ' . $message . "\n"; 
-        }
-    }
-
-    public function debug($message, $job_id = 0) {
-        return $this->log('DEBUG', $message, $job_id);
-    }
-
-    public function info($message, $job_id = 0) {
-        return $this->log('INFO', $message, $job_id);
-    }
-
-    public function warning($message, $job_id = 0) {
-        return $this->log('WARNING', $message, $job_id);
-    }
-
-    public function error($message, $job_id = 0) {
-        return $this->log('ERROR', $message, $job_id);
-    }
-
-    public static function initialise() {
-        self::$hostname = trim(`hostname`);
-    }
-
-}
-
-RippingCluster_Log::initialise();
-
-?>
--- a/lib/RippingCluster/LogEntry.class.php
+++ b/lib/RippingCluster/LogEntry.class.php
@@ -1,122 +0,0 @@
-<?php
-
-abstract class RippingCluster_LogEntry {
-
-    protected static $table_name = "";
-
-    protected $id;
-    protected $job_id;
-    protected $level;
-    protected $ctime;
-    protected $pid;
-    protected $hostname;
-    protected $progname;
-    protected $line;
-    protected $message;
-    
-    protected function __construct($id, $job_id, $level, $ctime, $pid, $hostname, $progname, $line, $message) {
-        $this->id       = $id;
-        $this->job_id   = $job_id;
-        $this->level    = $level;
-        $this->ctime    = $ctime;
-        $this->pid      = $pid;
-        $this->hostname = $hostname;
-        $this->progname = $progname;
-        $this->line     = $line;
-        $this->message  = $message;
-    }
-
-    public static function fromDatabaseRow($row) {
-        return new RippingCluster_ClientLogEntry(
-            $row['id'],
-            $row['job_id'],
-            $row['level'],
-            $row['ctime'],
-            $row['pid'],
-            $row['hostname'],
-            $row['progname'],
-            $row['line'],
-            $row['message']
-        );
-    }
-
-    public static function fromId($id) {
-        $database = RippingCluster_Main::instance()->database();
-        return RippingCluster_ClientLogEntry::fromDatabaseRow(
-            $database->selectOne('SELECT * FROM '.self::$table_name.' WHERE id=:id', array(
-                array('name' => 'id', 'value' => $id, 'type' => PDO::PARAM_INT)
-                )
-            )
-        );
-    }
-
-    public static function recent($limit = 100) {
-        $entries = array();
-
-        $database = RippingCluster_Main::instance()->database();
-        foreach ($database->selectList('SELECT * FROM '.self::$table_name.' ORDER BY ctime DESC LIMIT :limit', array(
-                array('name' => 'limit', 'value' => $limit, 'type' => PDO::PARAM_INT)
-            )) as $row) {
-            $entries[] = self::fromDatabaseRow($row);
-        }
-
-        return $entries;
-    }
-
-    public static function recentForJob($job_id, $limit = 100) {
-        $entries = array();
-        
-        $database = RippingCluster_Main::instance()->database();
-        foreach ($database->selectList('SELECT * FROM '.self::$table_name.' WHERE job_id=:job_id ORDER BY ctime DESC LIMIT :limit', array(
-                array('name' => 'job_id', 'value' => $job_id, 'type' => PDO::PARAM_INT),
-                array('name' => 'limit', 'value' => $limit, 'type' => PDO::PARAM_INT)
-            )) as $row) {
-            $entries[] = self::fromDatabaseRow($row);
-        }
-
-        return $entries;
-    }
-
-    public static function allForNoJob() {
-        return self::allForJob(0);
-    }
-
-    public function id() {
-        return $this->id;
-    }
-
-    public function jobId() {
-        return $this->job_id;
-    }
-
-    public function level() {
-        return $this->level;
-    }
-
-    public function ctime() {
-        return $this->ctime;
-    }
-
-    public function pid() {
-        return $this->pid;
-    }
-
-    public function hostname() {
-        return $this->hostname;
-    }
-
-    public function progname() {
-        return $this->progname;
-    }
-
-    public function line() {
-        return $this->line;
-    }
-
-    public function message() {
-        return $this->message;
-    }
-
-};
-
-?>
--- a/lib/RippingCluster/Main.class.php
+++ b/lib/RippingCluster/Main.class.php
@@ -1,215 +0,0 @@
-<?php
-
-require 'smarty/Smarty.class.php';
-
-class RippingCluster_Main {
-
-    private static $instance;
-
-    private $smarty;
-    private $config;
-    private $database;
-    private $log;
-    private $request;
-    private $cache;
-    
-    private $base_uri;
-
-    private function __construct() {
-        $request_string = isset($_GET['l']) ? $_GET['l'] : '';
-        
-        $log_table = null;
-        switch(HBC_File) {
-            case 'index': 
-            case 'run-jobs': {
-                $log_table = 'client_log';
-            } break;
-            
-            case 'worker': {
-                $log_table = 'worker_log';
-            }
-        }
-
-        $this->config   = new RippingCluster_Config(RippingCluster_DBConfig);
-        $this->database = new RippingCluster_Database($this->config);
-        $this->config->setDatabase($this->database);
-
-        $this->log      = new RippingCluster_Log($this->database, $this->config, $log_table);
-        $this->request  = new RippingCluster_RequestParser($request_string);
-        $this->cache    = new RippingCluster_Cache($this->config);
-        
-        $this->smarty = new Smarty();
-        $this->smarty->template_dir = './templates';
-        $this->smarty->compile_dir  = './tmp/templates';
-        $this->smarty->cache_dir    = './tmp/cache';
-        $this->smarty->config_fir   = './config';
-
-        $this->smarty->register_modifier('formatDuration', array('RippingCluster_Main', 'formatDuration'));
-
-        $this->smarty->assign('version', '0.1');
-        
-        $this->base_uri = dirname($_SERVER['SCRIPT_NAME']) . '/';
-        $this->smarty->assign('base_uri', $this->base_uri);
-
-    }
-
-    /**
-     * 
-     * @return RippingCluster_Main
-     */
-    public static function instance() {
-        if (!self::$instance) {
-            self::$instance = new RippingCluster_Main();
-        }
-
-        return self::$instance;
-    }
-
-    public function smarty() {
-        return $this->smarty;
-    }
-
-    /**
-     * 
-     * @return RippingCluster_Config
-     */
-    public function config() {
-        return $this->config;
-    }
-
-    /**
-     * 
-     * @return RippingCluster_Database
-     */
-    public function database() {
-        return $this->database;
-    }
-
-    /**
-     * 
-     * @return RippingCluster_Log
-     */
-    public function log() {
-        return $this->log;
-    }
-
-    /**
-     * 
-     * @return RippingCluster_RequestParser
-     */
-    public function request() {
-        return $this->request;
-    }
-    
-    /**
-     * 
-     * @return RippingCluster_Cache
-     */
-    public function cache() {
-        return $this->cache;
-    }
-    
-    public function baseUri() {
-        return $this->base_uri;
-    }
-    
-    public function absoluteUrl($relative_url) {
-        $secure = isset($_SERVER['secure']);
-        $port = $_SERVER['SERVER_PORT'];
-        return 'http' . ($secure ? 's' : '') . '://'
-            . $_SERVER['HTTP_HOST'] . (($port == 80 || ($secure && $port == 443)) ? '' : ':' . $port)
-            . '/' . $this->base_uri . $relative_url; 
-    }
-
-    public static function initialise() {
-        spl_autoload_register(array('RippingCluster_Main','autoload'));
-    }
-    
-    public static function autoload($classname) {
-        // Ensure the classname contains only valid class name characters
-        if (!preg_match('/^[A-Z][a-zA-Z0-9_]*$/', $classname)) {
-            throw new Exception('Illegal characters in classname'); // TODO Subclass this exception
-        }
-
-        // Ensure the class to load begins with our prefix
-        if (!preg_match('/^RippingCluster_/', $classname)) {
-            return;
-        }
-
-        // Special case: All exceptions are stored in the same file
-        if (preg_match('/^RippingCluster_Exception/', $classname)) {
-            require_once(RippingCluster_Lib . 'RippingCluster/Exceptions.class.php');
-            return;
-        }
-
-        // Replace any underscores with directory separators
-        $filename = RippingCluster_Lib . preg_replace('/_/', '/', $classname);
-
-        // Tack on the class file suffix
-        $filename .= '.class.php';
-
-        // If this file exists, load it
-        if (file_exists($filename)) {
-            require_once $filename;
-        }
-    }
-    
-    public static function mkdir_recursive($directory, $permissions=0777) {
-        $parts = explode('/', $directory);
-        $path = '';
-        for ($i=1,$l=count($parts); $i<=$l; $i++) {
-            $iPath = $parts;
-            $path = join('/', array_slice($iPath, 0, $i));
-            if (empty($path)) continue;
-            if (!file_exists($path)) {
-                if (!mkdir($path)) return false;
-                if (!chmod($path, $permissions)) return false;
-            }
-        }
-        return true;
-    }
-    
-    public static function issetelse($var, $default = null) {
-        if (isset($var)) {
-            return $var;
-        }
-        
-        if (is_string($default) && preg_match('/^RippingCluster_Exception/', $default) && class_exists($default) && is_subclass_of($default, RippingCluster_Exception)) {
-            throw new $default();
-        }
-        
-        return $default;
-    }
-
-    public static function formatDuration($time) {
-        if (is_null($time)) {
-            return 'unknown';
-        }
-
-        $labels = array('seconds', 'minutes', 'hours', 'days', 'weeks', 'months', 'years');
-        $limits = array(1, 60, 3600, 86400, 604800, 2592000, 31556926, PHP_INT_MAX);
-
-        $working_time = $time;
-
-        $result = "";
-        $ptr = count($labels) - 1;
-
-        while ($ptr >= 0 && $working_time < $limits[$ptr]) {
-            --$ptr;
-        }
-
-        while ($ptr >= 0) {
-            $unit_time = floor($working_time / $limits[$ptr]);
-            $working_time -= $unit_time * $limits[$ptr];
-            $result = $result . ' ' . $unit_time . ' ' . $labels[$ptr];
-            --$ptr;
-        }
-
-        return $result;
-    }
-    
-}
-
-RippingCluster_Main::initialise();
-
-?>
--- a/lib/RippingCluster/Page.class.php
+++ b/lib/RippingCluster/Page.class.php
@@ -1,74 +0,0 @@
-<?php
-
-class RippingCluster_Page {
-
-    private $smarty;
-    private $request;
-
-    private $page;
-
-    public function __construct(Smarty $smarty, RippingCluster_RequestParser $request) {
-        $this->smarty = $smarty;
-        $this->request = $request;
-        $this->page = $request->page();
-    }
-
-    public function page() {
-        return $this->page;
-    }
-
-    public function template_filename() {
-        return $this->page . '.tpl';
-    }
-
-    public function evaluate($template_variables = array()) {
-        $code_filename     = $this->page . '.php';
-        $template_filename = $this->template_filename();
-
-        try {
-            $this->render($template_filename, $code_filename, $template_variables);
-        } catch (RippingCluster_Exception_AbortEntirePage $e) {
-            return false;
-        } catch (RippingCluster_Exception_FileNotFound $e) {
-            $this->render('errors/404.tpl', 'errors/404.php');
-        } catch (RippingCluster_Exception $e) {
-            $this->render('errors/unhandled-exception.tpl', 'errors/unhandled-exception.php', array(
-                'exception' => $e,
-            ));
-        } 
-        
-        return true;
-    }
-    
-    protected function render($template_filename, $code_filename = null, $template_variables = array()) {
-        if ( ! $this->smarty->template_exists($template_filename)) {
-            throw new RippingCluster_Exception_FileNotFound($template_filename);
-        }
-        
-        // Copy all the template variables into the namespace for this function,
-        // so that they are readily available to the template
-        foreach ($template_variables as $__k => $__v) {
-            $$__k = $__v;
-        }
-        
-        // Include the template code file, which will do all the work for this page
-        $real_code_filename = 'pages/' . $code_filename;
-        if ($code_filename && file_exists($real_code_filename)) {
-            include $real_code_filename;
-        }
-        
-        // Now execute the template itself, which will render the results of the code file
-        $this->smarty->assign('page_content', $this->smarty->fetch($template_filename));
-    }
-    
-    public static function redirect($relative_url) {
-        $absolute_url = RippingCluster_Main::instance()->absoluteUrl($relative_url);
-        
-        header("Location: $absolute_url");
-        
-        throw new RippingCluster_Exception_AbortEntirePage();
-    }
-
-};
-
-?>
--- a/lib/RippingCluster/PluginBase.class.php
+++ b/lib/RippingCluster/PluginBase.class.php
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * Base class for all plugins, providing default implementations for 
- * standard plugin methods.
- * 
- * @class RippingCluster_PluginBase
- */
-class RippingCluster_PluginBase {
-    
-    /**
-     * Provides a basic initialisation function that does nothing.
-     * 
-     */
-    public static function init() {
-        // Nothing to do
-    }
-    
-    /**
-     * Returns the name of this plugin
-     * 
-     * @return string
-     */
-    public static function name() {
-        return static::PLUGIN_NAME;
-    }
-    
-}
-
-?>
--- a/lib/RippingCluster/PluginFactory.class.php
+++ b/lib/RippingCluster/PluginFactory.class.php
@@ -1,67 +0,0 @@
-<?php
-
-abstract class RippingCluster_PluginFactory implements RippingCluster_IPluginFactory {
-    
-    static private $validPlugins = array();
-    
-    protected static function ensureScanned() {
-        if (! isset(self::$validPlugins[get_called_class()])) {
-            static::scan();
-        }
-    }
-    
-    protected static function isValidPlugin($plugin) {
-        return isset(self::$validPlugins[get_called_class()][$plugin]);
-    }
-    
-    public static function getValidPlugins() {
-        static::ensureScanned();
-        return array_keys(self::$validPlugins[get_called_class()]);
-    }
-    
-    protected static function findPlugins($directory) {
-        $plugins = array();
-        
-        $iterator = new RippingCluster_Utility_ClassFilesIterator(new RippingCluster_Utility_VisibleFilesIterator(new DirectoryIterator(RippingCluster_Lib . $directory)));
-        
-        foreach ($iterator as /** @var SplFileInfo */ $file) {
-            $plugin = preg_replace('/.class.php$/', '', $file->getFilename());
-            $plugins[] = $plugin;
-        }
-        
-        return $plugins;
-    }
-    
-    protected static function loadPlugins($plugins, $prefix, $interface) {
-        self::$validPlugins[get_called_class()] = array();
-        
-        foreach ($plugins as $plugin) {
-            $fullClassname = $prefix . $plugin;
-            if ( ! class_exists($fullClassname, true)) {
-                continue;
-            }
-            
-            if ( ! in_array($interface, class_implements($fullClassname))) {
-                continue;
-            }
-            
-            // Initialise the plugin
-            call_user_func(array($fullClassname, 'init'));
-        
-            self::$validPlugins[get_called_class()][$plugin] = $fullClassname;
-        }
-    }
-    
-    public static function classname($plugin) {
-        static::ensureScanned();
-        
-        if ( ! self::isValidPlugin($plugin)) {
-            throw new RippingCluster_Exception_InvalidPluginName($plugin);
-        }
-        
-        return self::$validPlugins[get_called_class()][$plugin];
-    }
-    
-}
-
-?>
--- a/lib/RippingCluster/RequestParser.class.php
+++ b/lib/RippingCluster/RequestParser.class.php
@@ -1,97 +0,0 @@
-<?php
-
-class RippingCluster_RequestParser {
-
-    private $request_string;
-    private $page = array();
-    private $vars = array();
-
-    public function __construct($request_string) {
-        $this->request_string = $request_string;
-
-        $this->parse();
-    }
-
-    public function parse() {
-        if (!$this->request_string) {
-        	$this->page = array('home');
-            return;
-        }
-
-        $components = explode('/', $this->request_string);
-        if (!$components) {
-            return;
-        }
-
-        // Read through the components list looking for elements matching known directories and files
-        // to determine which page this request is for
-        $base_dir = 'templates';
-        while (true) {
-            if ($components && ! $components[0]) {
-                // Skip over any empty components before we find a page
-                array_shift($components);
-            }
-            
-            if ($components && is_dir($base_dir . '/' . $components[0])) {
-                $base_dir .= '/' . $components[0];
-                array_push($this->page, array_shift($components));
-            } elseif ($components && is_file($base_dir . '/' . $components[0] . '.tpl')) {
-                // We have found a valid page, so break the loop here,
-                // leaving the remaining components as key/value pairs
-                array_push($this->page, array_shift($components));
-                break;
-            } else {
-                // See if we've already seen a component and assumed it referred to a dir when a file of the same name exists
-                if ($this->page && is_file($base_dir . '.tpl')) {
-                    break;
-                } elseif ( ! $components && is_file($base_dir . '/index.tpl')) {
-                    // The last component in the path was a valid directory, and a directory index exists
-                    array_push($this->page, 'index');
-                    break; 
-                } else {
-                    // No valid page was found, so display an error page
-                    $this->page = array('404');
-                    return;
-                }
-            }
-        }
-
-        // The subsequent tokens are parameters for this page in key value pairs
-        while ($components) {
-            // If the url ended with a trailing slash, the last element will be null
-            $last_element = $components[count($components) - 1];
-            if ($last_element == "") {
-                array_pop($components);
-            }
-            
-            $this->vars[array_shift($components)] = $components ? array_shift($components) : true;
-        }
-    }
-
-    public function page() {
-        return join('/', $this->page);
-    }
-
-    public function exists($key) {
-        return isset($this->vars[$key]);
-    }
-
-    public function get($key, $default = null) {
-        if (isset($this->vars[$key])) {
-            return $this->vars[$key];
-        }
-        
-        if (is_string($default) && preg_match('/^RippingCluster_Exception/', $default) && class_exists($default) && is_subclass_of($default, RippingCluster_Exception)) {
-            throw new $default();
-        }
-
-        return $default;
-    }
-    
-    public function request_string() {
-        return $this->request_string;
-    }
-
-};
-
-?>
--- a/lib/RippingCluster/Worker.class.php
+++ b/lib/RippingCluster/Worker.class.php
@@ -1,45 +0,0 @@
-<?php
-
-class RippingCluster_Worker {
-    
-    protected $gearman;
-    
-    public function __construct() {
-        $this->init();
-        
-    }
-    
-    private function init() {
-        if ($this->gearman) {
-            return;
-        }
-        
-        $config = RippingCluster_Main::instance()->config();
-        
-        $this->gearman = new GearmanWorker();
-        $this->gearman->addServers($config->get('rips.job_servers'));
-        
-        // Load all the plugin classes
-        RippingCluster_Worker_PluginFactory::scan();
-        foreach (RippingCluster_Worker_PluginFactory::getValidPlugins() as $plugin) {
-            $workerFunctions = RippingCluster_Worker_PluginFactory::getPluginWorkerFunctions($plugin);
-            
-            foreach ($workerFunctions as $function => $callback) {
-                $this->gearman->addFunction($function, $callback);
-            }
-        }
-    }
-    
-   public function start() {
-        while($this->gearman->work()) {
-            if ($this->gearman->returnCode() != GEARMAN_SUCCESS) {
-                break;
-            }
-        }
-        
-        return true;
-    }
-        
-}
-
-?>
--- a/lib/RippingCluster/Worker/IPlugin.class.php
+++ b/lib/RippingCluster/Worker/IPlugin.class.php
@@ -1,21 +0,0 @@
-<?php
-
-interface RippingCluster_Worker_IPlugin extends RippingCluster_IPlugin {
-    
-    /**
-     * Returns the list of functions (and names) implemented by this plugin for registration with Gearman
-     * 
-     * @return array(string => callback)
-     */
-    public static function workerFunctions();
-
-    /**
-     * Creates an instance of the Worker plugin, and uses it to execute a single job
-     *
-     * @param GearmanJob $job Gearman Job object, describing the work to be done
-     */
-    public static function rip(GearmanJob $job);
-
-}
-
-?>
--- a/lib/RippingCluster/Worker/Plugin/HandBrake.class.php
+++ b/lib/RippingCluster/Worker/Plugin/HandBrake.class.php
@@ -1,140 +0,0 @@
-<?php
-
-class RippingCluster_Worker_Plugin_HandBrake extends RippingCluster_PluginBase implements RippingCluster_Worker_IPlugin {
-
-    const PLUGIN_NAME = 'HandBrake';
-    
-    const DEINTERLACE_ALWAYS      = 1;
-    const DEINTERLACE_SELECTIVELY = 2;
-    
-    private $output;
-    
-    private $gearman_job;
-    
-    private $job;
-    
-    private $rip_options;
-    
-    private function __construct(GearmanJob $gearman_job) {
-        $this->output = '';
-        
-        $this->gearman_job = $gearman_job;
-        
-        $this->rip_options = unserialize($this->gearman_job->workload());
-
-        if ( ! $this->rip_options['id']) {
-            throw new RippingCluster_Exception_LogicException("Job ID must not be zero/null");
-        }
-        $this->job = RippingCluster_Job::fromId($this->rip_options['id']);
-    }
-    
-    /**
-     * Returns the list of functions (and names) implemented by this plugin for registration with Gearman
-     * 
-     * @return array(string => callback)
-     */
-    public static function workerFunctions() {
-        return array(
-            'handbrake_rip' => array(__CLASS__, 'rip'),
-        );
-    }
-    
-    /**
-     * Creates an instance of the Worker plugin, and uses it to execute a single job
-     *
-     * @param GearmanJob $job Gearman Job object, describing the work to be done
-     */
-    public static function rip(GearmanJob $job) {
-        $rip = new self($job);
-        $rip->execute();
-    }
-        
-    private function execute() {
-        $main   = RippingCluster_Main::instance();
-        $config = $main->config();
-        $log    = $main->log();
-        
-        $handbrake_cmd_raw = array(
-            '-n', $config->get('rips.nice'),
-            $config->get('rips.handbrake_binary'),
-            $this->evaluateOption('input_filename', '-i'),
-            $this->evaluateOption('output_filename', '-o'),
-            $this->evaluateOption('title'),
-            $this->evaluateOption('format', '-f'),
-            $this->evaluateOption('video_codec', '-e'),
-            $this->evaluateOption('quantizer', '-q'),
-            $this->evaluateOption('video_width', '-w'),
-            $this->evaluateOption('video_height', '-l'),
-            $this->evaluateOption('deinterlace'),
-            $this->evaluateOption('audio_tracks', '-a'),
-            $this->evaluateOption('audio_codec', '-E'),
-            $this->evaluateOption('audio_names', '-A'),
-            $this->evaluateOption('subtitle_tracks', '-s'),
-        );
-
-        $handbrake_cmd = array($config->get('rips.nice_binary'));
-        foreach(new RecursiveIteratorIterator(new RecursiveArrayIterator($handbrake_cmd_raw)) as $value) {
-            $handbrake_cmd[] = escapeshellarg($value);
-        }
-        $handbrake_cmd = join(' ', $handbrake_cmd);
-        $log->debug($handbrake_cmd, $this->job->id());
-        
-        // Change the status of this job to running
-        $log->debug("Setting status to Running", $this->job->id());
-        $this->job->updateStatus(RippingCluster_JobStatus::RUNNING, 0);
-
-        list($return_val, $stdout, $stderr) = RippingCluster_ForegroundTask::execute($handbrake_cmd, null, null, null, array($this, 'callbackOutput'), array($this, 'callbackOutput'), $this);
-        if ($return_val) {
-            $this->gearman_job->sendFail($return_val);
-        } else {
-            $this->job->updateStatus(RippingCluster_JobStatus::COMPLETE);
-        }
-    }
-    
-    private function evaluateOption($name, $option = null) {
-        switch($name) {
-            case 'title': {
-                if (!$this->rip_options[$name] || (int)$this->rip_options[$name] < 0) {
-                    return array('-L');
-                } else {
-                    return array('-t', $this->rip_options[$name]);
-                }
-            } break;
-            
-            case 'deinterlace': {
-                switch ($this->rip_options[$name]) {
-                    case self::DEINTERLACE_ALWAYS:
-                        return array('-d');
-                    case self::DEINTERLACE_SELECTIVELY:
-                        return array('-5');
-                    default:
-                        return array();
-                }
-            }
-            
-            default:
-                return array(isset($option) ? $option : $name, $this->rip_options[$name]);
-        } 
-    }
-    
-    public function callbackOutput($rip, $data) {
-		$this->output .= $data;
-
-        while (count($lines = preg_split('/[\r\n]+/', $this->output, 2)) > 1) {
-            $line = $lines[0];
-            $rip->output = $lines[1];
-            
-            $matches = array();
-            if (preg_match('/Encoding: task \d+ of \d+, (\d+\.\d+) %/', $line, $matches)) {
-                $status = $rip->job->currentStatus();
-                $status->updateRipProgress($matches[1]);
-            } else {
-                $log = RippingCluster_Main::instance()->log();
-                $log->debug($line, $rip->job->id());
-            }
-        }
-    }
-    
-}
-
-?>
--- a/lib/RippingCluster/WorkerLogEntry.class.php
+++ b/lib/RippingCluster/WorkerLogEntry.class.php
@@ -1,13 +0,0 @@
-<?php
-
-class RippingCluster_WorkerLogEntry extends RippingCluster_LogEntry {
-
-    public static function initialise() {
-        parent::$table_name = 'worker_log';
-    }
-
-};
-
-RippingCluster_WorkerLogEntry::initialise();
-
-?>
--- a/private/.gitignore
+++ b/private/.gitignore
@@ -0,0 +1,2 @@
+config.php
+dbconfig.conf
--- a/private/config.php.dist
+++ b/private/config.php.dist
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * Sihnon Framework Library path
+ * 
+ * Specifies the absolute or relative path to the Sihnon Framework library directory, relative to the webui root directory.
+ * Path must end with a trailing slash.
+ * 
+ * @var string
+ */
+define('SihnonFramework_Lib', '/usr/lib/sihnon-php-lib/source/lib/');
+
+/**
+ * Sihnon Library path
+ * 
+ * Specifies the absolute or relative path to the Sihnon library directory, relative to the webui root directory.
+ * Path must end with a trailing slash.
+ * 
+ * @var string
+ */
+define('Sihnon_Lib', '/usr/lib/ripping-cluster/source/lib/');
+
+/**
+ * RippingCluster Library path
+ * 
+ * Specifies the absolute or relative path to the RippingCluster library directory, relative to the webui root directory.
+ * Path must end with a trailing slash.
+ * 
+ * @var string
+ */
+define('RippingCluster_Lib', '/usr/lib/ripping-cluster/source/lib/');
+
+/**
+ * Sihnon Database Support
+ *
+ * Specifies whether or not to include database support in the Framework
+ *
+ * @var bool
+ */
+define('Sihnon_DatabaseSupport', true);
+
+/**
+ * Sihnon Database Configuration
+ * 
+ * Specifies the absolute or relative path to the Sihnon database configuration file, required when Database support is enabled.
+ * This is a standard ini type file, containing the config required to connect to the database.
+ * 
+ * @var string
+ */
+define('Sihnon_DBConfig', '/etc/ripping-cluster/dbconfig.conf');
+
+/**
+ * Sihnon Config Plugin
+ * 
+ * Specifies the plugin to use for configuration value storage.
+ * Options include:
+ *   - Database (Requires Database Support to be enabled, and the Sihnon_ConfigTable option set)
+ *   - FlatFile (Requires the Sihnon_ConfigFile option set)
+ * 
+ * @var string
+ */
+define('Sihnon_ConfigPlugin', 'Database');
+
+/**
+ * Sihnon Config Table
+ *
+ * Specifies the name of the database table thats used for storing configuration values
+ * when the Database Config Plugin is used.
+ *
+ * @var string
+ */
+define('Sihnon_ConfigTable', 'settings');
+
+/**
+ * Sihnon Config File
+ *
+ * Specifies the name of the file used to store configuration values when the FlatFile Config Plugin is used
+ *
+ * @var string
+ */
+define('Sihnon_ConfigFile', '/etc/ripping-cluster/settings.txt');
+
+/**
+ * Sihnon Development Mode
+ *
+ * Specifies whether or not the Framework should operate in debug mode
+ *
+ * @var bool
+ */
+define('Sihnon_Dev', false);
+
+?>
--- a/private/dbconfig.conf.dist
+++ b/private/dbconfig.conf.dist
@@ -0,0 +1,5 @@
+hostname = localhost
+username = ripping
+password = ripping
+dbname   = ripping_cluster
+
--- a/source/lib/Net/Gearman/Job/HandBrake.class.php
+++ b/source/lib/Net/Gearman/Job/HandBrake.class.php
@@ -0,0 +1,145 @@
+<?php
+
+class Net_Gearman_Job_HandBrake extends Net_Gearman_Job_Common implements RippingCluster_Worker_IPlugin {
+
+    const DEINTERLACE_ALWAYS      = 1;
+    const DEINTERLACE_SELECTIVELY = 2;
+    
+    private $output;
+    
+    private $job;
+    
+    public function __construct($conn, $handle) {
+        parent::__construct($conn, $handle);
+        
+        $this->output = '';
+    }
+    
+    public static function init() {
+        
+    }
+    
+    public static function name() {
+        
+    }
+    
+    public function run($args) {;
+        $main   = RippingCluster_Main::instance();
+        $config = $main->config();
+        $log    = $main->log();
+        
+        $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, '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'),
+            self::evaluateOption($args['rip_options'], 'quantizer', '-q'),
+            self::evaluateOption($args['rip_options'], 'video_width', '-w'),
+            self::evaluateOption($args['rip_options'], 'video_height', '-l'),
+            self::evaluateOption($args['rip_options'], 'deinterlace'),
+            self::evaluateOption($args['rip_options'], 'audio_tracks', '-a'),
+            self::evaluateOption($args['rip_options'], 'audio_codec', '-E'),
+            self::evaluateOption($args['rip_options'], 'audio_names', '-A'),
+            self::evaluateOption($args['rip_options'], 'subtitle_tracks', '-s'),
+        );
+
+        $handbrake_cmd = array($config->get('rips.nice_binary'));
+        foreach(new RecursiveIteratorIterator(new RecursiveArrayIterator($handbrake_cmd_raw)) as $value) {
+            $handbrake_cmd[] = escapeshellarg($value);
+        }
+        $handbrake_cmd = join(' ', $handbrake_cmd);
+        RippingCluster_WorkerLogEntry::debug($log, $this->job->id(), $handbrake_cmd);
+        
+        // Change the status of this job to running
+        RippingCluster_WorkerLogEntry::debug($log, $this->job->id(), "Setting status to Running");
+        $this->job->updateStatus(RippingCluster_JobStatus::RUNNING, 0);
+
+        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("Call to HandBrake failed with return code {$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('Encode complete, but output file could not be copied to the correct place.');
+            }
+        }
+    }
+    
+    private static function evaluateOption($options, $name, $option = null) {
+        switch($name) {
+            case 'title': {
+                if (!$options[$name] || (int)$options[$name] < 0) {
+                    return array('-L');
+                } else {
+                    return array('-t', $options[$name]);
+                }
+            } break;
+            
+            case 'deinterlace': {
+                switch ($options[$name]) {
+                    case self::DEINTERLACE_ALWAYS:
+                        return array('-d');
+                    case self::DEINTERLACE_SELECTIVELY:
+                        return array('-5');
+                    default:
+                        return array();
+                }
+            }
+            
+            default:
+                return array(isset($option) ? $option : $name, $options[$name]);
+        } 
+    }
+    
+    public function callbackOutput($rip, $data) {
+		$this->output .= $data;
+
+        while (count($lines = preg_split('/[\r\n]+/', $this->output, 2)) > 1) {
+            $line = $lines[0];
+            $rip->output = $lines[1];
+            
+            $matches = array();
+            if (preg_match('/Encoding: task \d+ of \d+, (\d+\.\d+) %/', $line, $matches)) {
+                $status = $rip->job->currentStatus();
+                $status->updateRipProgress($matches[1]);
+                $this->status($matches[1], 100);
+            } else if (!preg_match('/^\s+$/', $line)) {
+                $log = RippingCluster_Main::instance()->log();
+                RippingCluster_WorkerLogEntry::debug($log, $rip->job->id(), $line);
+            }
+        }
+    }
+    
+}
+
+?>
--- a/source/lib/RippingCluster/ClientLogEntry.class.php
+++ b/source/lib/RippingCluster/ClientLogEntry.class.php
@@ -0,0 +1,23 @@
+<?php
+
+class RippingCluster_ClientLogEntry extends RippingCluster_LogEntry {
+
+    public static function debug($logger, $job_id, $message) {
+        static::log($logger, SihnonFramework_Log::LEVEL_DEBUG, $job_id, $message, 'client');
+    }
+
+    public static function info($logger, $job_id, $message) {
+        static::log($logger, SihnonFramework_Log::LEVEL_INFO, $job_id, $message, 'client');
+    }
+
+    public static function warning($logger, $job_id, $message) {
+        static::log($logger, SihnonFramework_Log::LEVEL_WARNING, $job_id, $message, 'client');
+    }
+
+    public static function error($logger, $job_id, $message) {
+        static::log($logger, SihnonFramework_Log::LEVEL_ERROR, $job_id, $message, 'client');
+    }
+    
+};
+
+?>
--- a/source/lib/RippingCluster/Exceptions.class.php
+++ b/source/lib/RippingCluster/Exceptions.class.php
@@ -0,0 +1,11 @@
+<?php
+
+class RippingCluster_Exception extends Exception {};
+
+class RippingCluster_Exception_InvalidSourceDirectory extends RippingCluster_Exception {};
+
+class RippingCluster_Exception_LogicException         extends RippingCluster_Exception {};
+class RippingCluster_Exception_JobNotRunning          extends RippingCluster_Exception_LogicException {};
+
+
+?>
--- a/source/lib/RippingCluster/Job.class.php
+++ b/source/lib/RippingCluster/Job.class.php
@@ -111,7 +111,7 @@ class RippingCluster_Job {
        $jobs = array();

        $database = RippingCluster_Main::instance()->database();
-        foreach ($database->selectList('SELECT * FROM jobs WHERE id > 0') as $row) {
+        foreach ($database->selectList('SELECT * FROM jobs WHERE id > 0 ORDER BY id DESC') as $row) {
            $job = self::fromDatabaseRow($row);
            
            self::$cache[$job->id] = $job;
@@ -135,7 +135,7 @@ class RippingCluster_Job {
            $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) {
+        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 DESC {$limitSql}", $params) as $row) {
            $jobs[] = self::fromDatabaseRow($row);
        }

@@ -183,10 +183,12 @@ class RippingCluster_Job {
        $database = RippingCluster_Main::instance()->database();
        $database->insert(
        	'INSERT INTO jobs 
-        	(id,name,source,destination,title,format,video_codec,video_width,video_height,quantizer,deinterlace,audio_tracks,audio_codecs,audio_names,subtitle_tracks)
+        	(id,name,source_plugin,rip_plugin,source,destination,title,format,video_codec,video_width,video_height,quantizer,deinterlace,audio_tracks,audio_codecs,audio_names,subtitle_tracks)
        	VALUES(NULL,:name,:source,:destination,:title,:format,:video_codec,:video_width,:video_height,:quantizer,:deinterlace,:audio_tracks,:audio_codecs,:audio_names,:subtitle_tracks)',
            array(
                array('name' => 'name',            'value' => $this->name,                 'type' => PDO::PARAM_STR),
+                array('name' => 'source_plugin',   'value' => $this->source_plugin,        'type' => PDO::PARAM_STR),
+                array('name' => 'rip_plugin',      'value' => $this->rip_plugin,           'type' => PDO::PARAM_STR),
                array('name' => 'source',          'value' => $this->source_filename,      'type' => PDO::PARAM_STR),
                array('name' => 'destination',     'value' => $this->destination_filename, 'type' => PDO::PARAM_STR),
                array('name' => 'title',           'value' => $this->title,                'type' => PDO::PARAM_INT),
@@ -212,18 +214,16 @@ class RippingCluster_Job {
        $database->update(
            'DELETE FROM jobs WHERE id=:job_id LIMIT 1',
            array(
-                array(name => 'job_id', value => $this->id, type => PDO::PARAM_INT),
+                array('name' => 'job_id', 'value' => $this->id, 'type' => PDO::PARAM_INT),
            )    
        );

        $this->id = null;
    }

-    public function queue($gearman) {
+    public function queue() {
        $main = RippingCluster_Main::instance();
        $config = $main->config();
-        $log = $main->log();
-        $log->info('Starting job', $this->id);
        
        // Construct the rip options
        $rip_options = array(
@@ -244,16 +244,7 @@ class RippingCluster_Job {
            'subtitle_tracks' => $this->subtitle_tracks,
        );
        
-        // Enqueue this rip
-        if ( ! $this->id) {
-            throw new RippingCluster_Exception_LogicException("Rip cannot be queued without being saved!");
-        }
-        $task = $gearman->addTask('handbrake_rip', serialize($rip_options), $config->get('rips.context'), $this->id);
-        if ($task) {
-            $this->updateStatus(RippingCluster_JobStatus::QUEUED);
-        } else {
-            $this->updateStatus(RippingCluster_JobStatus::FAILED);
-        }
+        return array('HandBrake', array('rip_options' => $rip_options));
    }

    protected function loadStatuses() {
@@ -283,6 +274,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) {
@@ -292,6 +296,7 @@ class RippingCluster_Job {
        $running_time = $current_status->mtime() - $current_status->ctime();
        $progress     = $current_status->ripProgress();
        
+        $remaining_time = 0;
        if ($progress > 0) {
            $remaining_time = round((100 - $progress) * ($running_time / $progress));
        }
@@ -330,6 +335,14 @@ class RippingCluster_Job {
        return $this->name;
    }
    
+    public function sourcePlugin() {
+        return $this->source_plugin;
+    }
+    
+    public function ripPlugin() {
+        return $this->rip_plugin;
+    }
+
    public function sourceFilename() {
        return $this->source_filename;
    }
@@ -343,7 +356,7 @@ class RippingCluster_Job {
    }

    public static function runAllJobs() {
-        RippingCluster_BackgroundTask::run('/usr/bin/php run-jobs.php');
+        RippingCluster_BackgroundTask::run('/usr/bin/php ' . RippingCluster_Main::makeAbsolutePath('run-jobs.php'));
    }
    
 };
--- a/source/lib/RippingCluster/JobStatus.class.php
+++ b/source/lib/RippingCluster/JobStatus.class.php
--- a/source/lib/RippingCluster/LogEntry.class.php
+++ b/source/lib/RippingCluster/LogEntry.class.php
@@ -0,0 +1,86 @@
+<?php
+
+class RippingCluster_LogEntry extends SihnonFramework_LogEntry {
+    
+    protected $job_id;
+    
+    protected static $types;
+    
+    public static function initialise() {
+    	// Copy the list of datatypes from the parent
+    	// We can't modify it in place, else we'll break any logging done inside the SihnonFramework tree
+    	// or other subclass trees.
+    	static::$types = parent::$types;
+    	
+    	// Add the new data types for this subclass
+        static::$types['job_id'] = 'int'; 
+    }
+
+    protected function __construct($level, $category, $ctime, $hostname, $progname, $pid, $file, $line, $message, $job_id) {
+        parent::__construct($level, $category, $ctime, $hostname, $progname, $pid, $file, $line, $message);
+        
+        $this->job_id = $job_id;
+    }
+    
+    public static function fromArray($row) {
+        return new self(
+            $row['level'],
+            $row['category'],
+            $row['ctime'],
+            $row['hostname'],
+            $row['progname'],
+            $row['pid'],
+            $row['file'],
+            $row['line'],
+            $row['message'],
+            $row['job_id']
+        );
+    }
+ 
+    public function values() {
+        return array(
+            $this->level,
+            $this->category,
+            $this->ctime,
+            $this->hostname,
+            $this->progname,
+            $this->pid,
+            $this->file,
+            $this->line,
+            $this->message,
+            $this->job_id,
+        );
+    }
+    
+    public function jobId() {
+        return $this->job_id;
+    }
+    
+    protected static function log($logger, $severity, $job_id, $message, $category = SihnonFramework_Log::CATEGORY_DEFAULT) {
+        $backtrace = debug_backtrace(false);
+        $entry = new self($severity, $category, time(), static::$localHostname, static::$localProgname, getmypid(), $backtrace[1]['file'], $backtrace[1]['line'], $message, $job_id);
+        
+        $logger->log($entry);
+    }
+    
+    public static function debug($logger, $job_id, $message, $category = SihnonFramework_Log::CATEGORY_DEFAULT) {
+        static::log($logger, SihnonFramework_Log::LEVEL_DEBUG, $job_id, $message, $category);
+    }
+
+    public static function info($logger, $job_id, $message, $category = SihnonFramework_Log::CATEGORY_DEFAULT) {
+        static::log($logger, SihnonFramework_Log::LEVEL_INFO, $job_id, $message, $category);
+    }
+
+    public static function warning($logger, $job_id, $message, $category = SihnonFramework_Log::CATEGORY_DEFAULT) {
+        static::log($logger, SihnonFramework_Log::LEVEL_WARNING, $job_id, $message, $category);
+    }
+
+    public static function error($logger, $job_id, $message, $category = SihnonFramework_Log::CATEGORY_DEFAULT) {
+        static::log($logger, SihnonFramework_Log::LEVEL_ERROR, $job_id, $message, $category);
+    }
+        
+}
+
+RippingCluster_LogEntry::initialise();
+
+?>
--- a/source/lib/RippingCluster/Main.class.php
+++ b/source/lib/RippingCluster/Main.class.php
@@ -0,0 +1,59 @@
+<?php
+
+require 'smarty/Smarty.class.php';
+
+class RippingCluster_Main extends SihnonFramework_Main {
+
+    protected static $instance;
+
+    protected $smarty;
+    protected $request;
+
+    protected function __construct() {
+        parent::__construct();
+
+        $request_string = isset($_GET['l']) ? $_GET['l'] : '';
+
+        $this->request  = new RippingCluster_RequestParser($request_string);
+
+        switch (HBC_File) {
+            case 'ajax':
+            case 'index': {
+                $smarty_tmp = '/tmp/ripping-cluster';
+                $this->smarty = new Smarty();
+                $this->smarty->template_dir = static::makeAbsolutePath('./source/templates');
+                $this->smarty->compile_dir  = static::makeAbsolutePath($smarty_tmp . '/tmp/templates');
+                $this->smarty->cache_dir    = static::makeAbsolutePath($smarty_tmp . '/tmp/cache');
+                $this->smarty->config_dir   = static::makeAbsolutePath($smarty_tmp . '/config');
+                $this->smarty->plugins_dir[]= static::makeAbsolutePath('./source/smarty/plugins');
+                 
+                $this->smarty->registerPlugin('modifier', 'formatDuration', array('RippingCluster_Main', 'formatDuration'));
+                $this->smarty->registerPlugin('modifier', 'formatFilesize', array('RippingCluster_Main', 'formatFilesize'));
+
+                $this->smarty->assign('version', '0.3');
+                $this->smarty->assign('messages', array());
+                 
+                $this->smarty->assign('base_uri', $this->base_uri);
+                $this->smarty->assign('base_url', static::absoluteUrl(''));
+                
+            } break;
+
+        }
+    }
+
+    public function smarty() {
+        return $this->smarty;
+    }
+
+    /**
+     *
+     * @return RippingCluster_RequestParser
+     */
+    public function request() {
+        return $this->request;
+    }
+
+
+}
+
+?>
--- a/source/lib/RippingCluster/Rips/SourceAudioTrack.class.php
+++ b/source/lib/RippingCluster/Rips/SourceAudioTrack.class.php
@@ -25,7 +25,7 @@ class RippingCluster_Rips_SourceAudioTrack {
 	}
 	
 	public function name() {
-		return $name;
+		return $this->name;
 	}
 	
 	public function setName($name) {
--- a/source/lib/RippingCluster/Rips/SourceSubtitleTrack.class.php
+++ b/source/lib/RippingCluster/Rips/SourceSubtitleTrack.class.php
--- a/source/lib/RippingCluster/Rips/SourceTitle.class.php
+++ b/source/lib/RippingCluster/Rips/SourceTitle.class.php
--- a/source/lib/RippingCluster/Source.class.php
+++ b/source/lib/RippingCluster/Source.class.php
@@ -87,7 +87,7 @@ class RippingCluster_Source {
        }
        
        $longest_index = null;
-        $maximmum_duration = 0;
+        $maximum_duration = 0;

        if ( ! $this->titles) {
            return null;
@@ -105,6 +105,14 @@ class RippingCluster_Source {
        return $longest_index;
    }
    
+    /**
+     * Permanently deletes this source from disk
+	 *
+     */
+    public function delete() {
+        RippingCluster_Source_PluginFactory::delete($this->plugin, $this->filename);
+    }
+	
    public function filename() {
        return $this->filename;
    }
--- a/source/lib/RippingCluster/Source/IPlugin.class.php
+++ b/source/lib/RippingCluster/Source/IPlugin.class.php
@@ -41,13 +41,21 @@ interface RippingCluster_Source_IPlugin extends RippingCluster_IPlugin {
    public static function loadEncoded($encoded_filename, $scan = true, $use_cache = true);
    
    /**
-     * Determins if a filename is a valid source loadable using this plugin
+     * Determines if a filename is a valid source loadable using this plugin
     * 
     * @param string $source_filename Filename of the source
     * @return bool
     */
    public static function isValidSource($source_filename);
    
+    /**
+     * Permanently deletes the given source from disk
+     * 
+     * @param RippingCluster_Source $source Source object to be deleted
+     * @return bool
+     */
+    public static function delete($source_filename);
+    
 }

 ?>
--- a/source/lib/RippingCluster/Source/Plugin/Bluray.class.php
+++ b/source/lib/RippingCluster/Source/Plugin/Bluray.class.php
@@ -117,6 +117,20 @@ class RippingCluster_Source_Plugin_Bluray extends RippingCluster_PluginBase impl
        return true;
    }
    
+    /**
+     * Permanently deletes the given source from disk
+     * 
+     * @param RippingCluster_Source $source Source object to be deleted
+     * @return bool
+     */
+    public static function delete($source_filename) {
+        if ( ! self::isValidSource($source_filename)) {
+            return false;
+        }
+        
+        return RippingCluster_Main::rmdir_recursive($source_filename);
+    }
+
 }

 ?>
--- a/source/lib/RippingCluster/Source/Plugin/HandBrake.class.php
+++ b/source/lib/RippingCluster/Source/Plugin/HandBrake.class.php
@@ -217,6 +217,21 @@ class RippingCluster_Source_Plugin_HandBrake extends RippingCluster_PluginBase i
        return false;
    }
    
+    /**
+     * Permanently deletes the given source from disk
+     * 
+     * @param RippingCluster_Source $source Source object to be deleted
+     * @return bool
+     */
+    public static function delete($source_filename) {
+        if ( ! self::isValidSource($source_filename)) {
+            return false;
+        }
+        
+        return RippingCluster_Main::rmdir_recursive($source_filename);
+    }
+    
+    
 }

 ?>
--- a/source/lib/RippingCluster/Source/Plugin/MkvInfo.class.php
+++ b/source/lib/RippingCluster/Source/Plugin/MkvInfo.class.php
@@ -244,6 +244,20 @@ class RippingCluster_Source_Plugin_MkvInfo extends RippingCluster_PluginBase imp
        return true;
    }
    
+    /**
+     * Permanently deletes the given source from disk
+     * 
+     * @param RippingCluster_Source $source Source object to be deleted
+     * @return bool
+     */
+    public static function delete($source_filename) {
+        if ( ! self::isValidSource($source_filename)) {
+            return false;
+        }
+        
+        return unlink($source_filename);
+    }
+    
 }

 ?>
--- a/source/lib/RippingCluster/Source/PluginFactory.class.php
+++ b/source/lib/RippingCluster/Source/PluginFactory.class.php
@@ -2,20 +2,17 @@

 class RippingCluster_Source_PluginFactory extends RippingCluster_PluginFactory {
    
-    const PLUGIN_DIR       = 'RippingCluster/Source/Plugin/';
-    const PLUGIN_PREFIX    = 'RippingCluster_Source_Plugin_';
-    const PLUGIN_INTERFACE = 'RippingCluster_Source_IPlugin';
+    protected static $plugin_prefix    = 'RippingCluster_Source_Plugin_';
+    protected static $plugin_interface = 'RippingCluster_Source_IPlugin';
+    protected static $plugin_dir       = array(
+    	RippingCluster_Lib  => 'RippingCluster/Source/Plugin/',
+	);
+    
    
    public static function init() {
        
    }
    
-    public static function scan() {
-        $candidatePlugins   = parent::findPlugins(self::PLUGIN_DIR);
-        
-        self::loadPlugins($candidatePlugins, self::PLUGIN_PREFIX, self::PLUGIN_INTERFACE);
-    }
-    
    public static function enumerate($plugin) {
        self::ensureScanned();
        
@@ -57,7 +54,7 @@ class RippingCluster_Source_PluginFactory extends RippingCluster_PluginFactory {
        return call_user_func(array(self::classname($plugin), 'loadEncoded'), $encoded_filename, $scan, $use_cache);
    }
    
-    public static function isValidSource($plugin, $source_filename) {
+    /*public static function isValidSource($plugin, $source_filename) {
        self::ensureScanned();
        
        if ( ! self::isValidPlugin($plugin)) {
@@ -65,6 +62,22 @@ class RippingCluster_Source_PluginFactory extends RippingCluster_PluginFactory {
        }
        
        return call_user_func(array(self::classname($plugin), 'isValidSource'), source_filename);
+    }*/
+    
+    /**
+     * Permanently deletes the given source from disk
+     *
+     * @param string $plugin Name of the plugin used to load the source
+     * @param string $source_filename Filename of the source to be deleted
+     */
+    public static function delete($plugin, $source_filename) {
+        self::ensureScanned();
+        
+        if ( ! self::isValidPlugin($plugin)) {
+            return null;
+        }
+        
+        return call_user_func(array(self::classname($plugin), 'delete'), $source_filename);
    }
    
 }
--- a/source/lib/RippingCluster/Utility/BlurayDirectoryIterator.class.php
+++ b/source/lib/RippingCluster/Utility/BlurayDirectoryIterator.class.php
--- a/source/lib/RippingCluster/Utility/ClassFilesIterator.class.php
+++ b/source/lib/RippingCluster/Utility/ClassFilesIterator.class.php
--- a/source/lib/RippingCluster/Utility/DvdDirectoryIterator.class.php
+++ b/source/lib/RippingCluster/Utility/DvdDirectoryIterator.class.php
--- a/source/lib/RippingCluster/Utility/MkvFileIterator.class.php
+++ b/source/lib/RippingCluster/Utility/MkvFileIterator.class.php
--- a/source/lib/RippingCluster/Utility/VisibleFilesIterator.class.php
+++ b/source/lib/RippingCluster/Utility/VisibleFilesIterator.class.php
--- a/source/lib/RippingCluster/Utility/VisibleFilesRecursiveIterator.class.php
+++ b/source/lib/RippingCluster/Utility/VisibleFilesRecursiveIterator.class.php
--- a/source/lib/RippingCluster/Worker.class.php
+++ b/source/lib/RippingCluster/Worker.class.php
@@ -0,0 +1,42 @@
+<?php
+
+class RippingCluster_Worker {
+    
+    protected $gearman;
+    
+    public function __construct() {
+        $this->init();
+        
+    }
+    
+    private function init() {
+        if ($this->gearman) {
+            return;
+        }
+        
+        $config = RippingCluster_Main::instance()->config();
+        
+        $this->gearman = new Net_Gearman_Worker($config->get('rips.job_servers'));
+        
+        // Load all the plugin classes
+        RippingCluster_Worker_PluginFactory::scan();
+        $plugins = RippingCluster_Worker_PluginFactory::getValidPlugins();
+        foreach ($plugins as $plugin) {
+            $this->gearman->addAbility($plugin);
+        }
+    }
+    
+   public function start() {
+       try {
+           $this->gearman->beginWork();
+       } catch (Net_Gearman_Exception $e) {
+           RippingCluster_WorkerLogEntry::error(SihnonFramework_Main::instance()->log(), 0, $e->toText());
+           return false;
+       }
+        
+        return true;
+    }
+        
+}
+
+?>
--- a/source/lib/RippingCluster/Worker/IPlugin.class.php
+++ b/source/lib/RippingCluster/Worker/IPlugin.class.php
@@ -0,0 +1,16 @@
+<?php
+
+interface RippingCluster_Worker_IPlugin extends RippingCluster_IPlugin {
+    
+    /**
+     * Returns the list of functions (and names) implemented by this plugin for registration with Gearman
+     * 
+     * @return array(string => callback)
+     */
+    //public static function workerFunctions();
+
+    //public static function run($args);
+
+}
+
+?>
--- a/source/lib/RippingCluster/Worker/Plugin/Bluray.class.php
+++ b/source/lib/RippingCluster/Worker/Plugin/Bluray.class.php
@@ -51,6 +51,11 @@ class RippingCluster_Worker_Bluray extends RippingCluster_PluginBase implements
        $this->job = RippingCluster_Job::fromId($this->rip_options['id']);
    }
    
+    public static function init() {
+        // Nothing to do
+    }
+    
+    
    /**
     * Returns the list of functions (and names) implemented by this plugin for registration with Gearman
     * 
@@ -62,14 +67,9 @@ class RippingCluster_Worker_Bluray extends RippingCluster_PluginBase implements
        );
    }
    
-    /**
-     * Creates an instance of the Worker plugin, and uses it to execute a single job
-     *
-     * @param GearmanJob $job Gearman Job object, describing the work to be done
-     */
-    public static function rip(GearmanJob $job) {
-        $rip = new self($job);
-        $rip->execute();
+    public static function run($args) {
+        //$rip = new self($job);
+        //$rip->execute();
    }
        
    /**
--- a/source/lib/RippingCluster/Worker/Plugin/FfmpegTranscode.class.php
+++ b/source/lib/RippingCluster/Worker/Plugin/FfmpegTranscode.class.php
@@ -62,14 +62,9 @@ class RippingCluster_Worker_FfmpegTranscode extends RippingCluster_PluginBase im
        );
    }
    
-    /**
-     * Creates an instance of the Worker plugin, and uses it to execute a single job
-     *
-     * @param GearmanJob $job Gearman Job object, describing the work to be done
-     */
-    public static function rip(GearmanJob $job) {
-        $rip = new self($job);
-        $rip->execute();
+    public static function run($args) {
+        //$rip = new self($job);
+        //$rip->execute();
    }
        
    /**
--- a/source/lib/RippingCluster/Worker/PluginFactory.class.php
+++ b/source/lib/RippingCluster/Worker/PluginFactory.class.php
@@ -2,19 +2,21 @@

 class RippingCluster_Worker_PluginFactory extends RippingCluster_PluginFactory {
    
-    const PLUGIN_DIR       = 'RippingCluster/Worker/Plugin/';
-    const PLUGIN_PREFIX    = 'RippingCluster_Worker_Plugin_';
-    const PLUGIN_INTERFACE = 'RippingCluster_Worker_IPlugin';
+    protected static $plugin_prefix    = 'Net_Gearman_Job_';
+    protected static $plugin_interface = 'RippingCluster_Worker_IPlugin';
+    protected static $plugin_dir       = array(
+        RippingCluster_Lib => 'Net/Gearman/Job/',
+    );
    
    public static function init() {
        
    }
    
-    public static function scan() {
+/*    public static function scan() {
        $candidatePlugins   = parent::findPlugins(self::PLUGIN_DIR);
        
        parent::loadPlugins($candidatePlugins, self::PLUGIN_PREFIX, self::PLUGIN_INTERFACE);
-    }
+}*/
    
    public static function getPluginWorkerFunctions($plugin) {
        if ( ! self::isValidPlugin($plugin)) {
--- a/source/lib/RippingCluster/WorkerLogEntry.class.php
+++ b/source/lib/RippingCluster/WorkerLogEntry.class.php
@@ -0,0 +1,23 @@
+<?php
+
+class RippingCluster_WorkerLogEntry extends RippingCluster_LogEntry {
+
+    public static function debug($logger, $job_id, $message) {
+        static::log($logger, SihnonFramework_Log::LEVEL_DEBUG, $job_id, $message, 'worker');
+    }
+
+    public static function info($logger, $job_id, $message) {
+        static::log($logger, SihnonFramework_Log::LEVEL_INFO, $job_id, $message, 'worker');
+    }
+
+    public static function warning($logger, $job_id, $message) {
+        static::log($logger, SihnonFramework_Log::LEVEL_WARNING, $job_id, $message, 'worker');
+    }
+
+    public static function error($logger, $job_id, $message) {
+        static::log($logger, SihnonFramework_Log::LEVEL_ERROR, $job_id, $message, 'worker');
+    }
+    
+};
+
+?>
--- a/webui/_inc.php
+++ b/webui/_inc.php
@@ -1,6 +1,16 @@
 <?php

-require_once '../config.php';
-require_once RippingCluster_Lib . 'RippingCluster/Main.class.php';
+if (isset($_SERVER['RIPPING_CLUSTER_CONFIG']) && 
+    file_exists($_SERVER['RIPPING_CLUSTER_CONFIG']) &&
+    is_readable($_SERVER['RIPPING_CLUSTER_CONFIG'])) {
+    require_once($_SERVER['RIPPING_CLUSTER_CONFIG']);
+} else {
+    require_once '/etc/ripping-cluster/config.php';
+}
+
+require_once SihnonFramework_Lib . 'SihnonFramework/Main.class.php';
+
+SihnonFramework_Main::registerAutoloadClasses('SihnonFramework', SihnonFramework_Lib,
+												'RippingCluster', RippingCluster_Lib);

 ?>
--- a/webui/a.php
+++ b/webui/a.php
@@ -0,0 +1,22 @@
+<?php
+
+define('HBC_File', 'ajax');
+
+require '_inc.php';
+
+try {
+    $main = RippingCluster_Main::instance();
+    RippingCluster_LogEntry::setLocalProgname('webui');        	
+    $smarty = $main->smarty();
+    
+    $page = new RippingCluster_Page($smarty, $main->request());
+    if ($page->evaluate()) {
+        //header('Content-Type: text/json');
+        $smarty->display('ajax.tpl');
+    }
+    
+} catch (RippingCluster_Exception $e) {
+    die("Uncaught Exception: " . $e->getMessage());
+}
+
+?>
--- a/webui/index.php
+++ b/webui/index.php
@@ -6,6 +6,7 @@ require '_inc.php';

 try {
    $main = RippingCluster_Main::instance();
+    RippingCluster_LogEntry::setLocalProgname('webui');        	
    $smarty = $main->smarty();
    
    $page = new RippingCluster_Page($smarty, $main->request());
--- a/webui/pages/job-details.php
+++ b/webui/pages/job-details.php
@@ -1,13 +0,0 @@
-<?php
-
-$job_id = $this->request->get('id');
-$job = RippingCluster_Job::fromId($job_id);
-$this->smarty->assign('job', $job);
-
-$client_log_entries = RippingCluster_ClientLogEntry::recentForJob($job_id, 30);
-$worker_log_entries = RippingCluster_WorkerLogEntry::recentForJob($job_id, 30);
-$this->smarty->assign('client_log_entries', $client_log_entries);
-$this->smarty->assign('worker_log_entries', $worker_log_entries);
-
-
-?>
--- a/webui/pages/logs.php
+++ b/webui/pages/logs.php
@@ -1,9 +0,0 @@
-<?php
-
-$client_log_entries = RippingCluster_ClientLogEntry::recent(30);
-$worker_log_entries = RippingCluster_WorkerLogEntry::recent(30);
-
-$this->smarty->assign('client_log_entries', $client_log_entries);
-$this->smarty->assign('worker_log_entries', $worker_log_entries);
-
-?>
--- a/webui/run-jobs.php
+++ b/webui/run-jobs.php
@@ -2,72 +2,67 @@

 define('HBC_File', 'run-jobs');

-require_once '../config.php';
-require_once RippingCluster_Lib . 'RippingCluster/Main.class.php';
+require_once '/etc/ripping-cluster/config.php';
+require_once(SihnonFramework_Lib . 'SihnonFramework/Main.class.php');
+require_once 'Net/Gearman/Client.php';
+
+SihnonFramework_Main::registerAutoloadClasses('SihnonFramework', SihnonFramework_Lib,
+												'RippingCluster', RippingCluster_Lib);

 try {
    $main = RippingCluster_Main::instance();
    $config = $main->config();
    $log = $main->log();
    
-    $gearman = new GearmanClient();
-    $gearman->addServers($config->get('rips.job_servers'));
-    $gearman->setCreatedCallback("gearman_created_callback");
-    $gearman->setDataCallback("gearman_data_callback");
-    $gearman->setCompleteCallback("gearman_complete_callback");
-    $gearman->setFailCallback("gearman_fail_callback");
+    $client = new Net_Gearman_Client($config->get('rips.job_servers'));
+    $set    = new Net_Gearman_Set();
    
    // Retrieve a list of Created jobs
    $jobs = RippingCluster_Job::allWithStatus(RippingCluster_JobStatus::CREATED);
    
    foreach ($jobs as $job) {
        // Enqueue the job using gearman
-        $job->queue($gearman);
+        list($method, $rip_options) = $job->queue();
+        $task = new Net_Gearman_Task($method, $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');
    }
    
+    $job_count = count($jobs);
+    RippingCluster_ClientLogEntry::info($log, null, "Job queue started with {$job_count} jobs.", 'batch');
+    
    // Start the job queue
-    $result = $gearman->runTasks();
-    if (!$result) {
-        $log->error($gearman->error());
-        die($gearman->error());
-    }
+    $result = $client->runSet($set);
        
-    $log->info("Job queue completed");
+    RippingCluster_ClientLogEntry::info($log, null, 'Job queue completed', 'batch');
    
 } catch (RippingCluster_Exception $e) {
    die("Uncaught Exception (" . get_class($e) . "): " . $e->getMessage() . "\n");
 }


-function gearman_created_callback($gearman_task) {
+function gearman_complete($method, $handle, $result) {
    $main = RippingCluster_Main::instance();
    $log = $main->log();
    
-    $log->info("Job successfully queued with Gearman", $gearman_task->unique());
+    $job = RippingCluster_Job::fromId($result['id']);
+    $job->updateStatus(RippingCluster_JobStatus::COMPLETE);
+    
+    RippingCluster_ClientLogEntry::info($log, $job->id(), 'Job complete');
 }

-function gearman_data_callback($gearman_task) {
+function gearman_fail($task) {
    $main = RippingCluster_Main::instance();
    $log = $main->log();
    
-    $log->debug("Received data callback from Gearman Task");
-}
-
-function gearman_complete_callback($gearman_task) {
-    $main = RippingCluster_Main::instance();
-    $log = $main->log();
-    
-    $log->info("Job Complete", $job->id());
-}
-
-function gearman_fail_callback($gearman_task) {
-    $main = RippingCluster_Main::instance();
-    $log = $main->log();
-    
-    $job = RippingCluster_Job::fromId($gearman_task->unique());
+    $job = RippingCluster_Job::fromId($task->arg['rip_options']['id']);
    $job->updateStatus(RippingCluster_JobStatus::FAILED);
    
-    $log->info("Job Failed", $job->id());
+    RippingCluster_ClientLogEntry::info($log, $job->id(), "Job failed with message: {$task->result}");
 }


--- a/webui/scripts/main.js
+++ b/webui/scripts/main.js
@@ -0,0 +1,339 @@
+var rc = {
+
+    init: function() {
+        rc.ajax.init();
+        rc.dialog.init();
+        rc.page.init();
+    },
+        
+    ajax: {
+        
+        init: function() {
+        
+        },
+        
+        get: function(url) {
+            $.ajax({
+                url: url,
+                type: "GET", 
+                dataType: "json", 
+                success: rc.ajax.success, 
+                error: rc.ajax.failure
+            });
+        },
+        
+        post: function(url, data) {
+            $.ajax({
+                url: url,
+                type: "POST", 
+                dataType: "json",
+                data: data,
+                success: rc.ajax.success, 
+                error: rc.ajax.failure
+            });            
+        },
+        
+        success: function(d, s, x) {
+            rc.page.update(d);
+            rc.dialog.prepare(d);
+            rc.trigger_all(d);
+        },
+        
+        failure: function(x, s, e) {
+            console.log("Ajax Failure: " + s, e);
+            console.log(x.responseText);
+        }
+    },
+
+    dialog: {
+        
+        init: function() {
+            $("#dialogheaderclose").click(rc.dialog.close);
+        },
+        
+        prepare: function(d) {
+            if (d.dialog && d.dialog.show) {
+                
+                if (d.dialog.buttons) {
+                    switch (d.dialog.buttons.type) {
+                    case 'ok':
+                        $("#dialogfooterok").click(
+                            function() {
+                                rc.trigger(d.dialog.buttons.actions.ok, d.dialog.buttons.params);
+                            }
+                        );
+                        $("#dialogfooterok").show();
+                        break;
+                    case 'okcancel':
+                        $("#dialogfooterokcancel_ok").click(function() {
+                            rc.trigger(d.dialog.buttons.actions.ok, d.dialog.buttons.params);
+                        });
+                        $("#dialogfooterokcancel_cancel").click(function() {
+                            rc.trigger(d.dialog.buttons.actions.cancel, d.dialog.buttons.params); 
+                        });
+                        $("#dialogfooterokcancel").show();
+                        break;
+                    case 'yesno': 
+                        $("#dialogfooteryes").click(
+                            function() {
+                                rc.trigger(d.dialog.buttons.actions.yes, d.dialog.buttons.params);
+                            }
+                        );
+                        $("#dialogfooterno").click(
+                            function() {
+                                rc.trigger(d.dialog.buttons.actions.no, d.dialog.buttons.params);
+                            }
+                        );
+                        $("#dialogfooteryesno").show();
+                        break;
+                    }
+                }
+                
+                if (d.dialog.title) {
+                    $('#dialogheadertitle').html(d.dialog.title);
+                }
+                
+                if (d.dialog.content) {
+                    $('#dialogcontent').html(d.dialog.content);
+                }
+                
+                $("#dialog").show();
+            }
+        },
+        
+        close: function() {
+            // Hide the dialog
+            $("#dialog").hide();
+            
+            // Remove the dialog content
+            $("#dialogcontent").html();
+            
+            // Hide all buttons
+            $(".dialogfooterbuttonset").hide();
+            // Strip all event handlers
+            $(".dialogfooterbuttonset input[type='button']").unbind('click');
+        },
+        
+        error: function(title, content, messages) {
+            var formatted_content = $('<div>').append($('<p>').text('content'));
+            if (messages) {
+                var formatted_messages = $('<ul>');
+                for (var message in messages) {
+                    formatted_messages.append($('<li>').text(message));
+                }
+                
+                formatted_content.append($('<p>').text('These messages were reported:').append(formatted_messages));
+            }
+            
+            rc.dialog.prepare({
+                dialog: {
+                    show: true,
+                    title: title,
+                    content: formatted_content,
+                    buttons: {
+                        type: 'ok',
+                        actions: {
+                            ok: 'close-dialog'
+                        }
+                    }
+                }                
+            });
+        }
+        
+    },
+    
+    page: {
+        
+        init: function() {
+        
+        },
+        
+        update: function(d) {
+            for ( var f in d.page_replacements) {
+                $("#" + f).html(d.page_replacements[f].content);
+            }            
+        }
+    },
+    
+    sources: {
+        
+        remove: function(plugin, source) {
+            rc.ajax.get(base_url + "ajax/delete-source/plugin/" + plugin + "/id/" + source);        
+        },
+        
+        remove_confirmed: function(plugin, source) {
+            rc.ajax.get(base_url + "ajax/delete-source/plugin/" + plugin + "/id/" + source + "/confirm/");
+        }
+        
+    },
+    
+    actions: {
+        
+        'close-dialog': function(params) {
+            rc.dialog.close();
+        },
+        
+        'delete-source-confirm': function(params) {
+            rc.sources.remove_confirmed(params['plugin'], params['id']);
+        },
+        
+        'add-setting': function(params) {
+            rc.ajax.post(base_url + 'ajax/admin/add-setting/name/' + $('#'+params.name).val() + '/type/' + $('#'+params.type).val() + '/');
+        },
+        
+        'add_setting_row': function(params) {
+            $("#settings tbody").append(params.content);
+        },
+        
+        'rename_setting': function(params) {
+            rc.ajax.post(base_url + 'ajax/admin/rename-setting/name/' + params.name + '/new-name/' + $('#'+params.new_name_field).val() + '/confirm/');
+        },
+        
+        'rename_setting_confirm': function(params) {
+            $('#setting_'+params.old_id+'_row').replaceWith($(params.content));
+        },
+        
+        'remove_setting': function(params) {
+            rc.ajax.post(base_url + 'ajax/admin/remove-setting/name/' + params.name + '/');
+            rc.trigger('remove_setting_row', params);
+        },
+        
+        'remove_setting_row': function(params) {
+            $('#setting_' + params.id + '_row').remove();
+        }
+        
+    },
+    
+    trigger: function(action, params) {
+        // Handle a list of actions by repeated calling self for each argument
+        if (action instanceof Array) {
+            for(i in action) {
+                rc.trigger(action[i], params);
+            }
+            return;
+        }
+        
+        // Check if action is supported, and execute it
+        if (rc.actions[action]) {
+            rc.actions[action](params);
+        } else {
+            console.log("Action not supported: " +action);
+        }
+    },
+    
+    trigger_all: function(params) {
+        if (params.actions) {
+            for (var action in params.actions) {
+                rc.trigger(action, params.actions[action]);
+            }
+        }
+    },
+    
+    settings: {
+        
+        init: function() {
+            $("#settings_save").click(function() {
+                rc.settings.save();
+            });
+            
+            $("#settings_new").click(function() {
+                rc.settings.new_setting();
+            });
+        },
+        
+        new_setting: function() {
+            rc.ajax.get(base_url + "ajax/admin/new-setting/");
+        },
+        
+        rename_setting: function(id, name) {
+            rc.ajax.get(base_url + "ajax/admin/rename-setting/name/" + name + "/");
+        },
+        
+        remove_setting: function(id, name) {
+            rc.dialog.prepare({
+                dialog: {
+                    show: true,
+                    title: 'Remove setting',
+                    content: "Do you really want to remove setting '" + name + "'",
+                    buttons: {
+                        type: 'okcancel',
+                        actions: {
+                            ok: [
+                                'remove_setting',
+                                'close-dialog'
+                            ],
+                            cancel: 'close-dialog'
+                        },
+                        params: {
+                            id: id,
+                            name: name
+                        }
+                    }
+                }
+            });
+        },
+        
+        add_stringlist_field: function(id) {
+            var container = $('#container_'+id);
+            var next = $('#settings_'+id+'_next');
+            var next_value = next.val();
+            
+            var line = $('<div>');
+            line.attr('id', 'settings_'+id+'_line'+next.val());
+            line.append($('<input type="text" class="settings_field_string" />'));
+            line.append(' ');
+            var button = $('<input type="button" value="-" class="settings_field_remove"/>');
+            button.click(function() {
+                rc.settings.remove_field(id, next_value);
+            });
+            line.append(button);
+            
+            // Add the new item
+            container.append(line);
+            
+            // Increment the next counter
+            next.val(parseInt(next_value)+1);
+            
+        },
+    
+        remove_stringlist_field: function(id, line) {
+            $("#settings_"+id+"_line"+line).remove();
+        }, 
+        
+        save: function() {
+            
+            var settings = {};
+            
+            var fields = $("input.setting").get();
+            for (var i in fields) {
+                var setting = fields[i];
+                var name = setting.name;
+                var value;
+                
+                switch(setting.type) {
+                    case 'checkbox':
+                        value = $(setting).is(':checked') ? 1 : 0;
+                        break;
+                    default:
+                        value = setting.value;
+                }
+                
+                if (/\[\]$/.test(name)) {
+                    if (! settings[name]) {
+                        settings[name] = [];
+                    }
+                    settings[name].push(value);
+                } else { 
+                    settings[name] = value;
+                }                    
+            }
+              
+            rc.ajax.post(base_url + "ajax/update-settings/", settings);
+            
+        }
+        
+    }
+     
+};
+
+$(document).ready(rc.init);
--- a/webui/source/pages/admin/settings.php
+++ b/webui/source/pages/admin/settings.php
@@ -0,0 +1,11 @@
+<?php
+
+$main   = RippingCluster_Main::instance();
+$config = $main->config();
+
+$settings = $config->enumerateAll();
+asort($settings);
+$this->smarty->assign('settings', $settings);
+$this->smarty->assign('config', $config);
+
+?>
--- a/webui/source/pages/ajax/admin/add-setting.php
+++ b/webui/source/pages/ajax/admin/add-setting.php
@@ -0,0 +1,51 @@
+<?php
+
+$main   = RippingCluster_Main::instance();
+$req    = $main->request();
+$config = $main->config();
+
+$messages = array();
+$result = false;
+
+try {
+    $name   = $req->get('name', 'RippingCluster_Exception_InvalidParameters');
+    $type   = $req->get('type', 'RippingCluster_Exception_InvalidParameters');
+    
+    // Convert the web-friendly type field into the correct internal name
+    $value = null;
+    switch($type) {
+        case 'bool': {
+            $type = Sihnon_Config::TYPE_BOOL;
+            $value = false;
+        } break;
+        case 'int': {
+            $type = Sihnon_Config::TYPE_INT;
+            $value = 0;
+        } break;
+        case 'string': {
+            $type = Sihnon_Config::TYPE_STRING;
+            $value = '';
+        } break;
+        case 'string-list': {
+            $type = Sihnon_Config::TYPE_STRING_LIST;
+            $value = array();
+        } break;
+    }
+    
+    // Add the new (empty) value. This is because no suitable UI has been presented yet.
+    // Possible future fix, to insert intermediate dialog to capture the value using the correct UI.
+    $result = $config->add($name, $type, $value);
+    $this->smarty->assign('success', $result);
+    
+    $this->smarty->assign('name', $name);
+    $this->smarty->assign('id', str_replace('.', '-',$name));
+    $this->smarty->assign('type', $type);
+    $this->smarty->assign('value', '');
+
+} catch(RippingCluster_Exception $e) {
+    $messages[] = get_class($e) . ':' . $e->getMessage();
+    $this->smarty->assign('messages', $messages);
+    $this->smarty->assign('success', false);    
+}
+
+?>
--- a/webui/source/pages/ajax/admin/remove-setting.php
+++ b/webui/source/pages/ajax/admin/remove-setting.php
@@ -0,0 +1,23 @@
+<?php
+
+$main   = RippingCluster_Main::instance();
+$req    = $main->request();
+$config = $main->config();
+
+$messages = array();
+$result = false;
+
+try {
+    $name   = $req->get('name', 'RippingCluster_Exception_InvalidParameters');
+
+    $result = $config->remove($name);
+    $this->smarty->assign('success', $result);
+    
+} catch(RippingCluster_Exception $e) {
+    $messages[] = get_class($e) . ':' . $e->getMessage();
+    $this->smarty->assign('messages', $messages);
+    $this->smarty->assign('success', false);    
+}
+    
+
+?>
--- a/webui/source/pages/ajax/admin/rename-setting.php
+++ b/webui/source/pages/ajax/admin/rename-setting.php
@@ -0,0 +1,39 @@
+<?php
+
+$main   = RippingCluster_Main::instance();
+$req    = $main->request();
+$config = $main->config();
+
+$messages = array();
+$result = false;
+
+$confirm = $req->exists('confirm');
+$this->smarty->assign('confirm', $confirm);
+
+if ($confirm) {
+    try {
+        $name     = $req->get('name', 'RippingCluster_Exception_InvalidParameters');
+        $new_name = $req->get('new-name', 'RippingCluster_Exception_InvalidParameters');
+        
+        $result = $config->rename($name, $new_name);
+        $this->smarty->assign('success', $result);
+        
+        $this->smarty->assign('old_name', $name);
+        $this->smarty->assign('old_id', str_replace('.', '-', $name));
+        $this->smarty->assign('name', $new_name);
+        $this->smarty->assign('id', str_replace('.', '-', $new_name));
+        $this->smarty->assign('type', $config->type($new_name));
+        $this->smarty->assign('value', $config->get($new_name));
+        
+    } catch(RippingCluster_Exception $e) {
+        $messages[] = get_class($e) . ':' . $e->getMessage();
+        $this->smarty->assign('messages', $messages);
+        $this->smarty->assign('success', false);    
+    }
+} else {
+    $name     = $req->get('name', 'RippingCluster_Exception_InvalidParameters');
+    $this->smarty->assign('name', $name);
+}
+    
+
+?>
--- a/webui/source/pages/ajax/delete-source.php
+++ b/webui/source/pages/ajax/delete-source.php
@@ -0,0 +1,35 @@
+<?php
+
+$main   = RippingCluster_Main::instance();
+$req    = $main->request();
+$config = $main->config();
+
+// Grab the name of this source
+$encoded_filename = null;
+if ($req->exists('confirm')) {
+    $this->smarty->assign('confirmed', true);
+    
+    $plugin = $req->get('plugin', 'RippingCluster_Exception_InvalidParameters');
+    $encoded_filename = $req->get('id', 'RippingCluster_Exception_InvalidParameters');
+    
+    $source = RippingCluster_Source_PluginFactory::loadEncoded($plugin, $encoded_filename, false);
+    $source->delete();
+    
+    // Generate a new list of sources to update the page with
+    $all_sources = RippingCluster_Source_PluginFactory::enumerateAll();
+    $this->smarty->assign('all_sources', $all_sources);
+    
+} else {
+    $this->smarty->assign('confirmed', false);
+    
+    $plugin = $req->get('plugin', 'RippingCluster_Exception_InvalidParameters');
+    $encoded_filename = $req->get('id', 'RippingCluster_Exception_InvalidParameters');
+    
+    $source = RippingCluster_Source_PluginFactory::loadEncoded($plugin, $encoded_filename, false);
+    
+    $this->smarty->assign('source', $source);
+    $this->smarty->assign('source_plugin', $plugin);
+    $this->smarty->assign('source_id', $encoded_filename);
+}
+
+?>
--- a/webui/source/pages/ajax/source-list.php
+++ b/webui/source/pages/ajax/source-list.php
@@ -0,0 +1,9 @@
+<?php
+
+$main = RippingCluster_Main::instance();
+$config = $main->config();
+
+$all_sources = RippingCluster_Source_PluginFactory::enumerateAll();
+$this->smarty->assign('all_sources', $all_sources);
+    
+?>
--- a/webui/source/pages/ajax/update-settings.php
+++ b/webui/source/pages/ajax/update-settings.php
@@ -0,0 +1,22 @@
+<?php
+
+$main = RippingCluster_Main::instance();
+$config = $main->config();
+
+$messages = array();
+
+// Iterate over the settings and store each one back to the backend
+foreach($_POST as $key => $value) {
+    // Convert - to . (to work around the PHP register global backwards compatibility that renames input variables)
+    $key = str_replace("-", ".", $key);
+    
+    if ($config->exists($key)) {
+        $config->set($key, $value);
+    } else {
+        $messages[] = "Unknown config key '{$key}', value not updated.";
+    }
+}
+
+$this->smarty->assign('messages', $messages);
+
+?>
--- a/webui/source/pages/errors/404.php
+++ b/webui/source/pages/errors/404.php
--- a/webui/source/pages/errors/unhandled-exception.php
+++ b/webui/source/pages/errors/unhandled-exception.php
--- a/webui/source/pages/home.php
+++ b/webui/source/pages/home.php
@@ -1,10 +1,12 @@
 <?php

-    $running_jobs   = RippingCluster_Job::allWithStatus(RippingCluster_JobStatus::RUNNING, 5);
-    $completed_jobs = RippingCluster_Job::allWithStatus(RippingCluster_JobStatus::COMPLETE, 5);
-    $failed_jobs    = RippingCluster_Job::allWithStatus(RippingCluster_JobStatus::FAILED, 5);
+    $running_jobs   = RippingCluster_Job::allWithStatus(RippingCluster_JobStatus::RUNNING, 10);
+    $queued_jobs    = RippingCluster_Job::allWithStatus(RippingCluster_JobStatus::QUEUED, 10);
+    $completed_jobs = RippingCluster_Job::allWithStatus(RippingCluster_JobStatus::COMPLETE, 10);
+    $failed_jobs    = RippingCluster_Job::allWithStatus(RippingCluster_JobStatus::FAILED, 10);

    $this->smarty->assign('running_jobs', $running_jobs);
+    $this->smarty->assign('queued_jobs', $queued_jobs);
    $this->smarty->assign('completed_jobs', $completed_jobs);
    $this->smarty->assign('failed_jobs', $failed_jobs);

--- a/webui/source/pages/jobs.php
+++ b/webui/source/pages/jobs.php
@@ -4,7 +4,7 @@ $main   = RippingCluster_Main::instance();
 $req    = $main->request();
 $config = $main->config();

-if ($req->get('submit')) {
+if ($req->exists('submit')) {
    $action =  RippingCluster_Main::issetelse($_POST['action'], 'RippingCluster_Exception_InvalidParameters');

    # If a bulk action was selected, the action will be a single term, otherwise it will also contain
--- a/webui/source/pages/jobs/details.php
+++ b/webui/source/pages/jobs/details.php
@@ -0,0 +1,45 @@
+<?php
+
+$main   = RippingCluster_Main::instance();
+$req    = $main->request();
+$log    = $main->log();
+$config = $main->config();
+
+$job_id = $req->get('id');
+$job = RippingCluster_Job::fromId($job_id);
+$this->smarty->assign('job', $job);
+
+// Fetch log entries for this job
+$log_count = $req->get('logs', $config->get('job.logs.default_display_count'));
+
+$default_log_order = $config->get('job.logs.default_order');
+$log_order = $req->get('order', $default_log_order);
+if ( ! in_array($log_order, array(SihnonFramework_Log::ORDER_ASC, SihnonFramework_Log::ORDER_DESC))) {
+    $log_order = $default_log_order;    
+}
+$this->smarty->assign('log_order', $log_order);
+$this->smarty->assign('log_order_reverse', ($log_order == SihnonFramework_Log::ORDER_ASC ? SihnonFramework_Log::ORDER_DESC : SihnonFramework_Log::ORDER_ASC));
+
+$client_log_entries = array();
+$worker_log_entries = array();
+
+$log_count_display = null;
+if ($log_count == 'all') {
+    $log_count_display = 'all';
+    $log_count = '18446744073709551615'; // see mysql man page for LIMIT
+} else if(!is_int($log_count)) {
+    $log_count = $config->get('job.logs.default_display_count');
+    $log_count_display = $log_count;
+} else {
+    $log_count_display = $log_count;
+}
+
+$client_log_entries = RippingCluster_LogEntry::recentEntriesByField($log, 'webui', 'job_id', $job_id, 'ctime', $log_order, $log_count);
+$worker_log_entries = RippingCluster_LogEntry::recentEntriesByField($log, 'worker', 'job_id', $job_id, 'ctime', $log_order, $log_count);
+
+$this->smarty->assign('log_count_display', $log_count_display);
+$this->smarty->assign('client_log_entries', $client_log_entries);
+$this->smarty->assign('worker_log_entries', $worker_log_entries);
+
+
+?>
--- a/webui/source/pages/logs.php
+++ b/webui/source/pages/logs.php
@@ -0,0 +1,11 @@
+<?php
+
+$log = RippingCluster_Main::instance()->log();
+
+$client_log_entries = RippingCluster_LogEntry::recentEntries($log, 'webui', 'ctime', SihnonFramework_Log::ORDER_DESC, 30);
+$worker_log_entries = RippingCluster_LogEntry::recentEntries($log, 'worker', 'ctime', SihnonFramework_Log::ORDER_DESC, 30);
+
+$this->smarty->assign('client_log_entries', $client_log_entries);
+$this->smarty->assign('worker_log_entries', $worker_log_entries);
+
+?>
--- a/webui/source/pages/rips/setup.php
+++ b/webui/source/pages/rips/setup.php
@@ -6,7 +6,7 @@ $config = $main->config();

 // Grab the name of this source
 $encoded_filename = null;
-if ($req->get('submit')) {
+if ($req->exists('submit')) {
    $encoded_filename = RippingCluster_Main::issetelse($_POST['id'], 'RippingCluster_Exception_InvalidParameters');

    // Create the jobs from the request
@@ -15,9 +15,9 @@ if ($req->get('submit')) {
    // Spawn the background client process to run all the jobs
    RippingCluster_Job::runAllJobs();
    
-    RippingCluster_Page::redirect('rips/setup-rip/queued');
+    RippingCluster_Page::redirect('rips/setup/queued');
    
-} elseif ($req->get('queued')) {
+} elseif ($req->exists('queued')) {
    $this->smarty->assign('rips_submitted', true);
    
 } else {
--- a/webui/source/pages/sources/delete.php
+++ b/webui/source/pages/sources/delete.php
@@ -0,0 +1,28 @@
+<?php
+
+$main   = RippingCluster_Main::instance();
+$req    = $main->request();
+$config = $main->config();
+
+// Grab the name of this source
+$encoded_filename = null;
+if ($req->exists('confirm')) {
+    $plugin = $req->get('plugin', 'RippingCluster_Exception_InvalidParameters');
+    $encoded_filename = $req->get('id', 'RippingCluster_Exception_InvalidParameters');
+    
+    $source = RippingCluster_Source_PluginFactory::loadEncoded($plugin, $encoded_filename, false);
+    $source->delete();
+    
+    // Redirect back to the sources page
+    RippingCluster_Page::redirect('rips/sources');
+
+} else {
+    $plugin = $req->get('plugin', 'RippingCluster_Exception_InvalidParameters');
+    $encoded_filename = $req->get('id', 'RippingCluster_Exception_InvalidParameters');
+    
+    $source = RippingCluster_Source_PluginFactory::loadEncoded($plugin, $encoded_filename, false);
+    
+    $this->smarty->assign('source', $source);
+}
+
+?>
--- a/webui/source/pages/sources/details.php
+++ b/webui/source/pages/sources/details.php
--- a/webui/source/pages/sources/list.php
+++ b/webui/source/pages/sources/list.php
--- a/webui/source/smarty/plugins/compiler.switch.php
+++ b/webui/source/smarty/plugins/compiler.switch.php
@@ -0,0 +1,292 @@
+<?php
+/**
+ * Switch statement plugin for smarty.
+ *    This smarty plugin provides php switch statement functionality in smarty tags.
+ *    To install this plugin drop it into your smarty plugins folder.  You will also need to manually
+ *      load the plugin sot hat all the hooks are registered properly.  Add the following line after
+ *      you load smarty and create an instance of it in your source code.
+ *
+ * <code>
+ *   $this->smartyObj->loadPlugin('smarty_compiler_switch');    
+ * </code>
+ * 
+ * @author Jeremy Pyne <jeremy.pyne@gmail.com>
+ * - Donations: Accepted via PayPal at the above address.
+ * - Updated: 02/10/2010 - Version 3.2
+ * - File: smarty/plugins/compiler.switch.php
+ * - Licence: CC:BY/NC/SA  http://creativecommons.org/licenses/by-nc-sa/3.0/
+ * 
+ * - Updates
+ *    Version 2:
+ *       Changed the break attribute to cause a break to be printed before the next case, instead of before this
+ *          case.  This way makes more sense and simplifies the code.  This change in incompatible with code in
+ *          from version one.  This is written to support nested switches and will work as expected.
+ *    Version 2.1:
+ *       Added {/case} tag, this is identical to {break}.
+ *    Version 3:
+ *       Updated switch statment to support Smarty 3.  This update is NOT backwards compatible but the old version is still maintained.
+ *    Version 3.1:
+ *       Added a prefilter to re-enable the shorthand {switch $myvar} support.  To use the shorthand form you will need to add the following line to your code.
+ *       $smarty->loadPlugin('smarty_compiler_switch');
+ *    Version 3.2:
+ *       Fixed a bug when chaining multiple {case} statements without a {break}.
+ *    Version 3.5: 
+ *       Updated to work with Smarty 3.0 release.  (Tested and working with 3.0.5, no longer compatible with 3.0rcx releases.)  
+ * 
+ * - Bugs/Notes:
+ *
+ * @package Smarty
+ * @subpackage plugins
+ *
+ * Sample usage:
+ * <code>
+ * {foreach item=$debugItem from=$debugData}
+ *  // Switch on $debugItem.type
+ *    {switch $debugItem.type}
+ *       {case 1}
+ *       {case "invalid_field"}
+ *          // Case checks for string and numbers.
+ *       {/case}
+ *       {case $postError}
+ *       {case $getError|cat:"_ajax"|lower}
+ *          // Case checks can also use variables and modifiers.
+ *          {break}
+ *       {default}
+ *          // Default case is supported.
+ *    {/switch}
+ * {/foreach}
+ * </code>
+ *
+ * Note in the above example that the break statements work exactly as expected.  Also the switch and default
+ *    tags can take the break attribute. If set they will break automatically before the next case is printed.
+ *
+ * Both blocks produce the same switch logic:
+ * <code>
+ *    {case 1 break}
+ *       Code 1
+ *    {case 2}
+ *       Code 2
+ *    {default break}
+ *       Code 3
+ * </code>
+ *
+ * <code>
+ *    {case 1}
+ *     Code 1
+ *       {break}
+ *    {case 2}
+ *       Code 2
+ *    {default}
+ *       Code 3
+ *       {break}
+ * </code>
+ *
+ * Finally, there is an alternate long hand style for the switch statments that you may need to use in some cases.
+ *
+ * <code>
+ * {switch var=$type}
+ *    {case value="box" break}
+ *    {case value="line"}
+ *       {break}
+ *    {default}
+ * {/switch}
+ * </code>
+ */
+
+//Register the post and pre filters as they are not auto-registered.
+$this->registerFilter('post', 'smarty_postfilter_switch');
+
+class Smarty_Compiler_Switch extends Smarty_Internal_CompileBase {
+    public $required_attributes = array('var');
+    public $optional_attributes = array();
+    public $shorttag_order = array('var');
+
+/**
+ * Start a new switch statement.
+ *    A variable must be passed to switch on.
+ *  Also, the switch can only directly contain {case} and {default} tags.
+ *
+ * @param string $tag_arg
+ * @param Smarty_Compiler $smarty
+ * @return string
+ */
+    public function compile($args, $compiler){
+        $this->compiler = $compiler;
+        $attr = $this->_get_attributes($args);
+	$_output = '';
+
+        $this->_open_tag('switch',array($compiler->tag_nocache));
+
+        if (is_array($attr['var'])) {
+            $_output .= "<?php if (!isset(\$_smarty_tpl->tpl_vars[".$attr['var']['var']."])) \$_smarty_tpl->tpl_vars[".$attr['var']['var']."] = new Smarty_Variable;";
+            $_output .= "switch (\$_smarty_tpl->tpl_vars[".$attr['var']['var']."]->value = ".$attr['var']['value']."){?>";
+        } else {
+            $_output .= '<?php switch (' . $attr['var'] . '){?>';
+        }
+	return $_output;
+    }
+}
+
+class Smarty_Compiler_Case extends Smarty_Internal_CompileBase {
+    public $required_attributes = array('value');
+    public $optional_attributes = array('break');
+    public $shorttag_order = array('value', 'break');
+
+/**
+ * Print out a case line for this switch.
+ *    A condition must be passed to match on.
+ *    This can only go in {switch} tags.
+ *    If break is passed, a {break} will be rendered before the next case.
+ *
+ * @param string $tag_arg
+ * @param Smarty_Compiler $smarty
+ * @return string
+ */
+    public function compile($args, $compiler){
+        $this->compiler = $compiler;
+        $attr = $this->_get_attributes($args);
+	$_output = '';
+
+        list($last_tag, $last_attr) = $this->compiler->_tag_stack[count($this->compiler->_tag_stack) - 1];
+
+        if($last_tag == 'case')
+        {
+	    list($break, $compiler->tag_nocache) = $this->_close_tag(array('case'));
+            if($last_attr[0])
+                $_output .= '<?php break;?>';
+        }
+        $this->_open_tag('case', array(isset($attr['break']) ? $attr['break'] : false, $compiler->tag_nocache));
+
+        if (is_array($attr['value'])) {
+            $_output .= "<?php if (!isset(\$_smarty_tpl->tpl_vars[".$attr['value']['var']."])) \$_smarty_tpl->tpl_vars[".$attr['value']['var']."] = new Smarty_Variable;";
+            $_output .= "case \$_smarty_tpl->tpl_vars[".$attr['value']['var']."]->value = ".$attr['value']['value'].":?>";
+        } else {
+            $_output .= '<?php case ' . $attr['value'] . ':?>';
+        }
+	return $_output;
+    }
+}
+
+class Smarty_Compiler_Default extends Smarty_Internal_CompileBase {
+    public $required_attributes = array();
+    public $optional_attributes = array('break');
+    public $shorttag_order = array('break');
+
+/**
+ * Print out a default line for this switch.
+ *    This can only go in {switch} tags.
+ *    If break is passed, a {break} will be rendered before the next case.
+ *
+ * @param string $tag_arg
+ * @param Smarty_Compiler $smarty
+ * @return string
+ */
+    public function compile($args, $compiler){
+        $this->compiler = $compiler;
+        $attr = $this->_get_attributes($args);
+	$_output = '';
+
+        list($last_tag, $last_attr) = $this->compiler->_tag_stack[count($this->compiler->_tag_stack) - 1];
+        if($last_tag == 'case')
+        {
+            list($break, $compiler->tag_nocache) = $this->_close_tag(array('case'));
+            if($last_attr[0])
+                $_output .= '<?php break;?>';
+        }
+        $this->_open_tag('case', array(isset($attr['break']) ? $attr['break'] : false, $compiler->tag_nocache));
+
+        $_output .= '<?php default:?>';
+
+	return $_output;
+    }
+}
+
+
+class Smarty_Compiler_Break extends Smarty_Internal_CompileBase { 
+    public $required_attributes = array();
+    public $optional_attributes = array();
+    public $shorttag_order = array();
+
+/**
+ * Print out a break command for the switch.
+ *    This can only go inside of {case} tags.
+ *
+ * @param string $tag_arg
+ * @param Smarty_Compiler $smarty
+ * @return string
+ */
+
+    public function compile($args, $compiler){
+        $this->compiler = $compiler;
+        $attr = $this->_get_attributes($args);
+
+        list($break, $compiler->tag_nocache) = $this->_close_tag(array('case'));
+
+        return '<?php break;?>';
+    }
+}
+
+class Smarty_Compiler_Caseclose extends Smarty_Internal_CompileBase { 
+    public $required_attributes = array();
+    public $optional_attributes = array();
+    public $shorttag_order = array();
+
+/**
+ * Print out a break command for the switch.
+ *    This can only go inside of {case} tags.
+ *
+ * @param string $tag_arg
+ * @param Smarty_Compiler $smarty
+ * @return string
+ */
+
+    public function compile($args, $compiler){
+        $this->compiler = $compiler;
+        $attr = $this->_get_attributes($args);
+
+        list($break, $compiler->tag_nocache) = $this->_close_tag(array('case'));
+
+        return '<?php break;?>';
+    }
+}
+
+class Smarty_Compiler_Switchclose extends Smarty_Internal_CompileBase { 
+    public $required_attributes = array();
+    public $optional_attributes = array();
+    public $shorttag_order = array();
+
+/**
+ * End a switch statement.
+ *
+ * @param string $tag_arg
+ * @param Smarty_Compiler $smarty
+ * @return string
+ */
+
+    public function compile($args, $compiler){
+        $this->compiler = $compiler;
+        $attr = $this->_get_attributes($args);
+
+        list($last_tag, $last_attr) = $this->compiler->_tag_stack[count($this->compiler->_tag_stack) - 1];
+        if(($last_tag == 'case' || $last_tag == 'default'))
+            list($break, $compiler->tag_nocache) = $this->_close_tag(array('case'));
+        list($compiler->tag_nocache) = $this->_close_tag(array('switch'));
+
+        return '<?php }?>';
+    }
+}
+
+/**
+ * Filter the template after it is generated to fix switch bugs.
+ *    Remove any spaces after the 'switch () {' code and before the first case.  Any tabs or spaces
+ *       for layout would cause php errors witch this reged will fix. 
+ *
+ * @param string $compiled
+ * @param Smarty_Compiler $smarty
+ * @return string
+ */
+function smarty_postfilter_switch($compiled, &$smarty) {
+        // Remove the extra spaces after the start of the switch tag and before the first case statement.
+        return preg_replace('/({ ?\?>)\s+(<\?php case)/', "$1\n$2", $compiled);
+}
+?>
--- a/webui/source/templates/admin/settings.tpl
+++ b/webui/source/templates/admin/settings.tpl
@@ -0,0 +1,29 @@
+<h2>Settings</h2>
+
+<table id="settings">
+    <thead>
+        <th>Name</th>
+        <th>Value</th>
+    </thead>
+    <tbody>
+        {foreach from=$settings item=name}
+            {assign var='value' value=$config->get($name)}
+            {assign var='type' value=$config->type($name)}
+            {assign var='id' value=str_replace('.', '-',$name)}
+            
+            {include file="fragments/admin-setting-row.tpl"}
+        {/foreach}
+    </tbody>
+    <tfoot>
+        <tr>
+            <td colspan="2">
+                <input type="button" id="settings_save" name="save" value="Save" />
+                <input type="button" id="settings_new" name="new_setting" value="New Setting" />
+            </td>
+        </tr>
+    </tfoot>
+</table>
+
+<script type="text/javascript">
+    rc.settings.init();
+</script>
--- a/webui/source/templates/ajax.tpl
+++ b/webui/source/templates/ajax.tpl
@@ -0,0 +1,12 @@
+{
+	{if $messages}
+		"messages": [
+		{foreach from=$messages item=message name=messages}
+			{$message|json_encode}{if ! $smarty.foreach.messages.last},{/if} 
+		{/foreach}
+		]{if $page_content},{/if}
+	{/if}
+	
+	{$page_content}
+    
+}
--- a/webui/source/templates/ajax/admin/add-setting.tpl
+++ b/webui/source/templates/ajax/admin/add-setting.tpl
@@ -0,0 +1,11 @@
+{if $success}
+    "actions": {
+        "add_setting_row": {
+            {include file="fragments/admin-setting-row.tpl" assign=content}
+            "content": {$content|json_encode} 
+        }
+    },
+{/if}
+
+"success": {$success|json_encode}
+
--- a/webui/source/templates/ajax/admin/new-setting.tpl
+++ b/webui/source/templates/ajax/admin/new-setting.tpl
@@ -0,0 +1,30 @@
+"page_replacements": {
+
+    "dialogheadertitle": {
+        "content": "Add Setting"
+    },
+    
+    "dialogcontent": {
+        {include file="fragments/new-setting-dialog.tpl" assign=new_setting_dialog_content}
+        "content": {$new_setting_dialog_content|json_encode}
+    }
+
+},
+
+"dialog": {
+    "show": true,
+    "buttons": {
+        "type": "okcancel",
+        "actions": {
+            "ok": [
+                "add-setting",
+                "close-dialog"
+            ],
+            "cancel": "close-dialog"
+        },
+        "params": {
+            "name": "settings_add_name",
+            "type": "settings_add_type"
+        }
+    }
+}
--- a/webui/source/templates/ajax/admin/remove-setting.tpl
+++ b/webui/source/templates/ajax/admin/remove-setting.tpl
@@ -0,0 +1 @@
+"success": {$success|json_encode}
--- a/webui/source/templates/ajax/admin/rename-setting.tpl
+++ b/webui/source/templates/ajax/admin/rename-setting.tpl
@@ -0,0 +1,44 @@
+{if $confirm}
+    {if $success}
+        "actions": {
+            "rename_setting_confirm": {
+                "old_name": {$old_name|json_encode},
+                "old_id": {$old_id|json_encode},
+                "name": {$name|json_encode},
+                {include file="fragments/admin-setting-row.tpl" assign="content"}
+                "content": {$content|json_encode}
+            }
+        },
+    {/if}
+    
+    "success": {$success|json_encode}
+{else}
+    "page_replacements": {
+        "dialogheadertitle": {
+            "content": "Rename Setting"
+        },
+        
+        "dialogcontent": {
+            {include file="fragments/rename-setting-dialog.tpl" assign="content"}
+            "content": {$content|json_encode}
+        }
+    },
+    
+    "dialog": {
+        "show": true,
+        "buttons": {
+            "type": "okcancel",
+            "actions": {
+                "ok": [
+                    "rename_setting",
+                    "close-dialog"
+                ],
+                "cancel": "close-dialog"
+            },
+            "params": {
+                "name": {$name|json_encode},
+                "new_name_field": "settings_rename_name" 
+            }
+        }
+    }
+{/if}
--- a/webui/source/templates/ajax/delete-source.tpl
+++ b/webui/source/templates/ajax/delete-source.tpl
@@ -0,0 +1,41 @@
+
+"page_replacements": {
+    {if $confirmed}
+        "source-list": {
+            {include file="fragments/source-list.tpl" assign="sources_html"}
+            "content": {$sources_html|json_encode}
+        }
+    {else}
+        "dialogheadertitle" {
+            "content": "Delete Source"
+        },
+        
+        "dialogcontent": {
+            {include file="fragments/delete-source.tpl" assign="delete_source_html"}
+            "content": {$delete_source_html|json_encode}
+        }
+    {/if}
+
+{if ! $confirmed}
+},
+
+"dialog": {
+    "show": true,
+    "buttons": {
+        "type": "yesno",
+        "actions": {
+            "yes": [
+                "delete-source-confirm",
+                "close-dialog"
+            ],
+            "no": "close-dialog"
+        },
+        "params": {
+            "plugin": {$source_plugin|json_encode},
+            "id": {$source_id|json_encode}
+        }
+    }
+}
+{else}
+}
+{/if}
--- a/webui/source/templates/ajax/source-list.tpl
+++ b/webui/source/templates/ajax/source-list.tpl
@@ -0,0 +1,6 @@
+"page_replacements": {
+	"source-list": {
+		{include file="fragments/source-list.tpl" assign="sources_html"}
+		"content": {$sources_html|json_encode}
+	}
+}
--- a/webui/source/templates/ajax/update-settings.tpl
+++ b/webui/source/templates/ajax/update-settings.tpl
@@ -0,0 +1,22 @@
+"page_replacements": {
+
+    "dialogheadertitle": {
+        "content": "Update Settings"
+    },
+    
+    "dialogcontent": {
+        {include file="fragments/update-settings-dialog.tpl" assign=dialog_content}
+        "content": {$dialog_content|json_encode}
+    }
+
+}, 
+
+"dialog": {
+    "show": true,
+    "buttons": {
+        "type": "ok",
+        "actions": {
+            "ok": "close-dialog"
+        }
+    }
+}
--- a/webui/source/templates/errors/404.tpl
+++ b/webui/source/templates/errors/404.tpl
--- a/webui/source/templates/errors/unhandled-exception.tpl
+++ b/webui/source/templates/errors/unhandled-exception.tpl
--- a/webui/source/templates/fragments/admin-setting-row.tpl
+++ b/webui/source/templates/fragments/admin-setting-row.tpl
@@ -0,0 +1,12 @@
+<tr id="setting_{$id}_row">
+    <td>
+        <p>
+            {$name}<br />
+            <input type="button" id="setting_{$id}_rename" value="Rename" onclick="rc.settings.rename_setting('{$id}', '{$name}');" />
+            <input type="button" id="setting_{$id}_remove" value="Remove" onclick="rc.settings.remove_setting('{$id}', '{$name}');" />
+        </p>
+    </td>
+    <td>
+        {include file="fragments/admin-setting-value.tpl"}
+    </td>
+</tr>
--- a/webui/source/templates/fragments/admin-setting-value.tpl
+++ b/webui/source/templates/fragments/admin-setting-value.tpl
@@ -0,0 +1,25 @@
+{switch $type}
+    {case Sihnon_Config::TYPE_BOOL}
+        <input type="checkbox" id="setting_{$id}" name="{$id}" value="1" {if $value}checked="checked" {/if} class="setting" />
+    {/case}
+    {case Sihnon_Config::TYPE_INT}
+        <input type="text" id="setting_{$id}" name="{$id}" value="{$value}" class="setting settings_field_numeric" />
+    {/case}
+    {case Sihnon_Config::TYPE_STRING}
+        <input type="text" id="setting_{$id}" name="{$id}" value="{$value}" class="setting settings_field_string" />
+    {/case}
+    {case Sihnon_Config::TYPE_STRING_LIST}
+        <div id="container_{$id}">
+            {foreach from=$value item=line name=settings}
+                <div id="settings_{$id}_line{$smarty.foreach.settings.iteration}">
+                    <input type="text" name="{$id}[]" value="{$line}" class="setting settings_field_string" />
+                    <input type="button" value="-" class="settings_field_remove" onclick="rc.settings.remove_stringlist_field('{$id}', '{$smarty.foreach.settings.iteration}')" />
+                </div>
+            {/foreach}
+        </div>
+        <div class="settings_addfieldcontainer">
+            <input type="hidden" id="settings_{$id}_next" value="{$smarty.foreach.settings.iteration+1}" />
+            <input type="button" value="+" class="settings_field_add" onclick="rc.settings.add_stringlist_field('{$id}')" />
+        </div>
+    {/case}
+{/switch}
--- a/webui/source/templates/fragments/delete-source.tpl
+++ b/webui/source/templates/fragments/delete-source.tpl
@@ -0,0 +1,3 @@
+<p>
+    Are you sure you want to delete {$source->plugin()|escape:"html"}:{$source->filename()|escape:"html"}?
+</p>
--- a/webui/source/templates/fragments/messages.tpl
+++ b/webui/source/templates/fragments/messages.tpl
@@ -0,0 +1,7 @@
+{if $messages}
+<ul>
+    {foreach from=$messages item=message}
+        <li>{$message|escape}</li>
+    {/foreach}
+</ul>
+{/if}
--- a/webui/source/templates/fragments/new-setting-dialog.tpl
+++ b/webui/source/templates/fragments/new-setting-dialog.tpl
@@ -0,0 +1,21 @@
+<table>
+    <thead>
+        <th>Name</th>
+        <th>Type</th>
+    </thead>
+    <tbody>
+        <tr>
+            <td>
+                <input type="text" id="settings_add_name" value="" />
+            </td>
+            <td>
+                <select id="settings_add_type">
+                    <option value="int">Integer</option>
+                    <option value="bool">Boolean</option>
+                    <option value="string">String</option>
+                    <option value="string-list">String List</option>
+                </select>
+            </td>
+        </tr>
+    </tbody>
+</table>
--- a/webui/source/templates/fragments/rename-setting-dialog.tpl
+++ b/webui/source/templates/fragments/rename-setting-dialog.tpl
@@ -0,0 +1,6 @@
+<div>
+    <p>
+        Enter a new name for setting '{$name|escape}' below.
+    </p>
+    <input type="text" id="settings_rename_name" value="" />
+</div>
--- a/webui/source/templates/fragments/source-list.tpl
+++ b/webui/source/templates/fragments/source-list.tpl
@@ -0,0 +1,25 @@
+{foreach from=$all_sources key=type item=sources}
+	<li>{$type}
+		{if $sources}
+			<ul>
+			{foreach from=$sources item=source}
+				{assign var='source_plugin' value=$source->plugin()}
+				{assign var='source_filename' value=$source->filename()}
+				{assign var='source_filename_encoded' value=$source->filenameEncoded()}
+				{assign var='source_cached' value=$source->isCached()}
+				<li>
+					[ <a href="{$base_uri}sources/details/plugin/{$source_plugin}/id/{$source_filename_encoded}" title="Browse source details">Browse</a> |
+		  			<a href="{$base_uri}rips/setup/plugin/{$source_plugin}/id/{$source_filename_encoded}" title="Rip this source">Rip</a> |
+		  			<a href="javascript:rc.sources.remove('{$source_plugin|escape:'quote'}', '{$source_filename_encoded|escape:'quote'}');" title="Delete this source">Delete</a> ]
+					{$source_filename|escape:'html'}{if $source_cached} (cached){/if}
+				</li>
+			{/foreach}
+			</ul>
+		{else}
+			<p>
+				<em>There are no {$type} sources available to rip.</em>
+			</p>
+		{/if}
+	</li>
+{/foreach}
+
--- a/webui/source/templates/fragments/update-settings-dialog.tpl
+++ b/webui/source/templates/fragments/update-settings-dialog.tpl
@@ -0,0 +1,10 @@
+<p>
+    Settings have been saved.
+</p>
+
+{if $messages}
+    <p>
+        Some messages were generated during this operation:
+        {include file="fragments/messages.tpl"}
+    </p>
+{/if}
--- a/webui/source/templates/home.tpl
+++ b/webui/source/templates/home.tpl
@@ -0,0 +1,46 @@
+<h2>Summary</h2>
+
+<h3>Running Jobs</h3>
+
+{if $running_jobs}
+        {foreach from=$running_jobs item=job}
+            <li><a href="{$base_uri}jobs/details/id/{$job->id()}" title="View job details">{$job->name()} ({$job->currentStatus()->ripProgress()}%)</a></li>
+        {/foreach}
+{else}
+    <em>There are no currently running jobs.</em>
+{/if}
+
+<h3>Queued Jobs</h3>
+
+{if $queued_jobs}
+        {foreach from=$queued_jobs item=job}
+            <li><a href="{$base_uri}jobs/details/id/{$job->id()}" title="View job details">{$job->name()}</a></li>
+        {/foreach}
+{else}
+    <em>There are no currently running jobs.</em>
+{/if}
+
+<h3>Recently Completed Jobs</h3>
+
+{if $completed_jobs}
+    <ul>
+        {foreach from=$completed_jobs item=job}
+            <li><a href="{$base_uri}jobs/details/id/{$job->id()}" title="View job details">{$job->name()}</a></li>
+        {/foreach}
+    </ul>
+{else}
+    <em>There are no recently completed jobs.</em>
+{/if}
+
+<h3>Recently Failed Jobs</h3>
+
+{if $failed_jobs}
+    <ul>
+        {foreach from=$failed_jobs item=job}
+            <li><a href="{$base_uri}jobs/details/id/{$job->id()}" title="View job details">{$job->name()}</a></li>
+        {/foreach}
+    </ul>
+{else}
+    <em>There are no recently failed jobs.</em>
+{/if}
+
--- a/webui/source/templates/index.tpl
+++ b/webui/source/templates/index.tpl
@@ -0,0 +1,89 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+    <head>
+        <title>Ripping Cluster WebUI</title>
+        <script lang="javascript">
+        </script>
+        <link rel="stylesheet" type="text/css" href="{$base_uri}styles/normal.css" />
+        
+        <script type="text/javascript">
+            var base_uri = "{$base_uri|escape:'quote'}";
+            var base_url = "{$base_url|escape:'quote'}";
+        </script>
+        
+        <link type="text/css" href="{$base_uri}styles/3rdparty/jquery-ui/smoothness/jquery-ui-1.8.custom.css" rel="Stylesheet" />	
+		<script type="text/javascript" src="{$base_uri}scripts/3rdparty/jquery-1.4.2.js"></script>
+		<script type="text/javascript" src="{$base_uri}scripts/3rdparty/jquery-ui-1.8.custom.min.js"></script>
+		<script type="text/javascript" src="{$base_uri}scripts/main.js"></script>
+    </head>
+    <body>
+
+        <div id="container">
+
+            <div id="banner">
+                <h1>Ripping Cluster WebUI</h1>
+            </div>
+
+            <div id="navigation">
+                {include file="navigation.tpl"}
+            </div>
+
+            <div id="page-container">
+            
+                <div id="sidebar">
+                    {include file="sidebar.tpl"}
+                </div>
+
+                <div id="page">
+
+                    {if $messages}
+                        <div id="messages">
+                            {foreach from=$messages item=message}
+                                {$message}
+                            {/foreach}
+                        </div>
+                    {/if}
+
+                    {$page_content}
+
+                </div>
+
+            </div>
+
+            <div id="footer">
+                Powered by RippingCluster WebUI {$version}. Written by Ben Roberts.
+            </div>
+
+        </div>
+        
+        <div id="centrepoint">
+            <div id="dialog">
+                <div id="dialogheader">
+                    <div id="dialogheadertitle">Dialog</div>
+                    <div id="dialogheaderclose">X</div>
+                </div>
+                <div id="dialogcontent"></div>
+                <div id="dialogfooter">
+                    <div id="dialogfooterok" class="dialogfooterbuttonset">
+                        <fieldset>
+                            <input type="button" class="dialogbutton" id="dialogfooterok" value="Ok" />
+                        </fieldset>
+                    </div>
+                    <div id="dialogfooterokcancel" class="dialogfooterbuttonset">
+                        <fieldset>
+                            <input type="button" class="dialogbutton" id="dialogfooterokcancel_ok" value="Ok" />
+                            <input type="button" class="dialogbutton" id="dialogfooterokcancel_cancel" value="Cancel" />
+                        </fieldset>
+                    </div>
+                    <div id="dialogfooteryesno" class="dialogfooterbuttonset">
+                        <fieldset>
+                            <input type="button" class="dialogbutton" id="dialogfooteryes" value="Yes" />
+                            <input type="button" class="dialogbutton" id="dialogfooterno" value="No" />
+                        </fieldset>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+    </body>
+</html>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ben Roberts	8aa3aa1415	Merge branch 'release-0.3'	2011-08-29 19:28:03 +01:00
Ben Roberts	ab5d242750	Version bump to 0.3	2011-08-29 19:27:40 +01:00
Ben Roberts	f8ba99932c	Merge branch 'feature-settings' into develop	2011-08-29 19:24:09 +01:00
Ben Roberts	4818193d37	Sort admin settings by name to make searching easier	2011-08-29 19:22:56 +01:00
Ben Roberts	196f80bbf5	Expose UI for renaming admin settings	2011-08-29 19:20:28 +01:00
Ben Roberts	cf250c39f6	Merge branch 'feature-settings' into develop	2011-08-28 16:19:52 +01:00
Ben Roberts	5d851dd977	Add support for removing admin settings	2011-08-28 16:19:26 +01:00
Ben Roberts	7be1279a80	Merge branch 'feature-settings' into develop	2011-08-28 13:04:01 +01:00
Ben Roberts	aec18cb810	Admin settings updated with add new setting feature	2011-08-28 13:03:31 +01:00
Ben Roberts	25449d4d3d	Rename add-setting to new-setting. Will reuse name for the backend	2011-08-28 10:32:54 +01:00
Ben Roberts	cab3a51323	Add initial support for adding settings. Adds "Add Setting" button to table, and shows a popup with form elements for adding a new setting. Does not yet add setting to the db.	2011-08-27 20:25:48 +01:00
Ben Roberts	5807af8b8f	Move admin settings value into dedicated template file	2011-08-27 19:53:35 +01:00
Ben Roberts	c377d6bd84	Merge branch 'feature-settings' into develop	2011-08-26 19:05:05 +01:00
Ben Roberts	7e823d5d91	Tidy names of javascript functions in setting handling	2011-08-26 19:03:54 +01:00
Ben Roberts	7ddacb2426	Removed temporary directories, as these have moved to /tmp (default)	2011-08-26 19:02:46 +01:00
Ben Roberts	4603a290e8	Merge branch 'feature-settings' into develop	2011-08-26 18:58:39 +01:00
Ben Roberts	f884e93021	Complete settings update including success dialog	2011-08-26 18:41:40 +01:00
Ben Roberts	91749f7f85	Set dialog title for source deletion	2011-08-26 18:40:48 +01:00
Ben Roberts	e7cf24bb4f	Bug fix: add dir to smarty plugin dir list rather than replacing orig	2011-08-26 17:41:07 +01:00
Ben Roberts	3497eb8e1e	First attempt at admin settings page with writeable database backend. Currently broken due to PHP's transparent conversion of "." to "_" in POST variable names!	2011-08-24 02:40:16 +01:00
Ben Roberts	807514daa8	Merge branch 'release-0.2.1' into develop	2011-08-23 02:11:48 +01:00
Ben Roberts	6648fd8b24	Merge branch 'release-0.2.1'	2011-08-23 02:11:32 +01:00
Ben Roberts	073da2c4e2	Bumped version to 0.2.1	2011-08-23 02:11:02 +01:00
Ben Roberts	d474fba2b3	Merge branch 'feature-summaries' into develop	2011-08-23 02:08:40 +01:00
Ben Roberts	c5eb93dd46	Add hostname to job details worker logs	2011-08-23 01:35:51 +01:00
Ben Roberts	fbc6f7da48	Add date to job details page.	2011-08-23 01:29:54 +01:00
Ben Roberts	49e5635a71	Bug fix: save plugin information in job record	2011-08-23 01:28:37 +01:00
Ben Roberts	8739f6c516	Expose job log display options in the UI	2011-08-23 00:05:21 +01:00
Ben Roberts	5f786d16d7	Add control of job log message count and sort order via URL	2011-08-22 23:18:57 +01:00
Ben Roberts	22a3d94dc3	Move job details page and update references	2011-08-22 22:51:46 +01:00
Ben Roberts	f3415ff57a	Merge commit 'release-0.2' into develop	2011-08-22 19:05:40 +01:00
Ben Roberts	6a57a6fca5	Merge branch 'release-0.2'	2011-08-22 19:04:36 +01:00
Ben Roberts	a061c23041	Bumped version number to 0.2	2011-08-22 19:03:36 +01:00
Ben Roberts	4300034afa	Merge branch 'feature-ajax' into develop	2011-08-22 18:48:59 +01:00
Ben Roberts	eb1e330bc4	Added ajax support, and verified with an ajaxified Delete Source feature	2011-08-22 18:47:45 +01:00
Ben Roberts	41fc0a2cc3	Improve logging in HandBrake worker	2011-08-21 16:12:32 +01:00
Ben Roberts	95fe2e7641	Add additional logging for batch job runner	2011-08-21 16:11:51 +01:00
Ben Roberts	8d2ca716df	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.	2011-08-20 11:07:30 +01:00
Ben Roberts	47946bcf98	Update handbrake backend to rip to temp dir	2011-08-07 15:40:17 +01:00
Ben Roberts	d2b2dc7925	Add output filesize to jobs summary page	2011-08-06 23:11:15 +01:00
Ben Roberts	e84c1eba42	Set logging program name	2011-08-06 14:57:14 +01:00
Ben Roberts	b93efc9878	Replace if block with switch case for extensibility	2011-08-06 14:55:29 +01:00
Ben Roberts	9697654594	Propagate changes to logging system from framework library	2011-08-06 14:54:22 +01:00
Ben Roberts	5121f78cea	Merge branch 'master' of git+ssh://git.sihnon.net/home/git/public/handbrake-cluster-webui	2011-08-05 19:40:42 +01:00
Ben Roberts	dbc1252bef	Added config file override for worker script	2011-08-05 19:35:55 +01:00
Ben Roberts	a3e58e4ee4	Merge branch 'master' of git+ssh://git.sihnon.net/home/git/public/handbrake-cluster-webui	2011-06-28 20:11:50 +01:00
Ben Roberts	3b22b0f2c9	Bug fix: Undefined index $values[9] RippingCluster_LogEntry overwrote base class field list, causing undefined index notices when the base class was explicitly used.	2011-06-28 20:06:24 +01:00
Ben Roberts	efb7db35d8	Fixed typo in _inc.php	2011-06-20 22:33:18 +01:00
Ben Roberts	841a5b9f92	Revert previous untested change in include statements	2011-06-20 22:04:44 +01:00
Ben Roberts	506a6e189c	Update paths for packaging	2011-06-20 19:34:27 +01:00
Ben Roberts	3da59727de	Bug fix: typo in variable name	2011-06-20 19:29:11 +01:00
Ben Roberts	c0d8747b21	Update init script to background the worker process	2011-06-19 22:48:45 +01:00
Ben Roberts	e1bd324e84	Bugfix: error in client log call	2011-06-19 00:13:39 +01:00
Ben Roberts	8fe8f8ba08	Use defines for library paths	2011-06-18 23:53:25 +01:00
Ben Roberts	274bc8f3c9	Use defines for library paths	2011-06-18 22:15:36 +01:00
Ben Roberts	edc2439232	Make worker read configuration from /etc/ripping-cluster	2011-06-18 18:36:33 +01:00
Ben Roberts	bd74b0f54e	Update default config files	2011-06-18 18:35:40 +01:00
Ben Roberts	cd93f13f41	Add gentoo init script	2011-06-18 18:30:03 +01:00
Ben Roberts	21bd423f02	Rename worker file	2011-06-18 17:45:20 +01:00
Ben Roberts	5adf9170c4	Merge branch 'master' of git+ssh://git.sihnon.net/home/git/public/handbrake-cluster-webui	2011-04-25 14:16:43 +01:00
Ben Roberts	ce94762905	Bug fix: undefined variable when rip progress is 0%	2011-04-25 14:05:33 +01:00
Ben Roberts	72be6d6e5f	Bug fixes 1) Quoted barewords in array construction 2) Added order by clause to all() to provide consistent ordering	2011-04-25 01:52:56 +01:00
Ben Roberts	5a5c3438c1	Updated client side logging and attempt to include proper job_id	2011-04-25 01:19:18 +01:00
Ben Roberts	c0702aa98e	Bug fix: typoed variable name Caused broken javascript on rip page	2011-04-25 01:18:41 +01:00
Ben Roberts	4e58ac7135	Updated code to use new WorkerLogEntry class	2011-04-25 00:54:28 +01:00
Ben Roberts	180e63c456	Bug fixes 1) full path to run-jobs.php to ensure script is runnable 2) reordering of allWithStatus to ensure consistent results	2011-04-25 00:50:22 +01:00
Ben Roberts	9be81f92f4	Updated subclassing of Client/Worker LogEntry classes	2011-04-25 00:49:09 +01:00
Ben Roberts	a459ba283a	Updated status information on home page	2011-04-25 00:48:02 +01:00
Ben Roberts	4e7a5d189a	Bug fix in source deletion	2011-04-25 00:47:30 +01:00
Ben Roberts	bdfa91f9b0	Updated worker to use new logging code	2011-04-24 21:18:22 +01:00
Ben Roberts	9ec2df1f18	Bug fix: incorrect parameters to log retrieval calls	2011-04-24 11:10:07 +01:00
Ben Roberts	dbaf4968ab	Updated code to use new Logging code in sihnon lib	2011-04-24 10:40:14 +01:00
Ben Roberts	b896877591	fix call to Gearman_Job::complete()	2011-04-22 00:49:32 +01:00
Ben Roberts	da263a23b7	Fixed bug with worker plugin scanning	2011-04-22 00:40:38 +01:00
Ben Roberts	edc717ef68	Bug fixes	2011-04-22 00:26:30 +01:00
Ben Roberts	d3fe08d40f	Massive refactor to use SihnonFramework and PEAR's Net_Gearman	2011-04-21 23:31:21 +01:00
Ben Roberts	fa7b54b861	Add option to delete sources with support in all three backends	2010-11-19 22:24:12 +00:00
Ben Roberts	73e42a42b1	Update BackgroundTask to use same cwd for spawned process	2010-11-19 21:12:18 +00:00
Ben Roberts	7c175bb608	Merge branch 'feature-mkv-plugins'; commit 'HEAD^'	2010-10-12 19:30:27 +01:00
Ben Roberts	697002dddb	Merge branch 'feature-bluray'	2010-10-12 19:26:57 +01:00
Ben Roberts	d87c924b14	Merge branch 'master', remote branch 'origin'	2010-09-24 20:10:09 +01:00