storyboard 0.4.1 → 0.5.0.pre3

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    storyboard (0.4.0)
+    storyboard (0.5.0.pre2)
+      bundler
       levenshtein-ffi
       mime-types (>= 1.19)
       mini_magick
-      nokogiri
       path (>= 1.3.0)
       prawn
       ruby-progressbar
@@ -17,7 +17,6 @@ PATH
   specs:
     suby (0.4.0)
       mime-types (>= 1.19)
-      nokogiri
       path (>= 1.3.0)
       rubyzip
       term-ansicolor
@@ -35,7 +34,6 @@ GEM
     mime-types (1.19)
     mini_magick (3.4)
       subexec (~> 0.2.1)
-    nokogiri (1.5.6)
     path (1.3.1)
     pdf-reader (1.3.0)
       Ascii85 (~> 1.0.0)

data/LICENSE

@@ -0,0 +1,7 @@
+Copyright (c) 2013 Mark Olson <theothermarkolson@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,11 +1,10 @@
 # Storyboard
 
-Read the TV and Movies you don't have time to watch. Given a video file, it will generate a PDF (or soon, ePub and Mobi) containing every scene change and line of dialog.
-
-## Storyboard
-
 ![Seinfeld](http://i.imgur.com/lTRuC.jpg)
 
+Read the TV and Movies you don't have time to watch. Given a video file, it will generate a PDF (or soon, ePub and Mobi) containing every scene change and line of dialog.
+[I wrote a blog post](http://syntaxi.net/2013/01/20/storyboard) with a few more details about how Storyboard works.
+
 Storyboard is _very much_ a work in progress, though it works most of the time. Using it is simple:
 
     $ storyboard /path/to/video-file.mkv
@@ -24,7 +23,7 @@ To quickly test if the subtitles that are used look ok, you can use the `--previ
 
 If the subtitles are off, you can nudge them back or forward with the `-n TIME` option. This can be positive or negative, and if you make it too large it can cause Storyboard to throw an error. This would nudge the subtitles back 2 seconds, and generate just the preview PDF.
 
-   storyboard -n -2 --preview /path/to/video-file.mkv
+    storyboard -n -2 --preview /path/to/video-file.mkv
 
 You can see all the available options by using the help option:
 

data/bin/gifboard

@@ -0,0 +1,100 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'shellwords'
+require 'optparse'
+require 'logger'
+require 'open3'
+require 'bundler'
+ENV['BUNDLE_GEMFILE'] = File.join(File.dirname(__FILE__), '../Gemfile')
+Bundler.require(:default)
+
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+require 'gifboard'
+
+unless Storyboard.ffprobe_installed?
+  puts "Storyboard requires FFmpeg 1.1. Please check the README for instructions"
+  exit
+end
+
+unless Storyboard.magick_installed?
+  puts "Storyboard requires Imagemagick's mogrify tool. Please check the README for instructions on how to install Imagemagick if you need them."
+  exit
+end
+
+options = {:nudge => 0, :verbose => true, :max_width => 500}
+
+puts "Running Gifboard #{Storyboard::VERSION}"
+
+LOG = Logger.new(STDOUT)
+LOG.level = Logger::INFO
+
+opts = OptionParser.new
+opts.banner = "Usage: gifboard [options] videofile [output_directory]"
+
+opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+  options[:version] = v
+  LOG.level = Logger::DEBUG if v
+end
+
+opts.on('-t "[text]"', "Subtitle text to build the GIF around") do |t|
+  options[:text] = t
+end
+opts.on("-n", "--nudge TIME", Float, "Nudge the subtitles forward or backward. TIME is the number of seconds.", "Use this with the --preview option to quickly check and adjust the subtitle timings.") do |time|
+  options[:nudge] = time
+end
+
+
+opts.on("-s", "--subs FILE", "SRT subtitle file to use. Will skip extracting/downloading one.") do |s|
+  options[:subs] = s
+end
+
+
+opts.on_tail("-h", "--help", "Show this message") do
+  puts opts
+  exit
+end
+
+begin opts.parse! ARGV
+rescue OptionParser::InvalidOption, OptionParser::InvalidArgument => e
+  puts e
+  puts opts
+  exit 1
+end
+
+if ARGV.size < 1
+  puts "videofile required"
+  puts opts.to_s
+  exit 1
+elsif ARGV.size == 2 && !File.directory?(File.realdirpath(ARGV.last))
+  puts "outputdir #{ARGV.last} is not a directory"
+  puts opts.to_s
+  exit 1
+elsif ARGV.size > 2
+  puts "Too many arguments"
+  puts opts.to_s
+  exit 1
+end
+
+options[:vidpath] = File.realdirpath(ARGV.shift)
+options[:write_to] = ARGV.shift || Dir.pwd
+
+if !File.exists?(options[:vidpath])
+  puts("#{options[:vidpath]} doesn't exist.")
+  exit
+end
+
+filepaths = []
+
+if File.directory?(options[:vidpath])
+  raise "Gifboard can only use one file at a time. Don't pass a directory."
+  exit
+else
+  filepaths << options[:vidpath]
+end
+
+filepaths.each {|fp|
+  options[:file] = fp
+  runner = Gifboard.new(options)
+  runner.run if runner.video_file?
+}

data/lib/gifboard.rb

@@ -0,0 +1,106 @@
+require 'storyboard/subtitles.rb'
+require 'storyboard/bincheck.rb'
+require 'storyboard/thread-util.rb'
+require 'storyboard/time.rb'
+require 'storyboard/version.rb'
+require 'storyboard/cache.rb'
+
+require 'storyboard/generators/sub.rb'
+require 'storyboard/generators/gif.rb'
+
+require 'mime/types'
+require 'fileutils'
+require 'tmpdir'
+
+require 'ruby-progressbar'
+require 'mini_magick'
+
+require 'json'
+
+class Gifboard < Storyboard
+  attr_accessor :options, :capture_points, :subtitles, :timings
+  attr_accessor :length, :renderers, :mime, :cache
+
+  def initialize(o)
+    super
+  end
+
+  def run
+    LOG.info("Processing #{options[:file]}")
+    setup
+
+    @cache = Cache.new(Suby::MovieHasher.compute_hash(Path.new(options[:file])))
+
+    LOG.debug(options) if options[:verbose]
+
+    @subtitles = SRT.new(options[:subs] ? File.read(options[:subs]) : get_subtitles, options)
+    # bit of a temp hack so I don't have to wait all the time.
+    @subtitles.save if options[:verbose]
+
+    @cache.save
+
+    if @options[:text]
+      @renderers << Storyboard::GifRenderer.new(self)
+
+      selected = choose_text
+      @capture_points << selected.start_time
+      (0.1).step(selected.end_time.value - selected.start_time.value, 0.1) {|i|
+        @capture_points << selected.start_time + i
+      }
+      # @capture_points << selected.end_time not sure if it's better or worse to leave this yet
+
+      @stop_frame = @capture_points.count
+      extract_frames
+
+      render_output
+    else
+      @subtitles.pages.each {|x|
+        print "[#{x.start_time.to_srt}]\t"
+        x.lines.each_with_index{|l,i|
+          print "\t\t" if i > 0
+          puts l
+        }
+      }
+      puts "\n\nYou need to specify what text to look for with the -t option. Listing all subtitles instead."
+      puts "ex: gifboard -t 'a funny joke ha. ha' video.mkv"
+    end
+  end
+
+  def choose_text
+    matches = []
+    @subtitles.pages.each {|x|
+      found = !x.lines.select {|l|
+        l.downcase.match(options[:text].downcase)
+      }.empty?
+      matches << x if found
+    }
+
+    match = nil
+    if matches.count == 0
+      raise "No matches found"
+    elsif matches.count == 1
+      puts "Just one match found. Using it."
+      match = matches.first
+    else
+      puts "Multiple matches found.. pick one!"
+      matches.each_with_index {|m,i|
+        print "#{i+1}:\t"
+        m.lines.each_with_index{|l,j|
+          print "\t" if j > 0
+          puts l
+        }
+      }
+      while !match
+        print "choice (default 1): "
+        input = gets.chomp
+        number = input.empty? ? 1 : input.to_i
+        if number > matches.count || number < 1
+          puts "Try again. Choose a subtitle between 1 and #{matches.count}"
+        else
+          match = matches[number-1]
+        end
+      end
+    end
+    match
+  end
+end

data/lib/storyboard.rb

@@ -3,6 +3,8 @@ require 'storyboard/bincheck.rb'
 require 'storyboard/thread-util.rb'
 require 'storyboard/time.rb'
 require 'storyboard/version.rb'
+require 'storyboard/cache.rb'
+require 'storyboard/common.rb'
 
 require 'storyboard/generators/sub.rb'
 require 'storyboard/generators/pdf.rb'
@@ -14,26 +16,60 @@ require 'tmpdir'
 require 'ruby-progressbar'
 require 'mini_magick'
 
+require 'json'
+
 class Storyboard
   attr_accessor :options, :capture_points, :subtitles, :timings
-  attr_accessor :length, :renderers, :mime
+  attr_accessor :length, :renderers, :mime, :cache, :encoding
+  attr_accessor :needs_KFhimaji
 
   def initialize(o)
+    @needs_KFhimaji = false
     @capture_points = []
     @renderers = []
     @options = o
-
+    @encoding = "UTF-8"
     check_video
   end
 
+  def self.needs_KFhimaji(set = false)
+    @needs_KFhimaji ||= set
+  end
+
+  def self.path
+    File.dirname(__FILE__) + '/../'
+  end
+
+  def self.current_encoding
+    @encoding || 'UTF-8'
+  end
+
+  def self.current_encoding=(n)
+    @encoding = n
+  end
+
+  def self.encode_regexp(r)
+    Regexp.new(r.encode(Storyboard.current_encoding), 16)
+  end
+
+  def self.encode_string(r)
+    r.encode(Storyboard.current_encoding)
+  end
+
   def run
     LOG.info("Processing #{options[:file]}")
     setup
 
+    @cache = Cache.new(Suby::MovieHasher.compute_hash(Path.new(options[:file])))
+
+    LOG.debug(options) if options[:verbose]
+
     @subtitles = SRT.new(options[:subs] ? File.read(options[:subs]) : get_subtitles, options)
     # bit of a temp hack so I don't have to wait all the time.
     @subtitles.save if options[:verbose]
 
+    @cache.save
+
     @renderers << Storyboard::PDFRenderer.new(self) if options[:types].include?('pdf')
 
     run_scene_detection if options[:scenes]
@@ -51,7 +87,7 @@ class Storyboard
     extract_frames
 
     render_output
-
+    exit
     cleanup
   end
 

data/lib/storyboard/cache.rb

@@ -0,0 +1,56 @@
+require 'digest/sha1'
+
+class Storyboard
+	class Cache
+		attr_accessor :file, :hash
+		def initialize(file_hash)
+			@hash = file_hash
+			@file = File.join(Dir.tmpdir, "#{file_hash}.storyboard")
+			if File.exists?(@file)
+				@data = JSON.parse(File.read(@file))
+			end
+			@data = {'downloads' => {}} if @data.nil? || old?
+			@data['lastran'] = Time.now.to_s
+		end
+
+		def old?
+			DateTime.parse(@data['lastran']) < (DateTime.now - ((60 * 15)/86400.0))
+		end
+
+		def save
+			File.open(@file, 'w') { |f| f.write(@data.to_json)}
+		end
+
+
+		def download_file(url, &block)
+			if @data['downloads'][url]
+				LOG.info("Cached file #{@data['downloads'][url]}")
+				return File.read(@data['downloads'][url])
+			else
+				LOG.info("Loading file from #{url}")
+				results = yield
+				subpath = File.join(Dir.tmpdir, "#{@hash}-#{Digest::SHA1.hexdigest(url)}.storyboard")
+				File.open(subpath, 'w') { |f| f.write(results) }
+				@data['downloads'][url] = subpath
+				self.save
+				return results
+			end
+		end
+
+		def subtitles
+			@data['subtitles']
+		end
+
+		def subtitles=(val)
+			@data['subtitles'] = val
+		end
+
+		def last_used_subtitle
+			@data['last_used_subtitle']
+		end
+
+		def last_used_subtitle=(val)
+			@data['last_used_subtitle'] = val
+		end
+	end
+end

data/lib/storyboard/common.rb

@@ -0,0 +1,6 @@
+#encoding: utf-8
+class String
+  def contains_cjk?
+    !!(self =~ Storyboard.encode_regexp('\p{Han}|\p{Katakana}|\p{Hiragana}|\p{Hangul}'))
+  end
+end

data/lib/storyboard/generators/gif.rb

@@ -0,0 +1,41 @@
+require 'prawn'
+require 'mini_magick'
+
+class Storyboard
+  class GifRenderer < Storyboard::Renderer
+
+    attr_accessor :pdf, :storyboard, :dimensions
+    def initialize(parent)
+      @dimensions = []
+      @storyboard = parent
+    end
+
+    def set_dimensions(w,h)
+      @dimensions = [w,h]
+    end
+
+    def write
+      `cd #{@storyboard.options[:save_directory]} && convert -coalesce -delay 10 -layers OptimizeTransparency -loop 0 -ordered-dither o8x8,8,8,4 +map sub-* "#{@storyboard.options[:write_to]}/#{@storyboard.options[:basename]}.gif"`
+      LOG.info("Wrote #{@storyboard.options[:write_to]}/#{@storyboard.options[:basename]}.gif")
+    end
+
+    def render_frame(frame_name, subtitle = nil)
+      output_filename = File.join(@storyboard.options[:save_directory], "sub-#{File.basename(frame_name)}")
+      image = MiniMagick::Image.open(frame_name)
+
+      if(@dimensions.empty?)
+        resize_height = (image[:height] * (@storyboard.options[:max_width].to_f/image[:width])).ceil
+        set_dimensions(storyboard.options[:max_width], resize_height)
+      end
+
+      image.resize "#{@dimensions[0]}x#{@dimensions[1]}"
+      image.quality("60")
+
+      self.add_subtitle(image, subtitle, @dimensions) if subtitle
+      image.format 'jpeg'
+      image.write(output_filename)
+      image.destroy!
+    end
+
+  end
+end

data/lib/storyboard/generators/pdf.rb

@@ -30,9 +30,9 @@ class Storyboard
       end
 
       image.resize "#{@dimensions[0]}x#{@dimensions[1]}"
+      image.quality("60")
 
       self.add_subtitle(image, subtitle, @dimensions) if subtitle
-
       image.format 'jpeg'
       image.write(output_filename)
       image.destroy!

data/lib/storyboard/generators/sub.rb

@@ -2,40 +2,54 @@ require 'prawn'
 class Storyboard
   class Renderer
     @@size_canvas = Prawn::Document.new
+
+    def write_mvg(offset, line, nudge=0)
+      out = File.open(File.join(@storyboard.options[:save_directory], 'tmp.mvg'), 'wt', encoding: 'UTF-8')
+      out.print("text #{(0+nudge).to_s}, #{(offset+nudge).to_s} '")
+      out.print line
+      out.print "'"
+      out.close
+    end
+
     def add_subtitle(image, subtitle, dimensions)
-        offset = 0
-        subtitle.lines.reverse.each_with_index {|caption,i|
-          escaped = caption.gsub(/\\|'|"/) { |c| "\\#{c}" }
-          font_size = 30
-          text_width = dimensions[0] + 1
-          while(text_width > (dimensions[0] * 0.9))
-            font_size -= 1
-            text_width = @@size_canvas.width_of(caption, :size => font_size)
-          end
+      offset = 0
+      subtitle.lines.reverse.each_with_index {|caption,i|
+        escaped = caption.gsub('\'') {|s| "\\#{s}" }
+        font_size = 30
+        text_width = dimensions[0] + 1
+        while(text_width > (dimensions[0] * 0.9))
+          font_size -= 1
+          text_width = @@size_canvas.width_of(caption.encode!("utf-8"), :size => font_size)
+        end
+
+        font = Storyboard.needs_KFhimaji ? "#{Storyboard.path}/fonts/KFhimaji.otf" : "#{Storyboard.path}/fonts/DejaVuSans.ttf"
+
+        write_mvg(offset,escaped, 0)
+        image.combine_options do |c|
+          c.font font
+          c.fill "#333333"
+          c.strokewidth '1'
+          c.stroke '#000000'
+          c.pointsize font_size.to_s
+          c.gravity "south"
+          c.draw "@#{File.join(@storyboard.options[:save_directory],'tmp.mvg')}"
+        end
 
-          image.combine_options do |c|
-            c.font "helvetica"
-            c.fill "#333333"
-            c.strokewidth '1'
-            c.stroke '#000000'
-            c.pointsize font_size.to_s
-            c.gravity "south"
-            c.draw "text 0, #{offset} '#{escaped}'"
-          end
 
-          #and the shadow
-          image.combine_options do |c|
-            c.font "helvetica"
-            c.fill "#ffffff"
-            c.strokewidth '1'
-            c.stroke 'transparent'
-            c.pointsize font_size.to_s
-            c.gravity "south"
-            c.draw "text -2, #{offset-2} '#{escaped}'"
-          end
+        write_mvg(offset,escaped, -2)
+        #and the shadow
+        image.combine_options do |c|
+          c.font font
+          c.fill "#ffffff"
+          c.strokewidth '1'
+          c.stroke 'transparent'
+          c.pointsize font_size.to_s
+          c.gravity "south"
+          c.draw "@#{File.join(@storyboard.options[:save_directory],'tmp.mvg')}"
+        end
 
-          offset += (@@size_canvas.height_of(caption, :size => font_size)).ceil
-        }
+        offset += (@@size_canvas.height_of(caption.encode!("utf-8"), :size => font_size)).ceil
+      }
     end
   end
 end

data/lib/storyboard/subtitles.rb

@@ -1,3 +1,5 @@
+require 'pp'
+
 class Storyboard
   def get_subtitles
     extensionless = File.join(File.dirname(options[:file]), File.basename(options[:file], ".*") + '.srt')
@@ -24,78 +26,132 @@ class Storyboard
      return File.read(extensionless)
     end
 
-    if false == "the file has subtitles embedded"
-
-    else
-      LOG.debug("No subtitles embeded. Using suby.")
-      # suby includes a giant util library the guy also wrote
-      # that it uses to call file.basename instead of File.basename(file),
-      #but "file" has to be a "Path", so, whatever.
-      suby_file = Path(options[:file])
-      #downloader = Suby::Downloader::OpenSubtitles.new(suby_file, 'en')
-      # try Addic7ed first, as, on average, it seems a bit better.
-      downloader = nil
-
+    # suby includes a giant util library the guy also wrote
+    # that it uses to call file.basename instead of File.basename(file),
+    #but "file" has to be a "Path", so, whatever.
+    suby_file = Path(options[:file])
+    downloader = Suby::Downloader::OpenSubtitles.new(suby_file, 'en')
+    chosen = nil
+
+    if @cache.subtitles.nil?
+      LOG.info("No subtitles cache found")
+      @cache.subtitles = downloader.possible_urls
+      @cache.save
+    end
+    chosen = pick_best_subtitle(@cache.subtitles)
+    contents = @cache.download_file(chosen) do
+      downloader.extract(chosen)
+    end
+    contents
+  end
 
-      if downloader.nil?
-        LOG.info("Searching for subtitles on OpenSubtitles")
-        downloader = Suby::Downloader::OpenSubtitles.new(suby_file, 'en')
+  private
+
+  def pick_best_subtitle(given)
+    given = sort_matches(given)
+    if given.length == 0
+      raise "No subtitles found."
+    elsif given.length == 1
+      return given[0]['SubDownloadLink']
+    elsif given.length > 1
+      sub = nil
+      puts "There are multiple subtitles that could work with this file. Please choose one!"
+      puts "All of these are subtitles made for this exact video file, so any should work." if given[0]['MatchedBy'] == 'moviehash'
+      while not sub
+        given.each_with_index {|s, i|
+          puts "#{i+1}: '#{s['SubFileName']}', added #{s['SubAddDate']}"
+        }
+        print "choice (default 1): "
+        input = gets.chomp
+        number = input.empty? ? 1 : input.to_i
+        if number > given.count || number < 1
+          puts "Try again. Choose a subtitle between 1 and #{given.count}"
+        else
+          sub = given[number-1]['SubDownloadLink']
+        end
       end
-
-      LOG.debug("Found #{downloader.download_url}")
-      #LOG.debug(downloader.found)
-      downloader.extract(downloader.download_url)
+      return sub
     end
   end
 
+  def sort_matches(x)
+    # filter to only {"MatchedBy"=>"moviehash"}, if possible
+    # select only matching filesizes, if nonzero and matching
+   x
+  end
+
+  public
+
 
   class SRT
     Page = Struct.new(:index, :start_time, :end_time, :lines)
 
-    TIME_REGEX = /\d{2}:\d{2}:\d{2}[,\.]\d{1,4}/
-    attr_accessor :text, :pages, :options
+    SPAN_REGEX = '[[:digit:]]+:[[:digit:]]+:[[:digit:]]+[,\.][[:digit:]]+'
+    attr_accessor :text, :pages, :options, :encoding
 
     def initialize(contents, parent_options)
       @options = parent_options
       @text = contents
       @pages = []
+      @needs_KFhimaji = false
+      check_bom(@text.lines.first)
+      Storyboard.current_encoding = @encoding
+      @text = @text.force_encoding(Storyboard.current_encoding)
       parse
       clean_promos
       LOG.info("Parsed subtitle file. #{count} entries found.")
     end
 
+
+    def check_bom(line)
+      bom_check = line.force_encoding("UTF-8").lines.to_a[0].bytes.to_a
+      @encoding = 'UTF-8'
+      if bom_check[0..1] == [255,254]
+        @encoding = "UTF-16LE"
+        ret = line[2..6]
+      elsif bom_check[0..2] == [239,187,191]
+        @encoding = "UTF-8"
+        ret = line[3..6]
+      end
+      line
+    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 = l.strip
-        l = l.encode("UTF-32", :invalid=>:replace, :replace=>"?").encode("UTF-8")
-        # Some files have BOM markers. Why? Why would you add a BOM marker.
-        l.gsub!("\xEF\xBB\xBF", '') if page.nil?
+        #p l.bytes.to_a
         case phase
         when :line_no
-          if l =~ /^\d+$/
+          l = l.gsub(Storyboard.encode_regexp('\W'),'')
+          if l =~ Storyboard.encode_regexp('^\d+$')
             page = Page.new(@pages.count + 1, nil, nil, [])
             phase = :time
           elsif !l.empty?
-            raise "Bad SRT File: Should have a block number but got '#{l}' [#{l.bytes.to_a.join(',')}]"
+            raise "Bad SRT File: Should have a block number but got '#{l.force_encoding('UTF-8')}' [#{l.bytes.to_a.join(',')}]"
           end
         when :time
-          if l =~ /^(#{TIME_REGEX}) --> (#{TIME_REGEX})$/
+
+          l = l.gsub(Storyboard.encode_regexp('[^\,\:[0-9] \-\>]'), '')
+          if l =~ Storyboard.encode_regexp("^(#{SPAN_REGEX}) --> (#{SPAN_REGEX})$")
             page[:start_time] = STRTime.parse($1) + @options[:nudge]
             page[:end_time] = STRTime.parse($2) + @options[:nudge]
             phase = :text
           else
-            raise "Bad SRT File: Should have time range but got '#{l}'"
+            raise "Bad SRT File: Should have time range but got '#{l}'".force_encoding(Storyboard.current_encoding)
           end
         when :text
           if l.empty?
             phase = :line_no
             @pages << page
           else
-            page[:lines] <<  l.gsub(/<\/?[^>]+?>/, '')
+            Storyboard.needs_KFhimaji(true) if l.contains_cjk?
+            page[:lines] << l.gsub(Storyboard.encode_regexp("<\/?[^>]*>"), "")
           end
         end
       }
@@ -104,10 +160,10 @@ class Storyboard
     # Strip out obnoxious "CREATED BY L33T DUD3" or "DOWNLOADED FROM ____" text
     def clean_promos
       @pages.delete_if {|page|
-        !page[:lines].grep(/Subtitles downloaded/).empty? ||
-        !page[:lines].grep(/addic7ed/).empty? ||
-        !page[:lines].grep(/OpenSubtitles/).empty? ||
-        !page[:lines].grep(/sync, corrected by/).empty? ||
+        !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? ||
         false
       }
     end

data/lib/storyboard/time.rb

@@ -1,11 +1,12 @@
 class STRTime
-  REGEX = /(\d{1,2}):(\d{1,2}):(\d{2})[,\.](\d{1,3})/
-
+  REGEX = '([[:digit:]]+):([[:digit:]]+):([[:digit:]]+)[,\.]([[:digit:]]{3})'
   attr_reader :value
 
   class <<self
     def parse(str)
-      hh,mm,ss,ms = str.scan(REGEX).flatten.map{|i| Float(i)}
+      hh,mm,ss,ms = str.scan(Storyboard.encode_regexp(REGEX)).flatten.map{|i|
+        Float(i.force_encoding("ASCII-8bit").delete("\000"))
+      }
       value = ((((hh*60)+mm)*60)+ss) + ms/1000
       self.new(value)
     end

data/lib/storyboard/version.rb

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

data/storyboard.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib","vendor/suby"]
   gem.version       = Storyboard::VERSION
 
-  gem.add_dependency 'nokogiri'
+  gem.add_dependency 'bundler'
   gem.add_dependency 'mini_magick'
   gem.add_dependency 'prawn'
   gem.add_dependency 'ruby-progressbar'

data/vendor/suby/lib/suby/downloader.rb

@@ -1,6 +1,5 @@
 require 'net/http'
 require 'cgi/util'
-require 'nokogiri'
 require 'xmlrpc/client'
 require 'zlib'
 require 'stringio'
@@ -172,6 +171,4 @@ end
 # Defines downloader order
 %w[
     opensubtitles
-    tvsubtitles
-    addic7ed
   ].each { |downloader| require_relative "downloader/#{downloader}" }

data/vendor/suby/lib/suby/downloader/opensubtitles.rb

@@ -30,17 +30,18 @@ module Suby
     }
     LANG_MAPPING.default = 'all'
 
-    def download_url
+    def possible_urls
       s = SEARCH_QUERIES_ORDER.find(lambda { raise NotFoundError, "no subtitles available" }) { |type|
         if subs = search_subtitles(search_query(type))['data']
           @type = type
           break subs
         end
       }
-      x = @video_data[:season] ? s.select { |t| t['SeriesSeason'].to_i == @video_data[:season].to_i } : s
-      x.sort_by! { |t| Levenshtein.distance(t['MovieName'], "\"#{@video_data[:show]}\" #{@video_data[:title]}").to_i }
-      @found = x.first
-      x.first['SubDownloadLink']
+      return s
+    end
+
+    def download_url(no_this_one=nil)
+      (no_this_one || possible_urls[0])['SubDownloadLink']
     end
 
     def search_subtitles(query)

data/vendor/suby/suby.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.2'
   s.add_dependency 'path', '>= 1.3.0'
-  s.add_dependency 'nokogiri'
+  #s.add_dependency 'nokogiri'
   s.add_dependency 'rubyzip'
   s.add_dependency 'term-ansicolor'
   s.add_dependency 'mime-types', '>= 1.19'

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: storyboard
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: 0.5.0.pre3
+  prerelease: 6
 platform: ruby
 authors:
 - Mark Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -159,6 +159,7 @@ description: Generate PDFs and eBooks from video files
 email:
 - ! '"theothermarkolson@gmail.com"'
 executables:
+- gifboard
 - storyboard
 extensions: []
 extra_rdoc_files: []
@@ -169,11 +170,19 @@ files:
 - Gemfile
 - Gemfile.lock
 - INSTALL.md
+- LICENSE
 - README.md
+- bin/gifboard
 - bin/storyboard
+- fonts/DejaVuSans.ttf
+- fonts/KFhimaji.otf
 - lib/.DS_Store
+- lib/gifboard.rb
 - lib/storyboard.rb
 - lib/storyboard/bincheck.rb
+- lib/storyboard/cache.rb
+- lib/storyboard/common.rb
+- lib/storyboard/generators/gif.rb
 - lib/storyboard/generators/pdf.rb
 - lib/storyboard/generators/sub.rb
 - lib/storyboard/subtitles.rb
@@ -221,9 +230,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23