storyboard 0.5.0.pre3 → 0.5.0.pre4

data/.gitignore

@@ -5,4 +5,5 @@
 *.log
 *.png
 *.xml*
+*.gif
 .DS_Store

data/INSTALL.md

@@ -1,6 +1,6 @@
 # Installing Storybard
 
-Storyboard relies on a number of external libraries to handle extracting information from the video files and generating the output. Primarily, it requires Ruby 1.9.3 or greater, FFMpeg 1.1 or greater, Imagemagick (which in turn requires ghostscript), and a compiler.
+Storyboard relies on a number of external tools to handle the video files and generate any output. Primarily, it requires Ruby 1.9.3 or greater, FFMpeg 1.1 or greater, Imagemagick (which in turn requires ghostscript), and a compiler.
 
 ## OS X: Simply
 
@@ -10,7 +10,7 @@ Opening a terminal and running the following command will install **everything**
 
 ## OS X: More In Depth
 
-To begin, you'll need to download GCC, a set of tools that will let you compile low level code. You can find a nice installer for it at [osx-gcc-installer](https://github.com/kennethreitz/osx-gcc-installer). Once GCC is installed, download and install [homebrew](http://mxcl.github.com/homebrew/), which is a tool that will automate of the installation process for Imagemagick and FFmpeg. If you haven't installed homebrew before, open a Terminal window and do the following:
+To begin, you'll need to download GCC, a set of tools that will let you compile the outside programs that Storyboard needs. You can find a nice installer for it at [osx-gcc-installer](https://github.com/kennethreitz/osx-gcc-installer). Once GCC is available, download and install [homebrew](http://mxcl.github.com/homebrew/), which is a tool that will automate of the installation process for Imagemagick and FFmpeg. If you haven't installed homebrew before, open a Terminal window and do the following:
 
     ruby -e "$(curl -fsSkL raw.github.com/mxcl/homebrew/go)"
     brew install ffmpeg imagemagick ghostscript
@@ -27,7 +27,23 @@ Finally, if you don't have Ruby 1.9.3 installed on your system, you can use <a h
     rvm install 1.9.3-p374
     rvm default 1.9.3-p374
 
-When all of those are installed, you can install Storyboard with the `gem` command, and create a link to it so that it runs with 1.9.3.
+When all of those are installed, you can install Storyboard with the `gem` command, and create a link to it so that it runs only with Ruby 1.9.3.
 
     gem install storyboard
     rvm wrapper 1.9.3-p374 --no-prefix storyboard
+
+## Linux
+
+For Ubuntu/Debian, Storyboard needs the following packages, which will install Ruby 1.9.3 and Imagemagick.
+
+    sudo apt-get install make
+    sudo apt-get install ruby1.9.1-dev
+    sudo apt-get install yasm imagemagick
+    sudo gem install bundler
+
+The version of FFmpeg that Storyboard requires isn't in any package repos yet, and so you need to download and compile your own version
+
+    wget http://ffmpeg.org/releases/ffmpeg-1.1.1.tar.gz
+    tar xvf ffmpeg-1.1.1.tar.gz
+    cd ffmpeg-1.1.1
+    ./configure && make && make install

data/lib/storyboard/generators/sub.rb

@@ -14,7 +14,7 @@ class Storyboard
     def add_subtitle(image, subtitle, dimensions)
       offset = 0
       subtitle.lines.reverse.each_with_index {|caption,i|
-        escaped = caption.gsub('\'') {|s| "\\#{s}" }
+        escaped = caption.gsub("'", "\\\\'")
         font_size = 30
         text_width = dimensions[0] + 1
         while(text_width > (dimensions[0] * 0.9))

data/lib/storyboard/subtitles.rb

@@ -1,4 +1,5 @@
 require 'pp'
+require 'iconv'
 
 class Storyboard
   def get_subtitles
@@ -34,7 +35,7 @@ class Storyboard
     chosen = nil
 
     if @cache.subtitles.nil?
-      LOG.info("No subtitles cache found")
+      LOG.debug("No subtitles cache found")
       @cache.subtitles = downloader.possible_urls
       @cache.save
     end
@@ -96,7 +97,7 @@ class Storyboard
       @needs_KFhimaji = false
       check_bom(@text.lines.first)
       Storyboard.current_encoding = @encoding
-      @text = @text.force_encoding(Storyboard.current_encoding)
+      @text = text.force_encoding(Storyboard.current_encoding)
       parse
       clean_promos
       LOG.info("Parsed subtitle file. #{count} entries found.")
@@ -117,13 +118,21 @@ class Storyboard
     end
 
 
+    def fix_encoding(l)
+      # The only  ISO8859-1  I hit so far. I expec this to grow.
+      if !(l.bytes.to_a | [233,146]).empty? && @encoding == 'UTF-8'
+        l = l.unpack("C*").pack("U*")
+      end
+      l
+    end
+
     #There are some horrid files, so I want to be able to have more than just a single regex
     #to parse the srt file. Eventually, handling these errors will be a thing to do.
     def parse
       phase = :line_no
       page = nil
-
       @text.each_line {|l|
+        l = fix_encoding(l)
         l = l.strip
         #p l.bytes.to_a
         case phase
@@ -151,7 +160,7 @@ class Storyboard
             @pages << page
           else
             Storyboard.needs_KFhimaji(true) if l.contains_cjk?
-            page[:lines] << l.gsub(Storyboard.encode_regexp("<\/?[^>]*>"), "")
+            page[:lines] << l.gsub(Storyboard.encode_regexp("<\/?[^>]*>"), "").encode!("UTF-8")
           end
         end
       }
@@ -160,10 +169,10 @@ class Storyboard
     # Strip out obnoxious "CREATED BY L33T DUD3" or "DOWNLOADED FROM ____" text
     def clean_promos
       @pages.delete_if {|page|
-        !page[:lines].grep(Storyboard.encode_regexp('Subtitles downloaded')).empty? ||
-        !page[:lines].grep(Storyboard.encode_regexp('addic7ed')).empty? ||
-        !page[:lines].grep(Storyboard.encode_regexp('OpenSubtitles')).empty? ||
-        !page[:lines].grep(Storyboard.encode_regexp('sync, corrected by')).empty? ||
+        !page[:lines].grep(/Subtitles downloaded/).empty? ||
+        !page[:lines].grep(/addic7ed/).empty? ||
+        !page[:lines].grep(/OpenSubtitles/).empty? ||
+        !page[:lines].grep(/sync, corrected by/).empty? ||
         false
       }
     end

data/lib/storyboard/time.rb

@@ -3,8 +3,9 @@ class STRTime
   attr_reader :value
 
   class <<self
-    def parse(str)
-      hh,mm,ss,ms = str.scan(Storyboard.encode_regexp(REGEX)).flatten.map{|i|
+    def parse(str, skip_encode=false)
+      matcher = skip_encode ? Regexp.new(REGEX) : Storyboard.encode_regexp(REGEX)
+      hh,mm,ss,ms = str.scan(matcher).flatten.map{|i|
         Float(i.force_encoding("ASCII-8bit").delete("\000"))
       }
       value = ((((hh*60)+mm)*60)+ss) + ms/1000

data/lib/storyboard/version.rb

@@ -1,3 +1,3 @@
 class Storyboard
-  VERSION = "0.5.0.pre3"
+  VERSION = "0.5.0.pre4"
 end

data/lib/storyboard.rb

@@ -98,7 +98,7 @@ class Storyboard
         begin
           # trolololol
           o = stdout.gets.split('|').inject({}){|hold,value| s = value.split('='); hold[s[0]]=s[1]; hold }
-          t = STRTime.parse(o['pkt_pts_time'])
+          t = STRTime.parse(o['pkt_pts_time'], true)
           pbar.progress = t.value
           @capture_points << t
         end while !stdout.eof?
@@ -158,12 +158,8 @@ class Storyboard
     @capture_points.each_with_index {|f,i|
       next if i >= @stop_frame
       image_name = File.join(@options[:save_directory], "%04d.jpg" % [i])
-      capture_point_subtitles = @subtitles.pages.select { |page| f.value >=  page.start_time.value and f.value <= page.end_time.value }.first
-      begin
-        @renderers.each{|r| r.render_frame(image_name, capture_point_subtitles) }
-      rescue
-        p $!
-      end
+      capture_point_subtitles = @subtitles.pages.select { |page| f.value >=  page.start_time.value and f.value <= page.end_time.value }.last
+      @renderers.each{|r| r.render_frame(image_name, capture_point_subtitles) }
       pbar.increment
     }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storyboard
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre3
+  version: 0.5.0.pre4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,7 +168,6 @@ files:
 - .rvmrc
 - CHANGELOG
 - Gemfile
-- Gemfile.lock
 - INSTALL.md
 - LICENSE
 - README.md
@@ -235,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Video to PDF/ePub generator

data/Gemfile.lock

@@ -1,59 +0,0 @@
-PATH
-  remote: .
-  specs:
-    storyboard (0.5.0.pre2)
-      bundler
-      levenshtein-ffi
-      mime-types (>= 1.19)
-      mini_magick
-      path (>= 1.3.0)
-      prawn
-      ruby-progressbar
-      rubyzip
-      term-ansicolor
-
-PATH
-  remote: vendor/suby
-  specs:
-    suby (0.4.0)
-      mime-types (>= 1.19)
-      path (>= 1.3.0)
-      rubyzip
-      term-ansicolor
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    Ascii85 (1.0.2)
-    afm (0.2.0)
-    ffi (1.1.5)
-    hashery (2.1.0)
-    levenshtein-ffi (1.0.3)
-      ffi
-      ffi (~> 1.1.5)
-    mime-types (1.19)
-    mini_magick (3.4)
-      subexec (~> 0.2.1)
-    path (1.3.1)
-    pdf-reader (1.3.0)
-      Ascii85 (~> 1.0.0)
-      afm (~> 0.2.0)
-      hashery (~> 2.0)
-      ruby-rc4
-      ttfunk
-    prawn (0.12.0)
-      pdf-reader (>= 0.9.0)
-      ttfunk (~> 1.0.2)
-    ruby-progressbar (1.0.2)
-    ruby-rc4 (0.1.5)
-    rubyzip (0.9.9)
-    subexec (0.2.2)
-    term-ansicolor (1.0.7)
-    ttfunk (1.0.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  storyboard!
-  suby!