From baff63b70b2b686b14f468a26180081ad505ce9a Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 22 Feb 2009 05:21:44 +0000 Subject: Very basic movie support. You can upload a FLV file, we use ffmpeg to extract a thumbnail out of it and if you click through we show it using flowplayer. --- core/SimpleUploader.swf | Bin 301344 -> 301344 bytes core/controllers/movies.php | 103 +++++++++++++++++++++++++++++ core/controllers/simple_uploader.php | 16 +++-- core/helpers/graphics.php | 47 ++++++++------ core/helpers/movie.php | 121 +++++++++++++++++++++++++++++++++++ core/helpers/photo.php | 31 +++++---- core/models/item.php | 21 +++++- lib/flowplayer.controls.swf | Bin 0 -> 15977 bytes lib/flowplayer.js | 24 +++++++ lib/flowplayer.swf | Bin 0 -> 92318 bytes themes/default/views/movie.html.php | 28 ++++++++ 11 files changed, 352 insertions(+), 39 deletions(-) create mode 100644 core/controllers/movies.php create mode 100644 core/helpers/movie.php create mode 100644 lib/flowplayer.controls.swf create mode 100644 lib/flowplayer.js create mode 100644 lib/flowplayer.swf create mode 100644 themes/default/views/movie.html.php diff --git a/core/SimpleUploader.swf b/core/SimpleUploader.swf index b52051a0..2be9841f 100644 Binary files a/core/SimpleUploader.swf and b/core/SimpleUploader.swf differ diff --git a/core/controllers/movies.php b/core/controllers/movies.php new file mode 100644 index 00000000..c84ce8d6 --- /dev/null +++ b/core/controllers/movies.php @@ -0,0 +1,103 @@ +viewable() + ->where("parent_id", $photo->parent_id) + ->where("id >", $photo->id) + ->orderby("id", "ASC") + ->find(); + $previous_item = ORM::factory("item") + ->viewable() + ->where("parent_id", $photo->parent_id) + ->where("id <", $photo->id) + ->orderby("id", "DESC") + ->find(); + $position = ORM::factory("item") + ->viewable() + ->where("parent_id", $photo->parent_id) + ->where("id <=", $photo->id) + ->count_all(); + + $template = new Theme_View("page.html", "photo"); + $template->set_global("item", $photo); + $template->set_global("children", array()); + $template->set_global("children_count", $photo->children_count()); + $template->set_global("parents", $photo->parents()); + $template->set_global("next_item", $next_item->loaded ? $next_item : null); + $template->set_global("previous_item", $previous_item->loaded ? $previous_item : null); + $template->set_global("sibling_count", $photo->parent()->children_count()); + $template->set_global("position", $position); + + $template->content = new View("movie.html"); + + $photo->view_count++; + $photo->save(); + + print $template; + } + + /** + * @see REST_Controller::_update($resource) + */ + public function _update($photo) { + access::required("edit", $photo); + + $form = photo::get_edit_form($photo); + if ($form->validate()) { + // @todo implement changing the name. This is not trivial, we have + // to check for conflicts and rename the album itself, etc. Needs an + // api method. + $orig = clone $photo; + $photo->title = $form->edit_photo->title->value; + $photo->description = $form->edit_photo->description->value; + $photo->save(); + + module::event("item_updated", $orig, $photo); + + log::success("content", "Updated photo", "id\">view"); + message::success(t("Saved photo %photo_title", array("photo_title" => $photo->title))); + + print json_encode( + array("result" => "success", + "location" => url::site("photos/$photo->id"))); + } else { + print json_encode( + array("result" => "error", + "form" => $form->__toString())); + } + } + + /** + * @see REST_Controller::_form_edit($resource) + */ + public function _form_edit($photo) { + access::required("edit", $photo); + print photo::get_edit_form($photo); + } +} diff --git a/core/controllers/simple_uploader.php b/core/controllers/simple_uploader.php index dca56201..e163a023 100644 --- a/core/controllers/simple_uploader.php +++ b/core/controllers/simple_uploader.php @@ -46,16 +46,18 @@ class Simple_Uploader_Controller extends Controller { access::verify_csrf(); $file_validation = new Validation($_FILES); - $file_validation->add_rules("file", "upload::valid", "upload::type[gif,jpg,png]"); + $file_validation->add_rules("file", "upload::valid", "upload::type[gif,jpg,png,flv]"); if ($file_validation->validate()) { $temp_filename = upload::save("file"); $title = substr(basename($temp_filename), 10); // Skip unique identifier Kohana adds - $photo = photo::create( - $album, - $temp_filename, - $title, - $title); - log::success("content", "Added a photo", html::anchor("photos/$photo->id", "view photo")); + $path_info = pathinfo($temp_filename); + if ($path_info["extension"] == "flv") { + $movie = movie::create($album, $temp_filename, $title, $title); + log::success("content", "Added a movie", html::anchor("movies/$movie->id", "view movie")); + } else { + $photo = photo::create($album, $temp_filename, $title, $title); + log::success("content", "Added a photo", html::anchor("photos/$photo->id", "view photo")); + } } } 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 @@ +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("
%s
",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")); diff --git a/core/models/item.php b/core/models/item.php index e29f3245..da0e7eb3 100644 --- a/core/models/item.php +++ b/core/models/item.php @@ -84,6 +84,14 @@ class Item_Model extends ORM_MPTT { return $this->type == 'photo'; } + /** + * Is this item a movie? + * @return true if it's a movie + */ + public function is_movie() { + return $this->type == 'movie'; + } + public function delete() { $original_path = $this->file_path(); $original_resize_path = $this->resize_path(); @@ -308,7 +316,7 @@ class Item_Model extends ORM_MPTT { } /** - * Return an tag for the thumbnail. + * Return an tag for the resize. * @param array $extra_attrs Extra attributes to add to the img tag * @return string */ @@ -319,4 +327,15 @@ class Item_Model extends ORM_MPTT { "height" => $this->resize_height), $extra_attrs); } + + public function movie_tag($extra_attrs) { + return html::anchor($this->file_url(true), "", + array_merge( + $extra_attrs, + array("id" => "player", + "style" => "display:block;width:400px;height:300px"))) . + ""; + } } diff --git a/lib/flowplayer.controls.swf b/lib/flowplayer.controls.swf new file mode 100644 index 00000000..09a27e8a Binary files /dev/null and b/lib/flowplayer.controls.swf differ diff --git a/lib/flowplayer.js b/lib/flowplayer.js new file mode 100644 index 00000000..b1c33150 --- /dev/null +++ b/lib/flowplayer.js @@ -0,0 +1,24 @@ +/** + * flowplayer.js 3.0.5. The Flowplayer API + * + * Copyright 2009 Flowplayer Oy + * + * This file is part of Flowplayer. + * + * Flowplayer 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 3 of the License, or + * (at your option) any later version. + * + * Flowplayer 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 Flowplayer. If not, see . + * + * Version: 3.0.5 - Tue Feb 03 2009 13:14:17 GMT-0000 (GMT+00:00) + */ +(function(){function log(args){console.log("$f.fireEvent",[].slice.call(args));}function clone(obj){if(!obj||typeof obj!='object'){return obj;}var temp=new obj.constructor();for(var key in obj){if(obj.hasOwnProperty(key)){temp[key]=clone(obj[key]);}}return temp;}function each(obj,fn){if(!obj){return;}var name,i=0,length=obj.length;if(length===undefined){for(name in obj){if(fn.call(obj[name],name,obj[name])===false){break;}}}else{for(var value=obj[0];i1){var swf=arguments[1];var conf=(arguments.length==3)?arguments[2]:{};if(typeof arg=='string'){if(arg.indexOf(".")!=-1){var instances=[];each(select(arg),function(){instances.push(new Player(this,clone(swf),clone(conf)));});return new Iterator(instances);}else{var node=el(arg);return new Player(node!==null?node:arg,swf,conf);}}else if(arg){return new Player(arg,swf,conf);}}return null;};extend(window.$f,{fireEvent:function(id,evt,a0,a1,a2){var p=$f(id);return p?p._fireEvent(evt,a0,a1,a2):null;},addPlugin:function(name,fn){Player.prototype[name]=fn;return $f;},each:each,extend:extend});if(document.all){window.onbeforeunload=function(){$f("*").each(function(){if(this.isLoaded()){this.close();}});};}if(typeof jQuery=='function'){jQuery.prototype.flowplayer=function(params,conf){if(!arguments.length||typeof arguments[0]=='number'){var arr=[];this.each(function(){var p=$f(this);if(p){arr.push(p);}});return arguments.length?arr[arguments[0]]:new Iterator(arr);}return this.each(function(){$f(this,clone(params),conf?clone(conf):{});});};}})();(function(){var jQ=typeof jQuery=='function';function isDomReady(){if(domReady.done){return false;}var d=document;if(d&&d.getElementsByTagName&&d.getElementById&&d.body){clearInterval(domReady.timer);domReady.timer=null;for(var i=0;i';}var e=extend({},p);e.width=e.height=e.id=e.w3c=e.src=null;for(var k in e){if(e[k]!==null){html+='';}}var vars="";if(c){for(var key in c){if(c[key]!==null){vars+=key+'='+(typeof c[key]=='object'?asString(c[key]):c[key])+'&';}}vars=vars.substring(0,vars.length-1);html+='';}html+="";return html;}function Flash(root,opts,flashvars){var version=flashembed.getVersion();extend(this,{getContainer:function(){return root;},getConf:function(){return conf;},getVersion:function(){return version;},getFlashvars:function(){return flashvars;},getApi:function(){return root.firstChild;},getHTML:function(){return getHTML(opts,flashvars);}});var required=opts.version;var express=opts.expressInstall;var ok=!required||flashembed.isSupported(required);if(ok){opts.onFail=opts.version=opts.expressInstall=null;root.innerHTML=getHTML(opts,flashvars);}else if(required&&express&&flashembed.isSupported([6,65])){extend(opts,{src:express});flashvars={MMredirectURL:location.href,MMplayerType:'PlugIn',MMdoctitle:document.title};root.innerHTML=getHTML(opts,flashvars);}else{if(root.innerHTML.replace(/\s/g,'')!==''){}else{root.innerHTML="

Flash version "+required+" or greater is required

"+"

"+(version[0]>0?"Your version is "+version:"You have no flash plugin installed")+"

"+"

Download latest version from here

";}}if(!ok&&opts.onFail){var ret=opts.onFail.call(this);if(typeof ret=='string'){root.innerHTML=ret;}}}window.flashembed=function(root,conf,flashvars){if(typeof root=='string'){var el=document.getElementById(root);if(el){root=el;}else{domReady(function(){flashembed(root,conf,flashvars);});return;}}if(!root){return;}var opts={width:'100%',height:'100%',allowfullscreen:true,allowscriptaccess:'always',quality:'high',version:null,onFail:null,expressInstall:null,w3c:false};if(typeof conf=='string'){conf={src:conf};}extend(opts,conf);return new Flash(root,opts,flashvars);};extend(window.flashembed,{getVersion:function(){var version=[0,0];if(navigator.plugins&&typeof navigator.plugins["Shockwave Flash"]=="object"){var _d=navigator.plugins["Shockwave Flash"].description;if(typeof _d!="undefined"){_d=_d.replace(/^.*\s+(\S+\s+\S+$)/,"$1");var _m=parseInt(_d.replace(/^(.*)\..*$/,"$1"),10);var _r=/r/.test(_d)?parseInt(_d.replace(/^.*r(.*)$/,"$1"),10):0;version=[_m,_r];}}else if(window.ActiveXObject){try{var _a=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");}catch(e){try{_a=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");version=[6,0];_a.AllowScriptAccess="always";}catch(ee){if(version[0]==6){return;}}try{_a=new ActiveXObject("ShockwaveFlash.ShockwaveFlash");}catch(eee){}}if(typeof _a=="object"){_d=_a.GetVariable("$version");if(typeof _d!="undefined"){_d=_d.replace(/^\S+\s+(.*)$/,"$1").split(",");version=[parseInt(_d[0],10),parseInt(_d[2],10)];}}}return version;},isSupported:function(version){var now=flashembed.getVersion();var ret=(now[0]>version[0])||(now[0]==version[0]&&now[1]>=version[1]);return ret;},domReady:domReady,asString:asString,getHTML:getHTML});if(jQ){jQuery.prototype.flashembed=function(conf,flashvars){return this.each(function(){flashembed(this,conf,flashvars);});};}})(); \ No newline at end of file diff --git a/lib/flowplayer.swf b/lib/flowplayer.swf new file mode 100644 index 00000000..61d7f652 Binary files /dev/null and b/lib/flowplayer.swf differ diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php new file mode 100644 index 00000000..365faded --- /dev/null +++ b/themes/default/views/movie.html.php @@ -0,0 +1,28 @@ + + +
+ photo_top() ?> + +
    +
  • $position, "total" => $sibling_count)) ?>
    • + +
    • + + +
    • + +
+ + + + + +
+

title ?>

+
description ?>
+
+ + photo_bottom() ?> +
-- cgit v1.2.3