From f9de80a8b4b578299002847e460f7e7e0b3ae7b0 Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben@sihnon.net>
Date: Thu, 16 Sep 2010 23:40:53 +0100
Subject: [PATCH 1/3] Fixes detection of Bluray source directories

Fixes the classname of the BlurayDirectoryIterator filter.
Updates the filter to accept only directories that contain a BDAV/BDMV
subdirectory, similar to the VIDEO_TS directory found in DVD sources.
---
 lib/RippingCluster/Utility/BlurayDirectoryIterator.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/RippingCluster/Utility/BlurayDirectoryIterator.class.php b/lib/RippingCluster/Utility/BlurayDirectoryIterator.class.php
index ec1c05b..b84dc6b 100644
--- a/lib/RippingCluster/Utility/BlurayDirectoryIterator.class.php
+++ b/lib/RippingCluster/Utility/BlurayDirectoryIterator.class.php
@@ -1,8 +1,9 @@
 <?php
 
-class RippingCluster_Utility_DvdDirectoryIterator extends FilterIterator {
+class RippingCluster_Utility_BlurayDirectoryIterator extends FilterIterator {
     public function accept() {
-        return true; // TODO Determine if the current directory item represents a Bluray source or not
+        return is_dir($this->current()->getPathname() . DIRECTORY_SEPARATOR . 'BDAV') ||
+               is_dir($this->current()->getPathname() . DIRECTORY_SEPARATOR . 'BDMV');
     }
 }
 

From cdae2c0f1f93f0a742432d3711caada45ce7092b Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben@sihnon.net>
Date: Thu, 16 Sep 2010 23:48:28 +0100
Subject: [PATCH 2/3] Adds phpdoc for Bluray plugins

---
 .../Source/Plugin/Bluray.class.php            |  4 +++
 .../Worker/Plugin/Bluray.class.php            | 32 +++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/lib/RippingCluster/Source/Plugin/Bluray.class.php b/lib/RippingCluster/Source/Plugin/Bluray.class.php
index 4ecfc27..b3a8c80 100644
--- a/lib/RippingCluster/Source/Plugin/Bluray.class.php
+++ b/lib/RippingCluster/Source/Plugin/Bluray.class.php
@@ -2,6 +2,10 @@
 
 class RippingCluster_Source_Plugin_Bluray extends RippingCluster_PluginBase implements RippingCluster_Source_IPlugin {
     
+    /**
+     * Name of this plugin
+     * @var string
+     */
     const PLUGIN_NAME = "Bluray";
     
     /**
diff --git a/lib/RippingCluster/Worker/Plugin/Bluray.class.php b/lib/RippingCluster/Worker/Plugin/Bluray.class.php
index 5035b55..a25b40d 100644
--- a/lib/RippingCluster/Worker/Plugin/Bluray.class.php
+++ b/lib/RippingCluster/Worker/Plugin/Bluray.class.php
@@ -2,14 +2,42 @@
 
 class RippingCluster_Worker_Bluray extends RippingCluster_PluginBase implements RippingCluster_Worker_IPlugin {
     
+    /**
+     * Name of this plugin
+     * @var string
+     */
     const PLUGIN_NAME = 'Bluray';
     
+    /**
+     * Output produced by the worker process
+     * @var string
+     */
     private $output;
+
+    /**
+     * Gearman Job object describing the task distributed to this worker
+     * @var GearmanJob
+     */
+    private $gearman_job;
     
+    /**
+     * Ripping Job that is being processed by this Worker
+     * @var RippingCluster_Job
+     */
     private $job;
     
+    /**
+     * Associative array of options describing the rip to be carried out
+     * @var array(string=>string)
+     */
     private $rip_options;
     
+    /**
+     * Constructs a new instance of this Worker class
+     * 
+     * @param GearmanJob $gearman_job GearmanJob object describing the task distributed to this worker
+     * @throws RippingCluster_Exception_LogicException
+     */
     private function __construct(GearmanJob $gearman_job) {
         $this->output = '';
         
@@ -44,6 +72,10 @@ class RippingCluster_Worker_Bluray extends RippingCluster_PluginBase implements
         $rip->execute();
     }
         
+    /**
+     * Executes the process for ripping the source to the final output
+     * 
+     */
     private function execute() {
         // TODO
     }

From 3977dc60385350d6aceeec28a1b89b97f2b204eb Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben@sihnon.net>
Date: Thu, 16 Sep 2010 23:49:01 +0100
Subject: [PATCH 3/3] Fixes bug with undefined class member

HandBrake Worker plugin was a gearman_job member that was not actually
defined by the class. Added the definition to resolve the problem.
---
 lib/RippingCluster/Worker/Plugin/HandBrake.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/RippingCluster/Worker/Plugin/HandBrake.class.php b/lib/RippingCluster/Worker/Plugin/HandBrake.class.php
index 316ec03..bea4c13 100644
--- a/lib/RippingCluster/Worker/Plugin/HandBrake.class.php
+++ b/lib/RippingCluster/Worker/Plugin/HandBrake.class.php
@@ -9,6 +9,8 @@ class RippingCluster_Worker_Plugin_HandBrake extends RippingCluster_PluginBase i
     
     private $output;
     
+    private $gearman_job;
+    
     private $job;
     
     private $rip_options;