The scaffolding, simple_uploader and local_import now call two new

events: start_add_batch and end_add_batch.  The parameter is a batch
id which is generated on the first add request.  The protocol is call
the add_photo as many times as required and then call finish when
done.
Also renamed the add method in local_import to add_photo so it is
consistent with simple_uploader

2 files changed, 16 insertions, 0 deletions

diff --git a/core/controllers/scaffold.php b/core/controllers/scaffold.php
index cdbe0f95..2cdff2d3 100644
--- a/core/controllers/scaffold.php
+++ b/core/controllers/scaffold.php
@@ -218,6 +218,8 @@ class Scaffold_Controller extends Template_Controller {
       throw new Exception("@todo BAD_ALBUM");
     }
 
+    $batch_id = mt_rand();
+    module::event("start_add_batch", $batch_id);
     cookie::set("add_photos_path", $path);
     $photo_count = 0;
     foreach (glob("$path/*.[Jj][Pp][Gg]") as $file) {
@@ -225,6 +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);
 
     if ($photo_count > 0) {
       log::success("content", "(scaffold) Added $photo_count photos",
@@ -241,6 +244,8 @@ 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);
     $album_count = $photo_count = 0;
     for ($i = 0; $i < $count; $i++) {
       set_time_limit(30);
@@ -264,6 +269,7 @@ class Scaffold_Controller extends Template_Controller {
         $photo_count++;
       }
     }
+    module::event("end_add_batch", $batch_id);
 
     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 b56bce16..005071b0 100644
--- a/core/controllers/simple_uploader.php
+++ b/core/controllers/simple_uploader.php
@@ -48,6 +48,12 @@ 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);
+      }
       $temp_filename = upload::save("file");
       $title = substr(basename($temp_filename), 10);  // Skip unique identifier Kohana adds
       $path_info = pathinfo($temp_filename);
@@ -64,6 +70,10 @@ 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);
+    }
     print json_encode(array("result" => "success"));
   }
 }