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

Bug fixes

Browse Source
This commit is contained in:
Ben Roberts
2011-04-22 00:26:30 +01:00
parent d3fe08d40f
commit edc717ef68
6 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/lib/RippingCluster/Exceptions.class.php
View File

@@ -2,31 +2,10 @@
class RippingCluster_Exception extends Exception {}; 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_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_LogicException extends RippingCluster_Exception {};
class RippingCluster_Exception_JobNotRunning extends RippingCluster_Exception_LogicException {}; class RippingCluster_Exception_JobNotRunning extends RippingCluster_Exception_LogicException {};
class RippingCluster_Exception_InvalidPluginName extends RippingCluster_Exception {};
?> ?>

12
source/lib/RippingCluster/Worker/PluginFactory.class.php
View File

@@ -2,19 +2,19 @@
class RippingCluster_Worker_PluginFactory extends RippingCluster_PluginFactory { class RippingCluster_Worker_PluginFactory extends RippingCluster_PluginFactory {
const PLUGIN_DIR = 'Net/Gearman/Job/'; protected static $plugin_dir = 'Net/Gearman/Job/';
const PLUGIN_PREFIX = 'Net_Gearman_Job_'; protected static $plugin_prefix = 'Net_Gearman_Job_';
const PLUGIN_INTERFACE = 'RippingCluster_Worker_IPlugin'; protected static $plugin_interface = 'RippingCluster_Worker_IPlugin';
public static function init() { public static function init() {
} }
public static function scan() { /* public static function scan() {
$candidatePlugins = parent::findPlugins(self::PLUGIN_DIR); $candidatePlugins = parent::findPlugins(self::PLUGIN_DIR);
parent::loadPlugins($candidatePlugins, self::PLUGIN_PREFIX, self::PLUGIN_INTERFACE); parent::loadPlugins($candidatePlugins, self::PLUGIN_PREFIX, self::PLUGIN_INTERFACE);
} }*/
public static function getPluginWorkerFunctions($plugin) { public static function getPluginWorkerFunctions($plugin) {
if ( ! self::isValidPlugin($plugin)) { if ( ! self::isValidPlugin($plugin)) {
@@ -25,4 +25,4 @@ class RippingCluster_Worker_PluginFactory extends RippingCluster_PluginFactory {
} }
} }
?> ?>

2
webui/_inc.php
View File

@@ -4,7 +4,7 @@ require_once '../private/config.php';
require_once(SihnonFramework_Lib . 'SihnonFramework/Main.class.php'); require_once(SihnonFramework_Lib . 'SihnonFramework/Main.class.php');
//require_once RippingCluster_Lib . 'RippingCluster/Main.class.php'; //require_once RippingCluster_Lib . 'RippingCluster/Main.class.php';
SihnonFramework_Main::registerAutoloadClasses('Sihnon', SihnonFramework_Lib, SihnonFramework_Main::registerAutoloadClasses('SihnonFramework', SihnonFramework_Lib,
'RippingCluster', SihnonFramework_Main::makeAbsolutePath('../source/lib/')); 'RippingCluster', SihnonFramework_Main::makeAbsolutePath('../source/lib/'));
?> ?>

4
webui/run-jobs.php
View File

@@ -6,8 +6,8 @@ require_once '../private/config.php';
require_once(SihnonFramework_Lib . 'SihnonFramework/Main.class.php'); require_once(SihnonFramework_Lib . 'SihnonFramework/Main.class.php');
require_once 'Net/Gearman/Client.php'; require_once 'Net/Gearman/Client.php';
SihnonFramework_Main::registerAutoloadClasses('Sihnon', SihnonFramework_Lib, SihnonFramework_Main::registerAutoloadClasses('SihnonFramework', SihnonFramework_Lib,
'RippingCluster', SihnonFramework_Main::makeAbsolutePath('../lib/')); 'RippingCluster', SihnonFramework_Main::makeAbsolutePath('../source/lib/'));
try { try {
$main = RippingCluster_Main::instance(); $main = RippingCluster_Main::instance();

4
webui/source/pages/rips/setup-rip.php
View File

@@ -6,7 +6,7 @@ $config = $main->config();
// Grab the name of this source // Grab the name of this source
$encoded_filename = null; $encoded_filename = null;
if ($req->get('submit')) { if ($req->exists('submit')) {
$encoded_filename = RippingCluster_Main::issetelse($_POST['id'], 'RippingCluster_Exception_InvalidParameters'); $encoded_filename = RippingCluster_Main::issetelse($_POST['id'], 'RippingCluster_Exception_InvalidParameters');
// Create the jobs from the request // Create the jobs from the request
@@ -17,7 +17,7 @@ if ($req->get('submit')) {
RippingCluster_Page::redirect('rips/setup-rip/queued'); RippingCluster_Page::redirect('rips/setup-rip/queued');
} elseif ($req->get('queued')) { } elseif ($req->exists('queued')) {
$this->smarty->assign('rips_submitted', true); $this->smarty->assign('rips_submitted', true);
} else { } else {

8
worker/handbrake-cluster-worker.php
View File

@@ -6,9 +6,9 @@ require_once '../private/config.php';
require_once(SihnonFramework_Lib . 'SihnonFramework/Main.class.php'); require_once(SihnonFramework_Lib . 'SihnonFramework/Main.class.php');
require_once 'Net/Gearman/Worker.php'; require_once 'Net/Gearman/Worker.php';
SihnonFramework_Main::registerAutoloadClasses('Sihnon', SihnonFramework_Lib, SihnonFramework_Main::registerAutoloadClasses('SihnonFramework', SihnonFramework_Lib,
'RippingCluster', SihnonFramework_Main::makeAbsolutePath('../lib/')); 'RippingCluster', SihnonFramework_Main::makeAbsolutePath('../source/lib/'));
SihnonFramework_Main::registerAutoloadClasses('Net', SihnonFramework_Main::makeAbsolutePath('../lib/')); SihnonFramework_Main::registerAutoloadClasses('Net', SihnonFramework_Main::makeAbsolutePath('../source/lib/'));
try { try {
@@ -25,4 +25,4 @@ try {
die("Uncaught Exception: " . $e->getMessage()); die("Uncaught Exception: " . $e->getMessage());
} }
?> ?>