5 files changed, 43 insertions, 34 deletions

diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index b0e7e93f..20ecd0cb 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -163,7 +163,7 @@ class exif_Core {
     list ($remaining) = exif::stats();
     if ($remaining) {
       site_status::warning(
-        t('Your EXIF index needs to be updated.  <a href="%url" class="gDialogLink">Fix this now</a>',
+        t('Your Exif index needs to be updated.  <a href="%url" class="gDialogLink">Fix this now</a>',
           array("url" => url::site("admin/maintenance/start/exif_task::update_index?csrf=__CSRF__"))),
         "exif_index_out_of_date");
     }
diff --git a/modules/exif/helpers/exif_event.php b/modules/exif/helpers/exif_event.php
index f5677653..826ec959 100644
--- a/modules/exif/helpers/exif_event.php
+++ b/modules/exif/helpers/exif_event.php
@@ -19,10 +19,12 @@
  */
 class exif_event_Core {
   static function item_created($item) {
-    exif::extract($item);
+    if (!$item->is_album()) {
+      exif::extract($item);
+    }
   }
 
-  static function item_before_delete($item) {
+  static function item_deleted($item) {
     Database::instance()->delete("exif_records", array("item_id" => $item->id));
   }
 }
diff --git a/modules/exif/helpers/exif_installer.php b/modules/exif/helpers/exif_installer.php
index 0233f2bb..66226061 100644
--- a/modules/exif/helpers/exif_installer.php
+++ b/modules/exif/helpers/exif_installer.php
@@ -28,7 +28,7 @@ class exif_installer {
                  `dirty` BOOLEAN default 1,
                  PRIMARY KEY (`id`),
                  KEY(`item_id`))
-               ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+               DEFAULT CHARSET=utf8;");
     module::set_version("exif", 1);
   }
 
diff --git a/modules/exif/helpers/exif_task.php b/modules/exif/helpers/exif_task.php
index 375503e3..c269b732 100644
--- a/modules/exif/helpers/exif_task.php
+++ b/modules/exif/helpers/exif_task.php
@@ -28,47 +28,54 @@ class exif_task_Core {
     list ($remaining, $total, $percent) = exif::stats();
     return array(Task_Definition::factory()
                  ->callback("exif_task::update_index")
-                 ->name(t("Extract EXIF data"))
+                 ->name(t("Extract Exif data"))
                  ->description($remaining
                                ? t2("1 photo needs to be scanned",
                                     "%count (%percent%) of your photos need to be scanned",
                                     $remaining, array("percent" => (100 - $percent)))
-                               : t("EXIF data is up-to-date"))
+                               : t("Exif data is up-to-date"))
                  ->severity($remaining ? log::WARNING : log::SUCCESS));
   }
 
   static function update_index($task) {
-    $completed = $task->get("completed", 0);
+    try {
+      $completed = $task->get("completed", 0);
 
-    $start = microtime(true);
-    foreach (ORM::factory("item")
-             ->join("exif_records", "items.id", "exif_records.item_id", "left")
-             ->where("type", "photo")
-             ->open_paren()
-             ->where("exif_records.item_id", null)
-             ->orwhere("exif_records.dirty", 1)
-             ->close_paren()
-             ->find_all() as $item) {
-      if (microtime(true) - $start > 1.5) {
-        break;
-      }
+      $start = microtime(true);
+      foreach (ORM::factory("item")
+               ->join("exif_records", "items.id", "exif_records.item_id", "left")
+               ->where("type", "photo")
+               ->open_paren()
+               ->where("exif_records.item_id", null)
+               ->orwhere("exif_records.dirty", 1)
+               ->close_paren()
+               ->find_all() as $item) {
+        if (microtime(true) - $start > 1.5) {
+          break;
+        }
 
-      $completed++;
-      exif::extract($item);
-    }
+        $completed++;
+        exif::extract($item);
+      }
 
-    list ($remaining, $total, $percent) = exif::stats();
-    $task->set("completed", $completed);
-    if ($remaining == 0 || !($remaining + $completed)) {
+      list ($remaining, $total, $percent) = exif::stats();
+      $task->set("completed", $completed);
+      if ($remaining == 0 || !($remaining + $completed)) {
+        $task->done = true;
+        $task->state = "success";
+        site_status::clear("exif_index_out_of_date");
+        $task->percent_complete = 100;
+      } else {
+        $task->percent_complete = round(100 * $completed / ($remaining + $completed));
+      }
+      $task->status = t2("one record updated, index is %percent% up-to-date",
+                         "%count records updated, index is %percent% up-to-date",
+                         $completed, array("percent" => $percent));
+    } catch (Exception $e) {
       $task->done = true;
-      $task->state = "success";
-      site_status::clear("exif_index_out_of_date");
-      $task->percent_complete = 100;
-    } else {
-      $task->percent_complete = round(100 * $completed / ($remaining + $completed));
+      $task->state = "error";
+      $task->status = $e->getMessage();
+      $task->log($e->__toString());
     }
-    $task->status = t2("one record updated, index is %percent% up-to-date",
-                       "%count records updated, index is %percent% up-to-date",
-                       $completed, array("percent" => $percent));
   }
 }
diff --git a/modules/exif/module.info b/modules/exif/module.info
index 1e16a5ff..c8ae688e 100644
--- a/modules/exif/module.info
+++ b/modules/exif/module.info
@@ -1,3 +1,3 @@
-name = Exif Data
+name = "Exif Data"
 description = "Extract Exif data and display it on photo pages."
 version = 1