Merge branch 'master' of git://github.com/gallery/gallery3

2 files changed, 106 insertions, 2 deletions

diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index 0cc2170c..829089c4 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -62,6 +62,12 @@ class tag_event_Core {
 
   static function item_deleted($item) {
     tag::clear_all($item);
+    if (!batch::in_progress()) {
+      tag::compact();
+    }
+  }
+
+  static function batch_complete() {
     tag::compact();
   }
 
@@ -88,6 +94,7 @@ class tag_event_Core {
         tag::add($item, trim($tag_name));
       }
     }
+    module::event("item_related_update", $item);
     tag::compact();
   }
 
@@ -109,7 +116,7 @@ class tag_event_Core {
     if (!isset($group->uploadify)) {
       return;
     }
-    
+
     $group = $form->add_photos;
     $group->input("tags")
       ->label(t("Add tags to all uploaded files"))
@@ -132,7 +139,7 @@ class tag_event_Core {
     if (!isset($group->uploadify)) {
       return;
     }
-    
+
     foreach (explode(",", $form->add_photos->tags->value) as $tag_name) {
       $tag_name = trim($tag_name);
       if ($tag_name) {
diff --git a/modules/tag/helpers/tag_task.php b/modules/tag/helpers/tag_task.php
new file mode 100644
index 00000000..7bf50546
--- /dev/null
+++ b/modules/tag/helpers/tag_task.php
@@ -0,0 +1,97 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class tag_task_Core {
+
+  static function available_tasks() {
+    $tasks[] = Task_Definition::factory()
+      ->callback("tag_task::clean_up_tags")
+      ->name(t("Clean up tags"))
+      ->description(t("Correct tag counts and remove tags with no items"))
+      ->severity(log::SUCCESS);
+    return $tasks;
+  }
+
+  /**
+   * Fix up tag counts and delete any tags that have no associated items.
+   * @param Task_Model the task
+   */
+  static function clean_up_tags($task) {
+    $errors = array();
+    try {
+      $start = microtime(true);
+      $last_tag_id = $task->get("last_tag_id", null);
+      $current = 0;
+      $total = 0;
+
+      switch ($task->get("mode", "init")) {
+      case "init":
+        $task->set("total", ORM::factory("tag")->count_all());
+        $task->set("mode", "clean_up_tags");
+        $task->set("completed", 0);
+        $task->set("last_tag_id", 0);
+
+      case "clean_up_tags":
+        $completed = $task->get("completed");
+        $total = $task->get("total");
+        $last_tag_id = $task->get("last_tag_id");
+        $tags = ORM::factory("tag")->where("id", ">", $last_tag_id)->find_all(25);
+        Kohana_Log::add("error",print_r(Database::instance()->last_query(),1));
+        while ($current < $total && microtime(true) - $start < 1 && $tag = $tags->current()) {
+          $last_tag_id = $tag->id;
+          $real_count = $tag->items_count();
+          if ($tag->count != $real_count) {
+            $tag->count = $real_count;
+            if ($tag->count) {
+              $task->log(
+                "Fixing count for tag {$tag->name} (id: {$tag->id}, new count: {$tag->count})");
+              $tag->save();
+            } else {
+              $task->log("Deleting empty tag {$tag->name} ({$tag->id})");
+              $tag->delete();
+            }
+          }
+
+          $completed++;
+          $tags->next();
+        }
+        $task->percent_complete = $completed / $total * 100;
+        $task->set("completed", $completed);
+        $task->set("last_tag_id", $last_tag_id);
+      }
+
+      $task->status = t2("Examined %count tag", "Examined %count tags", $completed);
+
+      if ($completed == $total) {
+        $task->done = true;
+        $task->state = "success";
+        $task->percent_complete = 100;
+      }
+    } catch (Exception $e) {
+      Kohana_Log::add("error",(string)$e);
+      $task->done = true;
+      $task->state = "error";
+      $task->status = $e->getMessage();
+      $errors[] = (string)$e;
+    }
+    if ($errors) {
+      $task->log($errors);
+    }
+  }
+}
\ No newline at end of file