1 files changed, 115 insertions, 6 deletions

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 6f83f940..1c4a3a69 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -32,8 +32,8 @@ class Organize_Controller extends Controller {
     }
     $parents[$item->id] = 1;
 
-    $v->album_tree = $this->_tree($root, $parents);
-    $v->micro_thumb_grid = $this->_get_micro_thumb_grid($item, 0);
+    $v->album_tree = self::_tree($root, $parents);
+    $v->micro_thumb_grid = self::_get_micro_thumb_grid($item, 0);
     print $v;
   }
 
@@ -41,17 +41,77 @@ class Organize_Controller extends Controller {
     $item = ORM::factory("item", $item_id);
     access::required("view", $item);
     access::required("edit", $item);
-    print $this->_get_micro_thumb_grid($item, $offset);
+    print self::_get_micro_thumb_grid($item, $offset);
   }
 
-  private function _get_micro_thumb_grid($item, $offset) {
+  function move($target_id) {
+    access::verify_csrf();
+
+    $task_def = Task_Definition::factory()
+      ->callback("Organize_Controller::move_task_handler")
+      ->description(t("Move images"))
+      ->name(t("Move Images"));
+    $task = task::create($task_def, array("target_id" => $target_id,
+                                          "source_ids" => $this->input->post("source_ids")));
+
+    print json_encode(
+      array("result" => "started",
+            "status" => $task->status,
+            "url" => url::site("organize/run/$task->id?csrf=" . access::csrf_token())));
+  }
+
+  function rearrange($target_id, $before) {
+    access::verify_csrf();
+    $target = ORM::factory("item", $target_id);
+    $parent = $target->parent();
+    access::required("view", $parent);
+    access::required("edit", $parent);
+
+    $task_def = Task_Definition::factory()
+      ->callback("Organize_Controller::rearrange_task_handler")
+      ->description(t("Rearrange Image"))
+      ->name(t("Rearrange Images"));
+    $task = task::create($task_def, array("target_id" => $target_id, "before" => $before,
+                                          "current" => 0,
+                                          "source_ids" => $this->input->post("source_ids")));
+
+    print json_encode(
+      array("result" => "started",
+            "status" => $task->status,
+            "url" => url::site("organize/run/$task->id?csrf=" . access::csrf_token())));
+  }
+
+  private static function _get_micro_thumb_grid($item, $offset) {
     $v = new View("organize_thumb_grid.html");
     $v->item = $item;
     $v->offset = $offset;
     return $v;
   }
 
-  private function _tree($item, $parents) {
+  /**
+   * Run the task
+   */
+  function run($task_id) {
+    access::verify_csrf();
+
+    $task = ORM::factory("task", $task_id);
+    if (!$task->loaded || $task->owner_id != user::active()->id) {
+      access::forbidden();
+    }
+
+    $task = task::run($task_id);
+    $results = array("done" => $task->done, "status" => $task->status,
+                     "percent_complete" => $task->percent_complete);
+    foreach (array("tree", "content") as $data) {
+      $value = $task->get($data, false);
+      if ($value !== false) {
+        $results[$data] = $value;
+      }
+    }
+    print json_encode($results);
+  }
+
+  private static function _tree($item, $parents) {
     $v = new View("organize_tree.html");
     $v->album = $item;
     $keys = array_keys($parents);
@@ -62,7 +122,7 @@ class Organize_Controller extends Controller {
     $albums = $item->children(null, 0, array("type" => "album"), array("title" => "ASC"));
     foreach ($albums as $album) {
       if (access::can("view", $album)) {
-        $v->children[] = $this->_tree($album, $parents);
+        $v->children[] = self::_tree($album, $parents);
       }
     }
     if (count($v->children)) {
@@ -70,4 +130,53 @@ class Organize_Controller extends Controller {
     }
     return $v;
   }
+
+  static function move_task_handler($task) {
+    $start = microtime(true);
+    if ($task->percent_complete == 0) {
+      batch::start();
+    }
+
+    $target = ORM::factory("item", $task->get("target_id"));
+    $source_ids = $task->get("source_ids", array());
+    $idx = $task->get("current", 0);
+    $count = 0;
+    for (; $idx < count($source_ids) && microtime(true) - $start < 0.5; $idx++) {
+      item::move(ORM::factory("item", $source_ids[$idx]), $target);
+      $count++;
+    }
+    $task->set("current", $idx);
+    $task->percent_complete = ceil($idx / count($source_ids) * 100);
+    $task->status = t2("Moved one file", "Moved %count files", $count);
+    if ($task->percent_complete == 100) {
+      batch::stop();
+      $task->done = true;
+      $task->state = "success";
+      $parents = array();
+      foreach ($target->parents() as $parent) {
+        $parents[$parent->id] = 1;
+      }
+      $parents[$target->id] = 1;
+      // @TODO do we want to set a flag and then generate them in the run method so we don't
+      // potentially store large data items in the task?
+      $task->set("tree", self::_tree(ORM::factory("item", 1), $parents)->__toString());
+      $task->set("content", self::_get_micro_thumb_grid($target, 0)->__toString());
+    }
+  }
+
+  static function rearrange_task_handler($task) {
+    // @todo need to
+    // 1) reset the weights based on the current sort order
+    // 2) when they are all copied, change the sort order of the parent to "weight"
+    $task->percent_complete = 100;
+    //$start = microtime(true);
+    //$mode = $task->get("mode", "init");
+    //$start = microtime(true);
+    //    if (microtime(true) - $start > 0.5) {
+    //      break;
+    $task->done = true;
+    $task->state = "success";
+    $target = ORM::factory("item", $task->get("target_id"));
+    $task->set("content", self::_get_micro_thumb_grid($target, 0)->__toString());
+  }
 }