diff options
Diffstat (limited to 'core/helpers')
| -rw-r--r-- | core/helpers/graphics.php | 47 | ||||
| -rw-r--r-- | core/helpers/movie.php | 121 | ||||
| -rw-r--r-- | core/helpers/photo.php | 31 |
3 files changed, 168 insertions, 31 deletions
diff --git a/core/helpers/graphics.php b/core/helpers/graphics.php index 4ec21ee8..2ea92873 100644 --- a/core/helpers/graphics.php +++ b/core/helpers/graphics.php @@ -115,7 +115,7 @@ class graphics_Core { ->where("target", $target) ->orderby("priority", "asc") ->find_all() as $rule) { - $args = array($working_file, $output_file, unserialize($rule->args)); + $args = array($item, $working_file, $output_file, unserialize($rule->args)); call_user_func_array(array("graphics", $rule->operation), $args); $working_file = $output_file; } @@ -141,35 +141,43 @@ class graphics_Core { * Resize an image. Valid options are width, height and master. Master is one of the Image * master dimension constants. * - * @param string $input_file - * @param string $output_file - * @param array $options + * @param Item_Model $item + * @param string $input_file + * @param string $output_file + * @param array $options */ - static function resize($input_file, $output_file, $options) { + static function resize($item, $input_file, $output_file, $options) { if (!self::$init) { self::init_toolkit(); } - Image::factory($input_file) - ->resize($options["width"], $options["height"], $options["master"]) - ->save($output_file); + if ($item->is_movie()) { + movie::extract_frame($input_file, $output_file); + } else if ($item->is_photo()) { + Image::factory($input_file) + ->resize($options["width"], $options["height"], $options["master"]) + ->save($output_file); + } } /** * Rotate an image. Valid options are degrees * - * @param string $input_file - * @param string $output_file - * @param array $options + * @param Item_Model $item + * @param string $input_file + * @param string $output_file + * @param array $options */ - static function rotate($input_file, $output_file, $options) { + static function rotate($item, $input_file, $output_file, $options) { if (!self::$init) { self::init_toolkit(); } - Image::factory($input_file) - ->rotate($options["degrees"]) - ->save($output_file); + if ($item->is_photo()) { + Image::factory($input_file) + ->rotate($options["degrees"]) + ->save($output_file); + } } /** @@ -177,11 +185,12 @@ class graphics_Core { * transparency_percent. * position is one of northwest, north, northeast, west, center, east, southwest, south, southeast * - * @param string $input_file - * @param string $output_file - * @param array $options + * @param Item_Model $item + * @param string $input_file + * @param string $output_file + * @param array $options */ - static function composite($input_file, $output_file, $options) { + static function composite($item, $input_file, $output_file, $options) { if (!self::$init) { self::init_toolkit(); } diff --git a/core/helpers/movie.php b/core/helpers/movie.php new file mode 100644 index 00000000..99b9180a --- /dev/null +++ b/core/helpers/movie.php @@ -0,0 +1,121 @@ +<?php defined("SYSPATH") or die("No direct script access."); +/** + * Gallery - a web based photo album viewer and editor + * Copyright (C) 2000-2008 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. + */ + +/** + * This is the API for handling movies. + * + * Note: by design, this class does not do any permission checking. + */ +class movie_Core { + /** + * Create a new movie. + * @param integer $parent_id id of parent album + * @param string $filename path to the photo file on disk + * @param string $name the filename to use for this photo in the album + * @param integer $title the title of the new photo + * @param string $description (optional) the longer description of this photo + * @return Item_Model + */ + static function create($parent, $filename, $name, $title, + $description=null, $owner_id=null) { + if (!$parent->loaded || !$parent->is_album()) { + throw new Exception("@todo INVALID_PARENT"); + } + + if (!is_file($filename)) { + throw new Exception("@todo MISSING_MOVIE_FILE"); + } + + $movie_info = movie::getmoviesize($filename); + + // Force an extension onto the name + $pi = pathinfo($name); + if (empty($pi["extension"])) { + $pi["extension"] = image_type_to_extension($movie_info[2], false); + $name .= "." . $pi["extension"]; + } + + $movie = ORM::factory("item"); + $movie->type = "movie"; + $movie->title = $title; + $movie->description = $description; + $movie->name = $name; + $movie->owner_id = $owner_id; + $movie->width = $movie_info[0]; + $movie->height = $movie_info[1]; + $movie->mime_type = empty($image_info["mime"]) ? "application/unknown" : $image_info["mime"]; + $movie->thumb_dirty = 1; + $movie->resize_dirty = 1; + + // Randomize the name if there's a conflict + while (ORM::Factory("item") + ->where("parent_id", $parent->id) + ->where("name", $movie->name) + ->find()->id) { + // @todo Improve this. Random numbers are not user friendly + $movie->name = rand() . "." . $pi["extension"]; + } + + // This saves the photo + $movie->add_to_parent($parent); + copy($filename, $movie->file_path()); + + module::event("item_created", $movie); + + // Build our thumbnail + graphics::generate($movie); + + // If the parent has no cover item, make this it. + $parent = $movie->parent(); + if ($parent->album_cover_item_id == null) { + $parent->album_cover_item_id = $movie->id; + $parent->save(); + graphics::generate($parent); + } + + return $movie; + } + + static function getmoviesize($filename) { + if (!$ffmpeg = exec("which ffmpeg")) { + throw new Exception("@todo MISSING_FFMPEG"); + } + $cmd = escapeshellcmd($ffmpeg) . " -i " . escapeshellarg($filename) . " 2>&1"; + $result = `$cmd`; + if (preg_match("/Stream.*?Video:.*?(\d+)x(\d+).*\ +([0-9\.]+) (fps|tb).*/", + $result, $regs)) { + list ($width, $height) = array($regs[1], $regs[2]); + } else { + list ($width, $height) = array(0, 0); + } + return array($width, $height); + } + + function extract_frame($input_file, $output_file) { + if (!$ffmpeg = exec("which ffmpeg")) { + throw new Exception("@todo MISSING_FFMPEG"); + } + + $cmd = escapeshellcmd($ffmpeg) . " -i " . escapeshellarg($input_file) . + " -t 0.001 -y -f mjpeg " . escapeshellarg($output_file); + printf("<pre>%s</pre>",print_r($cmd,1));flush(); + exec($cmd); + } +} diff --git a/core/helpers/photo.php b/core/helpers/photo.php index a571943d..9b773dc4 100644 --- a/core/helpers/photo.php +++ b/core/helpers/photo.php @@ -43,8 +43,13 @@ class photo_Core { throw new Exception("@todo MISSING_IMAGE_FILE"); } - if (!($image_info = getimagesize($filename))) { - throw new Exception("@todo INVALID_IMAGE_FILE"); + $image_info = getimagesize($filename); + if ($image_info) { + $type = "photo"; + } else { + $movie_info = movie::getmoviesize($filename); + $image_info = array(200, 200, 'mime' => 'video/x-flv'); + $type = "movie"; } // Force an extension onto the name @@ -55,7 +60,7 @@ class photo_Core { } $photo = ORM::factory("item"); - $photo->type = "photo"; + $photo->type = $type; $photo->title = $title; $photo->description = $description; $photo->name = $name; @@ -81,15 +86,17 @@ class photo_Core { module::event("item_created", $photo); - // Build our thumbnail/resizes - graphics::generate($photo); + if ($type == "photo") { + // Build our thumbnail/resizes + graphics::generate($photo); - // If the parent has no cover item, make this it. - $parent = $photo->parent(); - if ($parent->album_cover_item_id == null) { - $parent->album_cover_item_id = $photo->id; - $parent->save(); - graphics::generate($parent); + // If the parent has no cover item, make this it. + $parent = $photo->parent(); + if ($parent->album_cover_item_id == null) { + $parent->album_cover_item_id = $photo->id; + $parent->save(); + graphics::generate($parent); + } } return $photo; @@ -102,7 +109,7 @@ class photo_Core { $group->input("name")->label(t("Name")); $group->input("title")->label(t("Title")); $group->textarea("description")->label(t("Description")); - $group->upload("file")->label(t("File"))->rules("required|allow[jpg,png,gif]"); + $group->upload("file")->label(t("File"))->rules("required|allow[jpg,png,gif,flv]"); $group->hidden("type")->value("photo"); $group->submit("")->value(t("Upload")); $form->add_rules_from(ORM::factory("item")); |