Permit rips of .iso files, and update x264 constant quality format

.gitignore

@@ -2,6 +2,7 @@
 .buildpath
 .project
 .settings
+*.kdev4
 /config.php
 /dbconfig.conf
 /public/.htaccess

public/styles/normal.css

@@ -2,7 +2,6 @@
  * StatusBoard normal stylesheet
  *
  */
-@import url('http://twitter.github.com/bootstrap/1.4.0/bootstrap.min.css'); 
 @CHARSET "UTF-8";
 
 @media all {
@@ -61,6 +60,12 @@
     .highlight {
         background: #dceaf4;
     }
+    
+    .inline-fieldset {
+        /* reset bootstrap styles */
+        margin-bottom: 0;
+        padding-top: 0;
+    }
 }
 
 @media print {

source/lib/RippingCluster/Main.class.php

@@ -28,10 +28,10 @@ class RippingCluster_Main extends SihnonFramework_Main {
             case 'index': {
                 $smarty_tmp = $this->config->get('templates.tmp_path', '/var/tmp/ripping-cluster');
                 $this->smarty = new Smarty();
-                $this->smarty->template_dir = static::makeAbsolutePath(self::TEMPLATE_DIR);
-                                $this->smarty->compile_dir  = static::makeAbsolutePath($smarty_tmp . '/templates');
-                $this->smarty->cache_dir    = static::makeAbsolutePath($smarty_tmp . '/cache');
-                $this->smarty->config_dir   = static::makeAbsolutePath($smarty_tmp . '/config');
+                $this->smarty->setTemplateDir(static::makeAbsolutePath(self::TEMPLATE_DIR));
+                $this->smarty->setCompileDir(static::makeAbsolutePath($smarty_tmp . '/templates'));
+                $this->smarty->setCacheDir(static::makeAbsolutePath($smarty_tmp . '/cache'));
+                $this->smarty->setConfigDir(static::makeAbsolutePath($smarty_tmp . '/config'));
                 $this->smarty->addPluginsDir(static::makeAbsolutePath('../source/webui/smarty/plugins'));
                  
                 $this->smarty->registerPlugin('modifier', 'formatDuration', array('RippingCluster_Main', 'formatDuration'));

source/lib/RippingCluster/Source/Plugin/HandBrake.class.php

@@ -199,7 +199,7 @@ class RippingCluster_Source_Plugin_HandBrake extends RippingCluster_PluginBase i
         $config = RippingCluster_Main::instance()->config();
         
         // Ensure the source is a valid directory, and lies below the configured source_dir
-        if ( ! is_dir($source_filename)) {
+        if ( ! is_dir($source_filename) && ! preg_match('/\.iso$/', $source_filename)) {
             return false;
         }
         $real_source_filename = realpath($source_filename);

source/lib/RippingCluster/Utility/DvdDirectoryIterator.class.php

@@ -2,7 +2,7 @@
 
 class RippingCluster_Utility_DvdDirectoryIterator extends FilterIterator {
     public function accept() {
-        return is_dir($this->current()->getPathname() . DIRECTORY_SEPARATOR . 'VIDEO_TS');
+        return is_dir($this->current()->getPathname() . DIRECTORY_SEPARATOR . 'VIDEO_TS') || preg_match('/\.iso$/', $this->current()->getPathname());
     }
 }
 

source/webui/pages/rips/setup.php

@@ -18,9 +18,11 @@ if ($req->exists('submit')) {
             array_unshift($recent_output_directories, $recent_directory[0]);
             $config->set('rips.output_directories.recent', array_slice($recent_output_directories, 0, $config->get('rips.output_directories.recent_limit', 10)));
         }
-    } else {
+    } else if ($key === false) {
         array_unshift($recent_output_directories, $_POST['rip-options']['output-directory']);
         $config->set('rips.output_directories.recent', array_slice($recent_output_directories, 0, $config->get('rips.output_directories.recent_limit', 10)));
+    } else {
+        // Directory is already the most recently used entry at the top of the list, don't reinsert
     }
 
     // Create the jobs from the request

source/webui/smarty/plugins/compiler.switch.php

@@ -32,6 +32,8 @@
  *       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.)  
+ *    Version 3.6:
+ *       Updated to work with Smarty 3.1 release.  (Tested and working on 3.1.3, No longer compatible with 3.0 releases.)
  * 
  * - Bugs/Notes:
  *
@@ -112,10 +114,10 @@ class Smarty_Compiler_Switch extends Smarty_Internal_CompileBase {
  */
     public function compile($args, $compiler){
         $this->compiler = $compiler;
-        $attr = $this->_get_attributes($args);
+        $attr = $this->getAttributes($compiler, $args);
 	$_output = '';
 
-        $this->_open_tag('switch',array($compiler->tag_nocache));
+        $this->openTag($compiler, '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;";
@@ -144,18 +146,18 @@ class Smarty_Compiler_Case extends Smarty_Internal_CompileBase {
  */
     public function compile($args, $compiler){
         $this->compiler = $compiler;
-        $attr = $this->_get_attributes($args);
+        $attr = $this->getAttributes($compiler, $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'));
+	    list($break, $compiler->tag_nocache) = $this->closeTag($compiler, array('case'));
             if($last_attr[0])
                 $_output .= '<?php break;?>';
         }
-        $this->_open_tag('case', array(isset($attr['break']) ? $attr['break'] : false, $compiler->tag_nocache));
+        $this->openTag($compiler, '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;";
@@ -183,17 +185,17 @@ class Smarty_Compiler_Default extends Smarty_Internal_CompileBase {
  */
     public function compile($args, $compiler){
         $this->compiler = $compiler;
-        $attr = $this->_get_attributes($args);
+        $attr = $this->getAttributes($compiler, $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'));
+            list($break, $compiler->tag_nocache) = $this->closeTag($compiler, array('case'));
             if($last_attr[0])
                 $_output .= '<?php break;?>';
         }
-        $this->_open_tag('case', array(isset($attr['break']) ? $attr['break'] : false, $compiler->tag_nocache));
+        $this->openTag($compiler, 'case', array(isset($attr['break']) ? $attr['break'] : false, $compiler->tag_nocache));
 
         $_output .= '<?php default:?>';
 
@@ -218,9 +220,9 @@ class Smarty_Compiler_Break extends Smarty_Internal_CompileBase {
 
     public function compile($args, $compiler){
         $this->compiler = $compiler;
-        $attr = $this->_get_attributes($args);
+        $attr = $this->getAttributes($compiler, $args);
 
-        list($break, $compiler->tag_nocache) = $this->_close_tag(array('case'));
+        list($break, $compiler->tag_nocache) = $this->closeTag($compiler, array('case'));
 
         return '<?php break;?>';
     }
@@ -242,9 +244,9 @@ class Smarty_Compiler_Caseclose extends Smarty_Internal_CompileBase {
 
     public function compile($args, $compiler){
         $this->compiler = $compiler;
-        $attr = $this->_get_attributes($args);
+        $attr = $this->getAttributes($compiler, $args);
 
-        list($break, $compiler->tag_nocache) = $this->_close_tag(array('case'));
+        list($break, $compiler->tag_nocache) = $this->closeTag($compiler, array('case'));
 
         return '<?php break;?>';
     }
@@ -265,12 +267,12 @@ class Smarty_Compiler_Switchclose extends Smarty_Internal_CompileBase {
 
     public function compile($args, $compiler){
         $this->compiler = $compiler;
-        $attr = $this->_get_attributes($args);
+        $attr = $this->getAttributes($compiler, $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'));
+            list($break, $compiler->tag_nocache) = $this->closeTag($compiler, array('case'));
+        list($compiler->tag_nocache) = $this->closeTag($compiler, array('switch'));
 
         return '<?php }?>';
     }

source/webui/templates/index.tpl

@@ -18,7 +18,7 @@
         <script type="text/javascript" src="{$base_uri}scripts/3rdparty/less-1.1.5.min.js"></script>
         
         <!-- Bootstrap //-->
-        <link rel="stylesheet" href="{$base_uri}scripts/3rdparty/bootstrap.min.css">
+        <link rel="stylesheet" href="{$base_uri}styles/3rdparty/bootstrap.min.css">
         <script type="text/javascript" src="{$base_uri}scripts/3rdparty/bootstrap-alerts.js"></script>
         <script type="text/javascript" src="{$base_uri}scripts/3rdparty/bootstrap-twipsy.js"></script>
         <script type="text/javascript" src="{$base_uri}scripts/3rdparty/bootstrap-popover.js"></script>
@@ -93,7 +93,7 @@
                     <br />
                     
                     <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">
-                        <img alt="Creative Commons Licence" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-sa/3.0/88x31.png" />
+                        <img alt="Creative Commons Licence" style="border-width:0" src="//i.creativecommons.org/l/by-nc-sa/3.0/88x31.png" />
                     </a>
                 </p>
             </footer>

source/webui/templates/jobs.tpl

@@ -28,7 +28,7 @@
         <input type="image" class="icon" name="action" id="delete-top" value="delete" src="{$base_uri}images/trash.png" alt="Delete all marked jobs" />
         <input type="image" class="icon" name="action" id="fix-broken-timestamps-top" value="fix-broken-timestamps" src="{$base_uri}images/clock.png" alt="Fix Broken Timestamps in Statuses" />
     </fieldset>
-    <table>
+    <table class="condensed-table">
         <thead>
             <tr>
                 <th>
@@ -45,7 +45,7 @@
                 {assign var=current_status value=$job->currentStatus()}
                 <tr>
                     <td>
-                        <fieldset>
+                        <fieldset class="inline-fieldset">
                             <input type="checkbox" class="jobs_select_all" name="include[]" value="{$job->id()}" />
                             <input type="image" class="icon" name="action" id="mark-failed-{$job->id()}" value="mark-failed[{$job->id()}]" src="{$base_uri}images/caution.png" alt="Mark job as failed" />
                             <input type="image" class="icon" name="action" id="redo-{$job->id()}" value="retry[{$job->id()}]" src="{$base_uri}images/redo.png" alt="Repeat job" />

source/webui/templates/rips/setup.tpl

@@ -150,10 +150,10 @@
 		$("#available-titles").accordion({active: {/literal}{$source->longestTitleIndex()}{literal}});
 		$("input:submit").button();
 		$("#quantizer-slider").slider({
-			value:0.61,
+			value:20,
 			min: 0,
-			max: 1.0,
-			step: 0.01,
+			max: 51,
+			step: 1,
 			slide: function(event, ui) {
 				$("#global-quantizer").val(ui.value);
 			}