puremotion 0.1.0 → 0.1.1

data/{README.md → README.markdown}

@@ -1,7 +1,8 @@
 PureMotion (0.1.0)
 ==================
 
-**Homepage**:  [http://github.com/ominiom/puremotion](http://github.com/ominiom/puremotion)
+*   **Homepage**:  [http://github.com/ominiom/puremotion](http://github.com/ominiom/puremotion)
+*   **Docs (Incomplete)**: [http://ominiom.net/projects/puremotion/doc/](http://ominiom.net/projects/puremotion/doc/)
 
 OVERVIEW
 --------
@@ -57,7 +58,7 @@ a video stream.
     Media 'sample.mp4' do
 
         if video? then
-            seek(5).grab.resize(320, 240).save('thumb.png')
+            video.seek(5).grab.resize(320, 240).save('thumb.png')
         end
 
     end
@@ -66,4 +67,4 @@ BUILDING
 --------
 
 To build the PureMotion gem from source you will need to have libav* and libgd
-installed.
+installed.

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["Ominiom"]
     gem.extensions = ["ext/puremotion/extconf.rb"]
     gem.files = [
-      "README.md",
+      "README.markdown",
       "LICENSE",
       "Rakefile",
       ".yardopts",
@@ -63,3 +63,9 @@ rescue LoadError
     abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
   end
 end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end

data/bin/pmts

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'daemons'
+
+server = File.join(File.dirname(__FILE__), %w(.. lib server server.rb))
+
+options = {
+    :app_name   => "pmts",
+    :dir_mode   => :normal,
+    :dir => File.dirname(__FILE__),
+    :multiple   => false,
+    :ontop      => false,
+    :mode       => :load,
+    :backtrace  => true,
+    :monitor    => true
+}
+
+Daemons.run(server, options)

data/examples/failure_handling.rb

@@ -0,0 +1,28 @@
+Transcode '../spec/samples/sample.ogv' do
+
+  event :failure do |reason, message|
+    puts "Failure - #{message}"
+  end
+
+  event :complete do |output|
+    puts "Success! Output is #{output.video.duration}"
+  end
+
+  overwrite!
+
+  video do
+    codec :flv
+    bitrate '200k'
+    resolution 320, 176
+  end
+
+  audio do
+    codec :libmp3lame
+    bitrate '96k'
+  end
+
+  log 'failure_handling.log'
+
+  output '/totally/invalid/path/on/normal/systems.flv'
+
+end

data/examples/process.rb

@@ -0,0 +1,7 @@
+ff = PureMotion::Process.new('ffmpeg -i test.wmv')
+
+ff.on(:output) do |output|
+  puts output
+end
+
+ff.run

data/examples/progress_reporting.rb

@@ -17,7 +17,7 @@ Transcode do
 
   output 'test.flv'
 
-  log 'simple.log'
+  log 'progress_reporting.log'
 
   event :progress do |transcode, progress|
     puts "#{progress[:percent]}%"

data/ext/puremotion/frame.c

@@ -22,6 +22,13 @@ static AVFrame * alloc_picture(int pix_fmt, int width, int height) {
     return picture;
 }
 
+/* Convert frame to RGB24
+ *
+ * Used internally to convert the pixel format when resizing and saving to PNG
+ *
+ * @return [PureMotion::Frame] Frame in RGB24 format
+ *
+ */
 static VALUE frame_to_rgb24(VALUE self) {
     int width = NUM2INT(rb_iv_get(self, "@width"));
     int height = NUM2INT(rb_iv_get(self, "@height"));
@@ -42,8 +49,10 @@ static VALUE frame_to_rgb24(VALUE self) {
     return build_frame_object(to, width, height, PIX_FMT_RGB24);
 }
 
-
-
+/* Encodes the frame in PPM format
+ *
+ * @return [String] PPM encoded representation of the frame
+ */
 static VALUE frame_to_ppm(VALUE self) {
     VALUE rb_frame = frame_to_rgb24(self);
     AVFrame * frame = get_frame(rb_frame);
@@ -63,6 +72,13 @@ static VALUE frame_to_ppm(VALUE self) {
     return rb_str_new(data_string, size);
 }
 
+/* Resizes the frame using libgd
+ *
+ * @param [Integer] width Target width
+ * @param [Integer] height Target height
+ *
+ * @return [PureMotion::Frame] New frame that's been resized
+ */
 static VALUE frame_resize(VALUE self, VALUE w, VALUE h) {
 
     int orig_width = NUM2INT(rb_iv_get(self, "@width"));
@@ -89,8 +105,28 @@ static VALUE frame_resize(VALUE self, VALUE w, VALUE h) {
     
 }
 
+/* Saves the frame to PNG
+ *
+ * @param [String] path A writable path to save the frame to
+ *
+ * @return [PureMotion::Frame] self
+ */
 static VALUE frame_save(VALUE self, VALUE filename) {
 
+    VALUE directory = rb_funcall(rb_cFile, rb_intern("dirname"), 1, filename);
+    VALUE writable = rb_funcall(rb_cFile, rb_intern("writable?"), 1, directory);
+    VALUE exists = rb_funcall(rb_cFile, rb_intern("exists?"), 1, filename);
+
+    if( exists == Qtrue ) {
+        rb_raise(rb_eArgError, "File '%s' already exists.", STR2CSTR(filename));
+        return self;
+    }
+
+    if( writable == Qfalse ) {
+        rb_raise(rb_eArgError, "File '%s' is not writable.", STR2CSTR(filename));
+        return self;
+    }
+
     int w = NUM2INT(rb_iv_get(self, "@width"));
     int h = NUM2INT(rb_iv_get(self, "@height"));
 

data/ext/puremotion/media.c

@@ -115,7 +115,7 @@ static VALUE media_init(VALUE self, VALUE file) {
     if( error < 0 ) {
         rb_raise(rb_eUnsupportedFormat, "File '%s' unable to be opened. Unsupported format.", StringValuePtr(file));
         rb_iv_set(self, "@valid", Qfalse);
-        return Qnil;
+        return self;
     }
 
     error = av_find_stream_info(fmt_ctx);
@@ -123,6 +123,7 @@ static VALUE media_init(VALUE self, VALUE file) {
     if( error < 0 ) {
         rb_raise(rb_eUnsupportedFormat, "File '%s': Streams are unreadable.", StringValuePtr(file));
         rb_iv_set(self, "@valid", Qfalse);
+        return self;
     }
 
     rb_iv_set(self, "@valid", Qtrue);

data/ext/puremotion/stream.c

@@ -4,28 +4,6 @@
 VALUE rb_cStream;
 VALUE rb_mStreams;
 
-static int next_packet(AVFormatContext * format_context, AVPacket * packet)
-{
-    if(packet->data != NULL)
-        av_free_packet(packet);
-
-    if(av_read_frame(format_context, packet) < 0) {
-        return -1;
-    }
-
-    return 0;
-}
-
-static int next_packet_for_stream(AVFormatContext * format_context, int stream_index, AVPacket * packet)
-{
-    int ret = 0;
-    do {
-        ret = next_packet(format_context, packet);
-    } while(packet->stream_index != stream_index && ret == 0);
-
-    return ret;
-}
-
 static VALUE stream_type( VALUE self ) {
     AVStream * stream = get_stream(self);
 

data/ext/puremotion/utils.c

@@ -78,4 +78,4 @@ VALUE codec_type_id_to_sym(int codec_type)
     }
 
     return type_sym;
-}
+}

data/ext/puremotion/video.c

@@ -5,6 +5,35 @@ VALUE rb_cStream;
 VALUE rb_cVideoStream;
 VALUE rb_mStreams;
 
+static int next_packet(AVFormatContext * format_context, AVPacket * packet)
+{
+    if(packet->data != NULL)
+        av_free_packet(packet);
+
+    if(av_read_frame(format_context, packet) < 0) {
+        return -1;
+    }
+
+    return 0;
+}
+
+static int next_packet_for_stream(AVFormatContext * format_context, int stream_index, AVPacket * packet)
+{
+    int ret = 0;
+    do {
+        ret = next_packet(format_context, packet);
+    } while(packet->stream_index != stream_index && ret == 0);
+
+    return ret;
+}
+
+/*
+ * call-seq: frame_rate => Float
+ *
+ * Returns the video frame rate as a Float
+ *
+ * @return [Float] Framerate
+ */
 static VALUE stream_frame_rate(VALUE self) {
     AVStream * stream = get_stream(self);
     return(rb_float_new(av_q2d(stream->r_frame_rate)));
@@ -44,8 +73,23 @@ static int extract_next_frame(AVFormatContext * format_context, AVCodecContext *
 /*
  * call-seq: grab => PureMotion::Frame
  *
+ * Grabs a single frame from the current position in the stream.
+ *
+ * Example Usage:
+ *
+ *      Media 'sample.wmv' do
+ *
+ *          if video? then
+ *
+ *              frame = video.seek(5).grab
+ *
+ *              # Resize, save
  *
+ *          end
  *
+ *      end
+ *
+ * @return [PureMotion::Frame]
  */
 
 static VALUE stream_grab(VALUE self) {
@@ -98,6 +142,12 @@ static VALUE stream_grab(VALUE self) {
     return self;
 }
 
+/* call-seq: resolution => Array<Integer width, Integer height>
+ *
+ * Returns video frame resolution as [width, height] array
+ *
+ * @return [Array<Integer width, Integer height>]
+ */
 static VALUE stream_resolution(VALUE self, VALUE media) {
     AVFormatContext * format_context = get_format_context(rb_iv_get(self, "@media"));
     AVStream * stream = get_stream(self);
@@ -138,4 +188,4 @@ void Init_video_stream() {
     rb_define_method(rb_cVideoStream, "resolution", stream_resolution, 0);
     rb_define_method(rb_cVideoStream, "frame_rate", stream_frame_rate, 0);
     rb_define_method(rb_cVideoStream, "grab", stream_grab, 0);
-}
+}

data/lib/events/event.rb

@@ -43,17 +43,17 @@ module PureMotion::Events
     
     # Calls all of the handlers for the events, with the given sender and set
     # of arguments.
-    def call(sender, args)
+    def call(*args)
       # Make sure we don't get surprised with new friends while we're calling
       # the handlers
       named_handlers = @named_handlers
       handlers       = @handlers
     
       named_handlers.each do |name, handler|
-        handler.call(sender, *args)
+        handler.call(*args)
       end
       handlers.each do |handler|
-        handler.call(sender, *args)
+        handler.call(*args)
       end
     end
     

data/lib/events/generator.rb

@@ -1,50 +1,31 @@
-# ruby-event - generator.rb
-# Author    :: Stefan Nuxoll
-# License   :: BSD License
-# Copyright :: Copyright (C) 2009 Stefan Nuxoll
+module PureMotion
+  module Events
+    module Generator
 
-module PureMotion::Events
-  module Generator
-  
-    # Constructs the methods and objects for an event automatically
-    #
-    # Example:
-    #   event :data_received
-    def event(event_name)
-      self.class_eval <<-EOT
-      
-        def #{event_name}(*args, &block)
-          _ensure_events
-          if not @_events["#{event_name}"]
-            @_events["#{event_name}"] = PureMotion::Events::Event.new
-          end
-          if args != []
-            @_events["#{event_name}"].call(self, args)
-          else
-            if block
-              #{event_name} + block
-            else
-              @_events["#{event_name}"]
-            end
-          end
-        end
-        
-        def #{event_name}=(event)
-          _ensure_events
-          if PureMotion::Events::Event === event
-            @_events["#{event_name}"] = event
+      def event(event_name)
+        @@_events_built = false unless class_variable_defined?(:@@_events_built)
+        self._build_events unless @@_events_built
+      end
+
+      def _build_events
+        self.class_eval do
+
+          def on(event_name, &block)
+            @_events = {} unless instance_variable_defined?(:@_events)
+            @_events[event_name] = PureMotion::Events::Event.new unless @_events[event_name]
+            return @_events[event_name] unless block_given?
+            @_events[event_name] + block
           end
-        end
-        
-        def _ensure_events
-          if not @_events
-            @_events = {}
+
+          def fire(event_name, *args)
+            @_events = {} unless instance_variable_defined?(:@_events)
+            @_events[event_name].call(*args) unless @_events[event_name].nil?
           end
+
         end
-        
-        private :_ensure_events 
-      EOT
+        @@_events_built = true
+      end
+
     end
-    
   end
 end

data/lib/preset/preset.rb

@@ -4,7 +4,7 @@ module PureMotion
 
     def self.build(&block)
 
-      preset = self.new(:dsl)
+      preset = self.new({ :from => :dsl })
       preset.instance_eval(&block) if block_given?
 
       preset
@@ -13,7 +13,16 @@ module PureMotion
 
     attr_accessor :event_handlers
 
-    def initialize(form=nil)
+    def initialize(options = {})
+
+      defaults = {
+        :from => :dsl,
+        :input => nil,
+        :output => nil
+      }
+
+      options = defaults.merge(options)
+
       @input = nil
       @output = nil
       @log = nil
@@ -22,7 +31,11 @@ module PureMotion
       @commands = []
       @event_handlers = {}
       @dsls = [:general, :file, :video, :audio, :metadata ,:crop, :pad]
-      extend_for(:general) if form == :dsl
+
+      input(options[:input]) unless options[:input].nil?
+      output(options[:output]) unless options[:output].nil?
+
+      extend_for(:general) if options[:from] == :dsl
     end
 
     def method_missing(name, *args, &block)
@@ -42,7 +55,7 @@ module PureMotion
     end
 
     def event_handler(name)
-      @event_handlers[name]
+      @event_handlers[name] or nil
     end
 
     def log(log=nil)
@@ -65,15 +78,28 @@ module PureMotion
       return false unless @input.nil?
       if input.is_a?(String) then
         if ::File.exists?(input) then # Ruby's File class is hidden by Preset::File
-          @input = PureMotion::Media.new(input)
+          begin
+            @input = PureMotion::Media.new(input)
+          rescue PureMotion::UnsupportedFormat
+            if event_handler(:failure).nil? then
+              raise ArgumentError, "Invalid input file '#{input}'" if event_handler(:failure).nil?
+              return false
+            else
+              event_handler(:failure).call(:invalid_input, "Invalid input file '#{input}'")
+              return false
+            end
+          end
         else
           raise ArgumentError, "Input file '#{input}' not found"
+          return false
         end
       else
         if input.is_a?(PureMotion::Media)
           @input = input
+          return true
         else
           raise ArgumentError, "Invalid input"
+          return false
         end
       end
       raise ArgumentError, "Invalid media input '#{@input.filename}'" unless @input.valid?

data/lib/process.rb

@@ -0,0 +1,88 @@
+module PureMotion
+
+  class Process
+
+    event :start
+    event :exit
+    event :output
+
+    def initialize(options = {})
+
+      defaults = {
+        :command => nil,
+        :autostart => false
+      }
+
+      options = { :command => options } if options.is_a?(String)
+
+      options = defaults.merge(options)
+
+      @command = options[:command]
+
+      raise ArgumentError, "No command given" if @command.nil?
+
+      @status = :ready
+      @buffer = ''
+      @output = []
+    end
+
+    def run
+      @status = :running
+
+      @process = IO.popen("#{@command} 2>&1")
+      @id = @process.pid
+
+      runner = lambda {
+        @process.each_byte { |byte|
+          @process.eof? ? handle_exit : handle_output(byte)
+        }
+      }
+
+      if PureMotion::Settings[:threaded] then
+        PureMotion::Thread.new { runner.call }
+      else
+        runner.call
+      end
+
+    end
+
+    def kill!
+      return false unless @status == :running
+      ::Process.kill('TERM', @id)
+    end
+
+    def kill!
+      return false unless @status == :running
+      ::Process.kill('KILL', @id)
+    end
+
+    private
+
+    def find_in_output(regexp)
+      return '' if @status == :ready
+      m = regexp.match(@output.join('\n'))
+      return m[1] if m
+      nil
+    end
+
+    def handle_output(byte)
+      if [10, 13].include?(byte) then
+        @output << @buffer
+        fire(:output, @buffer)
+        @buffer = ''
+      else
+        byte = byte.chr.to_s
+        @buffer = @buffer + byte
+      end
+    end
+
+    def handle_exit
+      @status = :exited
+      @id = nil
+      @process.close
+      fire(:exit)
+    end
+
+  end
+
+end

data/lib/puremotion.rb

@@ -12,6 +12,7 @@ require req + 'events/generator'
 
 Object.extend(PureMotion::Events::Generator)
 
+require req + 'settings'
 require req + 'preset/preset'
 
 require req + 'preset/general'
@@ -22,9 +23,8 @@ require req + 'preset/video/crop'
 require req + 'preset/video/pad'
 require req + 'preset/audio/audio'
 
-
+require req + 'process'
 require req + 'threading'
 require req + 'media'
-require req + 'codecs'
 require req + 'transcode/transcode'
 require req + 'tools/ffmpeg'

data/lib/server/app.rb

@@ -0,0 +1,27 @@
+Models = PureMotion::Server::Models
+
+class PureMotion::Server::App < Sinatra::Base
+
+  set :port, OPTIONS[:port]
+  set :public, File.dirname(__FILE__) + '/static'
+  set :views, File.dirname(__FILE__) + '/views'
+
+  use Rack::Auth::Basic do |username, password|
+    [username, password] == ['admin', 'admin']
+  end
+
+  get '/transcode/new' do
+    haml :'transcode/new'
+  end
+
+  post '/transcode/create' do
+    params[:file][:tempfile].methods.inspect
+  end
+
+  get '/transcode/:id/download' do
+    transcode = Models::Transcode.get(params[:id])
+    return error 404 unless transcode
+    
+  end
+
+end

data/lib/server/database.rb

@@ -0,0 +1,19 @@
+DataMapper::Logger.new($stdout, :debug)
+DataMapper.setup(:default, 'sqlite3::memory:')
+
+module PureMotion::Server::Models
+
+  class Transcode
+    include DataMapper::Resource
+
+    property :id,       Serial
+    property :name,     String
+    property :file,     String
+    property :status,   String
+    property :attempts, Integer
+    property :progress, String
+  end
+
+  DataMapper.auto_migrate!
+
+end

data/lib/server/server.rb

@@ -0,0 +1,39 @@
+LOAD_PATH = File.dirname(__FILE__)
+require File.expand_path(File.join(LOAD_PATH, *%w(.. puremotion)))
+
+require 'rubygems'
+require 'dm-core'
+require 'sinatra'
+require 'json'
+require 'log4r'
+require 'optparse'
+require 'yaml'
+
+OPTIONS = {
+  :config => 'default.yml',
+  :port => 9005
+}
+
+OptionParser.new do |opts|
+  
+  opts.on("-c", "--config PATH", "Path to config file") do |path|
+    OPTIONS[:config] = path
+  end
+
+  opts.on("-p", "--port N", "Listening port") do |port|
+    OPTIONS[:port] = port
+  end
+
+end.parse!
+
+CONFIG = YAML.load(OPTIONS[:config]) if File.exists?(OPTIONS[:config])
+
+module PureMotion::Server
+
+end
+
+%w(database app).each do |file|
+  require File.join(LOAD_PATH, file)
+end
+
+PureMotion::Server::App.run!

data/lib/settings.rb

@@ -0,0 +1,19 @@
+module PureMotion
+
+  class Settings
+
+    @@settings = {
+      :threaded => true
+    }
+
+    def self.[]=(name, value)
+      @@settings[name] = value
+    end
+
+    def self.[](name)
+      @@settings[name]
+    end
+
+  end
+
+end

data/lib/tools/ffmpeg.rb

@@ -1,101 +1,13 @@
 module PureMotion::Tools
   
-  class FFmpeg
+  class FFmpeg < PureMotion::Process
     
-    class Status
-      
-      NOT_STARTED       = 1
-      INITIALIZING      = 2
-      ANALYZING         = 4
-      PREPARING_OUTPUT  = 8
-      ENCODING          = 16
-      ERROR             = 32
-      
-    end
-
-    attr_reader :pid
-    attr_reader :args
-    attr_accessor :output
-    
-    event :line
-    event :complete
-    event :exited
-    event :status_change
-
-    @pid = nil
-    
-    def initialize(params = {})
-      if params.class != Hash then raise ArgumentError, "Invalid parameters" end
-      
-      @defaults = {
-        :ffmpeg => 'ffmpeg',
-        :options => nil
-      }
-      
-      @params = params
-      
-      @options = @params[:options]
-      
-      if @options.nil? then
-        raise ArgumentError, "No options given"
-      end
-      
-      @output = []
-    end
-    
-    def run
-
-      temp = ''
-      
-      @thread = PureMotion::Thread.new do
-        @pio = IO.popen("ffmpeg #{@options} 2>&1")
-        @pid = @pio.pid
-        @pio.each_byte do |l|
-          if l == 10 or l == 13 then
-            @output.push temp
-            line(temp)
-            temp = ''
-            l = ''
-          else
-            l = l.chr
-          end
-          temp = temp + l
-          #@output << l.gsub("\r","\n")
-        end
-        if @pio.eof? then
-          @done = true
-          complete(true)
-          @pid = nil
-          @pio.close
-          exited(true)
-        end
-      end
-    
-    end
-    
-    def ran?
-      @pio.eof? unless @pio.nil?
-      false
-    end
-    
-    def ended?
-      return false unless ran?
-      @pio.eof?
+    def initialize(arguments)
+      super("ffmpeg #{arguments}")
     end
     
     def version
-      return nil unless ran?
-      find(/^FFmpeg version (\S+)/)
-    end
-    
-    def find(regexp)
-      m = regexp.match(@output)
-      return m[1] if m
-      nil
-    end
-    
-    def status
-      @status
+      find_in_ouput(/^FFmpeg version (\S+)/)
     end
     
   end

data/lib/transcode/transcode.rb

@@ -2,38 +2,46 @@ def Transcode(*args, &block)
 
   raise ArgumentError, "No block given for transcode preset" unless block_given?
 
-  preset = PureMotion::Preset.new(:dsl)
+  preset_options = {
+    :from => :dsl
+  }
+
+  preset_options[:input] = args[0] || nil
+
+  preset = PureMotion::Preset.new(preset_options)
   preset.instance_eval(&block)
 
-  options = {
-    :input => preset.input,
-    :output => preset.output,
+  transcode_options = {
     :preset => preset
   }
 
-  options[:log] = preset.log unless preset.log.nil?
+  transcode_options[:log] = preset.log unless preset.log.nil?
 
-  transcode = PureMotion::Transcode::Transcode.new(options)
+  transcode = PureMotion::Transcode::Transcode.new(transcode_options)
 
-  transcode.run
-
-  return transcode
+  if transcode.valid? then
+    transcode.run
+    return transcode
+  else
+    return false
+  end
 
 end
 
 module PureMotion::Transcode
   
-  class Transcode < Object
+  class Transcode
 
     event :progress
     event :complete
     event :output
-    
-    @ffmpeg = nil
-    @input = nil
-    
+    event :failure
+
     def initialize(options)
-      
+
+      @valid = true # Until it all goes wrong
+
+      # Default everything to nil
       default_options = {
         :output => nil,
         :preset => nil,
@@ -43,46 +51,45 @@ module PureMotion::Transcode
       raise ArgumentError, "Invalid transcode parameters given" unless options.is_a?(Hash)
       
       options = default_options.merge(options)
-      
-      raise ArgumentError, "No output file given" if options[:output].nil?
 
-      if options[:input].is_a?(String) then
-        @input = PureMotion::Media.new(options[:input])
-      else
-        @input = options[:input]
-      end
       @preset = options[:preset]
-      @output = options[:output]
-
-      validate
 
       wire_events
 
+      @input = (@preset.input || options[:input])
+      validate_input
+      
+      @output = File.expand_path(@preset.output || options[:output])
+      validate_output
+
+      @ffmpeg = PureMotion::Tools::FFmpeg.new(@preset.arguments)
+
       if options[:log] then
         @log = File.new(options[:log], 'w')
-        self.output + lambda do |t, line|
+        on(:output) do |line|
           @log.puts line
         end
-        self.complete + lambda do |t, complete|
+        @ffmpeg.on(:exit) do
           @log.close
         end
       end
-      
-      # Raise error if output file exists and overwrite not set
-      
-      @ffmpeg = PureMotion::Tools::FFmpeg.new(:options => @preset.arguments)
-	
-      @ffmpeg.line + lambda do |ffmpeg, line|
+
+      @ffmpeg.on(:output) do |line|
         handle_output line
       end
 
-      @ffmpeg.exited + lambda do |ffmpeg, exited|
-        complete(true)
+      @ffmpeg.on(:exit) do
+        handle_exit
       end
-      
+
+    end
+
+    def valid?
+      return @valid
     end
     
     def run
+      raise ArgumentError, "Transcode is invalid" unless valid?
       @ffmpeg.run
     end
     
@@ -95,9 +102,27 @@ module PureMotion::Transcode
     end
     
     private
-    
+
+    def invalidate!
+      @valid = false
+    end
+
+    def handle_exit
+      if !File.exists?(@output) then
+        fire(:failure, :output_missing)
+        return
+      end
+      begin
+        output_media = Media(@output)
+        fire(:complete, output_media) if output_media.valid?
+      rescue PureMotion::UnsupportedFormat
+        fire(:failure, :transcode_unreadable)
+        return
+      end
+    end
+
     def handle_output line
-      output line
+      fire(:output, line)
       # /^frame=\s*(?<frame>\d*)\s*fps=\s*(?<fps>\d*)\s*q=(?<q>\S*)\s*size=\s*(?<size>[\d]*)(?<size_unit>[kmg]B)\s*time=\s*(?<time>[\d.]*)\s*bitrate=\s*(?<bitrate>[\d.]*)(?<bitrate_unit>[km]b).*$/
       progress_line = /frame=\s*(\d*)\s*fps=\s*(\d*)\s*q=(\S*)\s*[L]?size=\s*([\d]*)([kmg]B)\s*time=\s*([\d.]*)\s*bitrate=\s*([\d.]*)([km]b)/
       # The regex is documentated above and the matches it should give below
@@ -113,8 +138,7 @@ module PureMotion::Transcode
     end
     
     def handle_progress line
-      if line[4].to_i == 0 then return false end
-      p = {
+      progress = {
         :frame    => line[1].to_i,
         :fps      => line[2].to_i,
         :q        => line[3].to_f,
@@ -123,17 +147,42 @@ module PureMotion::Transcode
         :bitrate  => line[7].to_f,
         :percent  => ((100.00 / @input.duration) * line[6].to_f).to_i
       }
-      p[:percent] = 100 if p[:percent] > 100 unless p[:percent].nil?
-      progress(p)
+      progress[:percent] = 100 if progress[:percent] > 100 unless progress[:percent].nil?
+      fire(:progress, self, progress)
     end
     
-    def validate
-      
+    def validate_input
+      if @input.is_a?(String) then
+        begin
+          @input = Media @input
+        rescue PureMotion::UnsupportedFormat
+          make_fail(:invalid_input, "Invalid input '#{@input}'")
+        end
+      end
+      if @input.is_a?(PureMotion::Media) then
+        make_fail(:invalid_input, "Invalid input '#{@input}'") unless @input.valid?
+      end
+    end
+
+    def validate_output
+      make_fail(:invalid_output, "No output file given") if @output.nil?
+      # TODO : Check if output file exists and overwite not set
+      make_fail(:invalid_output, "Output file '#{@output}' not writable") unless File.writable?(File.dirname(@output))
+    end
+
+    def make_fail(reason=:unknown,message="Unknown reason")
+      #invalidate!
+      if @preset.event_handler(:failure).nil? then
+        raise ArgumentError, message
+      else
+        fire(:failure, reason, message)
+      end
     end
 
     def wire_events
-      self.complete += @preset.event_handlers[:complete] unless @preset.event_handlers[:complete].nil?
-      self.progress += @preset.event_handlers[:progress] unless @preset.event_handlers[:progress].nil?
+      @preset.event_handlers.each_pair do |event, handler|
+        on(event) + handler
+      end
     end
 
   end

data/spec/spec_helper.rb

@@ -4,4 +4,8 @@ require 'puremotion'
 
 def sample_path
   ::File.expand_path(::File.join(::File.dirname(__FILE__), "samples", "sample.ogv"))
+end
+
+def invalid_file
+  ::File.expand_path(::File.join(::File.dirname(__FILE__), "samples", "invalid.txt"))
 end

data/spec/units/media_spec.rb

@@ -1,13 +1,77 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 
-describe PureMotion::Media do
+describe "media" do
+
+  context "opening media" do
+
+    it "should read supported formats" do
+      lambda do
+        PureMotion::Media.new(sample_path)
+      end.should_not raise_error
+    end
+
+    it "should handle file not found" do
+      lambda {
+        Media('a_file_that_does_not_exist')
+      }.should raise_exception(ArgumentError)
+    end
+
+    it "should handle invalid files" do
+      lambda {
+        Media(invalid_file)
+      }.should raise_exception(PureMotion::UnsupportedFormat)
+    end
+
+  end
+
+  context "reading media" do
+
+    before(:all) do
+      @media = Media(sample_path)
+    end
+
+    it "can check for streams" do
+      @media.video?.should be_true and @media.audio?.should be_true
+    end
+
+    it "can read video resolution" do
+      @media.video.resolution.should == [320, 176]
+    end
+
+    it "can detect stream types" do
+      @media.video.type.should == :video and
+        @media.audio.type.should == :audio
+    end
+
+    it "can read the duration" do
+      @media.video.duration.should be_close(55, 3)
+    end
+
+    it "can seek reasonably accurately" do
+      @media.video.seek 5
+      @media.video.position.should be_close(5, 1)
+    end
+
+    after(:all) do
+      @media = nil
+    end
 
-  it "should read supported formats" do
-    lambda do
-      PureMotion::Media.new(sample_path)
-    end.should_not raise_error
   end
 
+  context "grabbing" do
 
+    before(:all) do
+      @media = Media(sample_path)
+    end
+
+    it "can grab a video frame" do
+      @media.video.grab.should be_an_instance_of(PureMotion::Frame)
+    end
+
+    after(:all) do
+      @media = nil
+    end
+
+  end
 
 end

data/spec/units/transcode_spec.rb

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+describe PureMotion::Transcode::Transcode do
+
+  it "should detect missing files" do
+    lambda {
+
+      Transcode '/gibberish/path' do
+
+      end
+
+    }.should raise_error ArgumentError
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ominiom
@@ -14,23 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-25 00:00:00 +00:00
+date: 2010-04-03 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
 description: A Ruby wrapper for FFmpeg
 email: iain@ominiom.com
-executables: []
-
+executables: 
+- default.yaml
+- pmts
 extensions: 
 - ext/puremotion/extconf.rb
 extra_rdoc_files: 
 - LICENSE
-- README.md
+- README.markdown
 files: 
 - .yardopts
 - LICENSE
-- README.md
+- README.markdown
 - Rakefile
 - ext/puremotion/audio.c
 - ext/puremotion/extconf.rb
@@ -54,8 +55,13 @@ files:
 - lib/preset/video/crop.rb
 - lib/preset/video/pad.rb
 - lib/preset/video/video.rb
+- lib/process.rb
 - lib/puremotion.rb
 - lib/puremotion_native.so
+- lib/server/app.rb
+- lib/server/database.rb
+- lib/server/server.rb
+- lib/settings.rb
 - lib/threading.rb
 - lib/tools/ffmpeg.rb
 - lib/transcode/transcode.rb
@@ -91,7 +97,10 @@ specification_version: 3
 summary: PureMotion
 test_files: 
 - spec/units/media_spec.rb
+- spec/units/transcode_spec.rb
 - spec/units/preset_spec.rb
 - spec/spec_helper.rb
 - examples/progress_reporting.rb
+- examples/failure_handling.rb
 - examples/simple.rb
+- examples/process.rb