From 9237ab9bc1e7b3286ceecd5bf6b03cdbfcfa98a5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 2 Sep 2009 15:29:00 -0700
Subject: Change graphics::generate() API so that it doesn't return a boolean,
 instead it throws an exception if there's a problem.  The normal case for
 graphics::generate is that it's going to succeed.  It'll only fail if
 something un-handleable went wrong, so just use the resulting exception.

---
 modules/gallery/helpers/graphics.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'modules/gallery/helpers/graphics.php')

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 66182a68..78812794 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -102,12 +102,12 @@ class graphics_Core {
   /**
    * Rebuild the thumb and resize for the given item.
    * @param Item_Model $item
-   * @return true on successful generation
    */
   static function generate($item) {
     if ($item->is_album()) {
       if (!$cover = $item->album_cover()) {
-        return false;
+        // This album has no cover; there's nothing to generate.
+        return;
       }
       $input_file = $cover->file_path();
       $input_item = $cover;
@@ -127,7 +127,7 @@ class graphics_Core {
       $item->thumb_dirty = 0;
       $item->resize_dirty = 0;
       $item->save();
-      return true;
+      return;
     }
 
     try {
@@ -176,10 +176,8 @@ class graphics_Core {
       // @todo we should handle this better.
       Kohana::log("error", "Caught exception rebuilding image: {$item->title}\n" .
                   $e->getMessage() . "\n" . $e->getTraceAsString());
-      return false;
+      throw $e;
     }
-
-    return true;
   }
 
   /**
-- 
cgit v1.2.3