From f83ed5f8716663a45c9d8e8118bbcf0e2849c3fb Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Thu, 31 Jan 2013 17:18:39 +0100
Subject: [PATCH] #1982 - Add placeholder for albums with no album cover. -
 Added missing_album_cover.jpg placeholder image. - Modified the graphics
 helper to use it.  Calling graphics::generate will copy it. - Modified
 item::remove_album_cover and gallery_event::item_created to run
 graphics::generate. - Added unit test to Graphics_Helper_Test.

---
 modules/gallery/helpers/gallery_event.php     |  20 +++++++++---------
 modules/gallery/helpers/graphics.php          |  10 ++++++---
 modules/gallery/helpers/item.php              |   1 +
 .../gallery/images/missing_album_cover.jpg    | Bin 0 -> 4453 bytes
 .../gallery/tests/Graphics_Helper_Test.php    |  11 ++++++++++
 5 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 modules/gallery/images/missing_album_cover.jpg

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 4bbeccc2..aeb1c7eb 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -86,17 +86,17 @@ class gallery_event_Core {
   static function item_created($item) {
     access::add_item($item);
 
-    if ($item->is_photo() || $item->is_movie()) {
-      // Build our thumbnail/resizes.
-      try {
-        graphics::generate($item);
-      } catch (Exception $e) {
-        log::error("graphics", t("Couldn't create a thumbnail or resize for %item_title",
-                                 array("item_title" => $item->title)),
-                   html::anchor($item->abs_url(), t("details")));
-        Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
-      }
+    // Build our thumbnail/resizes.
+    try {
+      graphics::generate($item);
+    } catch (Exception $e) {
+      log::error("graphics", t("Couldn't create a thumbnail or resize for %item_title",
+                               array("item_title" => $item->title)),
+                 html::anchor($item->abs_url(), t("details")));
+      Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
+    }
 
+    if ($item->is_photo() || $item->is_movie()) {
       // If the parent has no cover item, make this it.
       $parent = $item->parent();
       if (access::can("edit", $parent) && $parent->album_cover_item_id == null)  {
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 19ae1036..7c8e89d5 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -152,6 +152,7 @@ class graphics_Core {
             } catch (Exception $e) {
               // Didn't work, likely because of MISSING_FFMPEG - use placeholder
               graphics::_replace_image_with_placeholder($item, $target);
+              break;
             }
           }
           $working_file = $output_file;
@@ -167,7 +168,7 @@ class graphics_Core {
 
         case "album":
           if (!$cover = $item->album_cover()) {
-            // This album has no cover; there's nothing to generate.  Because of an old bug, it's
+            // This album has no cover; copy its placeholder image.  Because of an old bug, it's
             // possible that there's an album cover item id that points to an invalid item.  In that
             // case, just null out the album cover item id.  It's not optimal to do that at this low
             // level, but it's not trivial to find these cases quickly in an upgrade script and if we
@@ -179,7 +180,8 @@ class graphics_Core {
               $item->album_cover_item_id = null;
               $item->save();
             }
-            return;
+            graphics::_replace_image_with_placeholder($item, $target);
+            break;
           }
           if ($cover->thumb_dirty) {
             graphics::generate($cover);
@@ -238,7 +240,9 @@ class graphics_Core {
   }
 
   private static function _replace_image_with_placeholder($item, $target) {
-    if ($item->is_movie() || ($item->is_album() && $item->album_cover()->is_movie())) {
+    if ($item->is_album() && !$item->album_cover_item_id) {
+      $input_path = MODPATH . "gallery/images/missing_album_cover.jpg";
+    } else if ($item->is_movie() || ($item->is_album() && $item->album_cover()->is_movie())) {
       $input_path = MODPATH . "gallery/images/missing_movie.jpg";
     } else {
       $input_path = MODPATH . "gallery/images/missing_photo.jpg";
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 975d46e5..9882a9c5 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -113,6 +113,7 @@ class item_Core {
     model_cache::clear();
     $album->album_cover_item_id = null;
     $album->save();
+    graphics::generate($album);
   }
 
   /**
diff --git a/modules/gallery/images/missing_album_cover.jpg b/modules/gallery/images/missing_album_cover.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..bdddeec5dbc5658862d4661e349814641fb330c8
GIT binary patch
literal 4453
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

literal 0
HcmV?d00001

diff --git a/modules/gallery/tests/Graphics_Helper_Test.php b/modules/gallery/tests/Graphics_Helper_Test.php
index a68822b0..2cf5caa7 100644
--- a/modules/gallery/tests/Graphics_Helper_Test.php
+++ b/modules/gallery/tests/Graphics_Helper_Test.php
@@ -77,6 +77,17 @@ class Graphics_Helper_Test extends Gallery_Unit_Test_Case {
     $this->assert_equal(0, $album->thumb_dirty);
   }
 
+  public function generate_album_cover_for_empty_album_test() {
+    $album = test::random_album();
+    // Check that the album cover is the missing image placeholder
+    $this->assert_same(file_get_contents(MODPATH . "gallery/images/missing_album_cover.jpg"),
+                       file_get_contents($album->thumb_path()));
+    // Check that the items table got updated with new metadata
+    $this->assert_equal(array(200, 200), array($album->thumb_width, $album->thumb_height));
+    // Check that the image is *not* marked as dirty
+    $this->assert_equal(0, $album->thumb_dirty);
+  }
+
   public function generate_bad_photo_test() {
     $photo = test::random_photo();
     // At this point, the photo is valid and has a valid resize and thumb.  Make it garble.