Simplify the batch api by having the core event handlers for

start_batch and end_batch add and remove the batch id from the
session.  Modules wishing to do batch processing, just need to fire
the start_batch and end_batch events.  Other modules that need to be
aware of batches (i.e. notifications) just check the session for "batch_id".

2 files changed, 7 insertions, 14 deletions

diff --git a/core/controllers/scaffold.php b/core/controllers/scaffold.php
index 2cdff2d3..45242b8c 100644
--- a/core/controllers/scaffold.php
+++ b/core/controllers/scaffold.php
@@ -219,7 +219,7 @@ class Scaffold_Controller extends Template_Controller {
     }
 
     $batch_id = mt_rand();
-    module::event("start_add_batch", $batch_id);
+    module::event("start_batch");
     cookie::set("add_photos_path", $path);
     $photo_count = 0;
     foreach (glob("$path/*.[Jj][Pp][Gg]") as $file) {
@@ -227,7 +227,7 @@ class Scaffold_Controller extends Template_Controller {
       photo::create($parent, $file, basename($file), basename($file));
       $photo_count++;
     }
-    module::event("end_add_batch", $batch_id);
+    module::event("end_batch");
 
     if ($photo_count > 0) {
       log::success("content", "(scaffold) Added $photo_count photos",
@@ -245,7 +245,7 @@ class Scaffold_Controller extends Template_Controller {
     $test_images = glob(APPPATH . "tests/images/*.[Jj][Pp][Gg]");
 
     $batch_id = mt_rand();
-    module::event("start_add_batch", $batch_id);
+    module::event("start_batch");
     $album_count = $photo_count = 0;
     for ($i = 0; $i < $count; $i++) {
       set_time_limit(30);
@@ -269,7 +269,7 @@ class Scaffold_Controller extends Template_Controller {
         $photo_count++;
       }
     }
-    module::event("end_add_batch", $batch_id);
+    module::event("end_batch");
 
     if ($photo_count > 0) {
       log::success("content", "(scaffold) Added $photo_count photos");
diff --git a/core/controllers/simple_uploader.php b/core/controllers/simple_uploader.php
index 005071b0..5ae4bb2a 100644
--- a/core/controllers/simple_uploader.php
+++ b/core/controllers/simple_uploader.php
@@ -48,12 +48,7 @@ class Simple_Uploader_Controller extends Controller {
     $file_validation = new Validation($_FILES);
     $file_validation->add_rules("file", "upload::valid", "upload::type[gif,jpg,png,flv,mp4]");
     if ($file_validation->validate()) {
-      $batch_id = Session::instance()->get("batch_id");
-      if (empty($batch_id)) {
-        $batch_id = mt_rand();
-        module::event("start_add_batch", $batch_id);
-        Session::instance()->set("batch_id", $batch_id);
-      }
+      module::event("start_batch");
       $temp_filename = upload::save("file");
       $title = substr(basename($temp_filename), 10);  // Skip unique identifier Kohana adds
       $path_info = pathinfo($temp_filename);
@@ -70,10 +65,8 @@ class Simple_Uploader_Controller extends Controller {
   }
 
   public function finish() {
-    $batch_id = Session::instance()->get_once("batch_id");
-    if (!empty($batch_id)) {
-      module::event("end_add_batch", $batch_id);
-    }
+    module::event("end_batch");
+
     print json_encode(array("result" => "success"));
   }
 }