Merge pull request #51 from chadparry/rawphoto-squash

Chad Parry's framework enhancement to support replacing an image with a new version of a different mime type.  This includes code that centralizes file type management and fixes some latent issues around the relative url and path caching getting out of date.

2 files changed, 85 insertions, 8 deletions

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 39c87fbd..3548faa1 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -170,14 +170,8 @@ class graphics_Core {
 
         foreach (self::_get_rules($target) as $rule) {
           $args = array($working_file, $output_file, unserialize($rule->args), $item);
-          try {
-            call_user_func_array($rule->operation, $args);
-            $working_file = $output_file;
-          } catch (Exception $e) {
-            // Ignore this rule and move on.
-            Kohana_Log::add("error", "Caught exception processing image: {$item->title}\n" .
-                            $e->getMessage() . "\n" . $e->getTraceAsString());
-          }
+          call_user_func_array($rule->operation, $args);
+          $working_file = $output_file;
         }
       }
 
diff --git a/modules/gallery/helpers/legal_file.php b/modules/gallery/helpers/legal_file.php
new file mode 100644
index 00000000..d78efdda
--- /dev/null
+++ b/modules/gallery/helpers/legal_file.php
@@ -0,0 +1,83 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2011 Chad Parry
+ *
+ * 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 legal_file_Core {
+  /**
+   * Create a default list of allowed photo extensions and then let modules modify it.
+   */
+  static function get_photo_extensions() {
+    $extensions_wrapper = new stdClass();
+    $extensions_wrapper->extensions = array("gif", "jpg", "jpeg", "png");
+    module::event("legal_photo_extensions", $extensions_wrapper);
+    return $extensions_wrapper->extensions;
+  }
+
+  /**
+   * Create a default list of allowed movie extensions and then let modules modify it.
+   */
+  static function get_movie_extensions() {
+    $extensions_wrapper = new stdClass();
+    $extensions_wrapper->extensions = array("flv", "mp4", "m4v");
+    module::event("legal_movie_extensions", $extensions_wrapper);
+    return $extensions_wrapper->extensions;
+  }
+
+  /**
+   * Create a merged list of all allowed photo and movie extensions.
+   */
+  static function get_extensions() {
+    $extensions = legal_file::get_photo_extensions();
+    if (movie::find_ffmpeg()) {
+      $extensions = array_merge($extensions, legal_file::get_movie_extensions());
+    }
+    return $extensions;
+  }
+
+  /**
+   * Create a merged list of all photo and movie filename filters,
+   * (e.g. "*.gif"), based on allowed extensions.
+   */
+  static function get_filters() {
+    $filters = array();
+    foreach (legal_file::get_extensions() as $extension) {
+      array_push($filters, "*." . $extension, "*." . strtoupper($extension));
+    }
+    return $filters;
+  }
+
+  /**
+   * Create a default list of allowed photo MIME types and then let modules modify it.
+   */
+  static function get_photo_types() {
+    $types_wrapper = new stdClass();
+    $types_wrapper->types = array("image/jpeg", "image/gif", "image/png");
+    module::event("legal_photo_types", $types_wrapper);
+    return $types_wrapper->types;
+  }
+
+  /**
+   * Create a default list of allowed movie MIME types and then let modules modify it.
+   */
+  static function get_movie_types() {
+    $types_wrapper = new stdClass();
+    $types_wrapper->types = array("video/flv", "video/x-flv", "video/mp4");
+    module::event("legal_movie_types", $types_wrapper);
+    return $types_wrapper->types;
+  }
+}