storyboard 0.2.4 → 0.3.0

data/.gitignore

@@ -1,3 +1,8 @@
 *.avi
 *.mkv
+*.pdf
+*.gem
+*.log
+*.png
+*.xml*
 .DS_Store

data/.rvmrc

@@ -1 +1 @@
-rvm --create use 1.9.3@storyboard
+rvm --create use 1.9.3-p327@storyboard

data/Gemfile

@@ -2,11 +2,4 @@ source :rubygems
 
 gemspec
 
-gem 'tvdb_party', :git => 'https://github.com/nddrylliog/tvdb_party'
-gem 'nokogiri'
 gem 'suby', :path => 'vendor/suby', :require => 'suby'
-gem 'rmagick'
-gem 'prawn'
-gem 'ruby-progressbar'
-gem 'rubyzip'
-gem 'levenshtein-ffi', :require => 'levenshtein'

data/Gemfile.lock

@@ -1,20 +1,13 @@
-GIT
-  remote: https://github.com/nddrylliog/tvdb_party
-  revision: 60ce3c28e664078da0206075e025ee06547f5826
-  specs:
-    tvdb_party (0.6.2)
-      httparty (>= 0.6.1)
-
 PATH
   remote: .
   specs:
-    storyboard (0.2.3)
+    storyboard (0.3.0)
       levenshtein-ffi
       mime-types (>= 1.19)
+      mini_magick
       nokogiri
       path (>= 1.3.0)
       prawn
-      rmagick
       ruby-progressbar
       rubyzip
       term-ansicolor
@@ -36,15 +29,12 @@ GEM
     afm (0.2.0)
     ffi (1.1.5)
     hashery (2.1.0)
-    httparty (0.10.0)
-      multi_json (~> 1.0)
-      multi_xml
     levenshtein-ffi (1.0.3)
       ffi
       ffi (~> 1.1.5)
     mime-types (1.19)
-    multi_json (1.5.0)
-    multi_xml (0.5.2)
+    mini_magick (3.4)
+      subexec (~> 0.2.1)
     nokogiri (1.5.6)
     path (1.3.1)
     pdf-reader (1.3.0)
@@ -56,10 +46,10 @@ GEM
     prawn (0.12.0)
       pdf-reader (>= 0.9.0)
       ttfunk (~> 1.0.2)
-    rmagick (2.13.1)
     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)
 
@@ -67,12 +57,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  levenshtein-ffi
-  nokogiri
-  prawn
-  rmagick
-  ruby-progressbar
-  rubyzip
   storyboard!
   suby!
-  tvdb_party!

data/INSTALL.md

@@ -0,0 +1,26 @@
+# 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.
+
+## OS X
+
+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:
+
+    ruby -e "$(curl -fsSkL raw.github.com/mxcl/homebrew/go)"
+    brew install ffmpeg imagemagick ghostscript
+
+If you've already installed homebrew, update it and re-install FFmpeg if necessary. Storyboard requires FFmpeg 1.1, which became available on homebrew in Janurary 2013.
+
+    brew update
+    brew uninstall ffmpeg
+    brew upgrade ffmpeg
+
+Finally, if you don't have Ruby 1.9.3 installed on your system, you can use <a href="http://rvm.io">RVM</a> to install it. In a termal window, run the following:
+
+    curl -L https://get.rvm.io | bash -s stable --ruby
+    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
+
+    gem install storyboard

data/README.md

@@ -1,16 +1,22 @@
 # Storyboard
 
-Read the TV and Movies you don't have time to watch.
+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)
 
-Storyboard is _very much_ a work in progress, and only works (most of) some of the time. Using it is simple:
+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
+    $ storyboard /path/to/video-file.mkv
 
-Storyboard will try to generate a file at `/path/to/video-file.pdf` containing the final product. ePub and Mobi support will come later.
+Storyboard will try to generate a file at `/path/to/video-file.pdf` containing the final product. Simiarly, you can pass in the path to a folder containing multiple files and it will output a PDF for each video it finds.
+
+    $ ls "~/TV/ShowName/Season 1"
+    ShowName.1x01.EpisodeName.mkv    ShowName.1x02.AnotherEpisode.mkv    ShowName.1x03.ThirdEp.mkv
+    $ storyboard "~/TV/ShowName/Season 1"
+    $ ls .
+    ShowName.1x01.EpisodeName.pdf    ShowName.1x02.AnotherEpisode.pdf    ShowName.1x03.ThirdEp.pdf
 
 You can see available commands by running the program without any options
 
@@ -23,21 +29,9 @@ You can see available commands by running the program without any options
                                        (pdf, mobi, epub)
       -h, --help                       Show this message
 
-## Requirements
-
-Storyboard requires a recent version of *ffmpeg*. This gem includes a build of *ffprobe* that will only work on OS X 1.8, 64 bit. It's probably best not to use this on any different system for now. It's also best to run it on something with at least 8 cores.
 
-## Known Issues
-
-* If there is a scene change followed by dialog in the next frame or two, the dialog may not be shown.
-* Subtitles are always downloaded, never extracted from video files. Because the subtitles are searched for based on the filename it's best that you have then named in a standard format, e.g., `The X-Files - 1x21 - Tooms.avi`.
-* Sometimes the wrong subtitle file will be returned from the site. In those cases, download it manually and use the `-s` option to pass in the path to an SRT formatted subtitle file. This is because the data lies, and there's nothing I can do about it.
-* Some subtitles are encoded in UTF-16, and I haven't care quite enough yet to get them to work. Others use bad UTF8.
-* The subtitles are uuuuuugly.
-* Hardcoding 8 for the number of threads is a bad idea
-* Almost definitely some path-escaping issues, so avoid files with apostrophes and slashes
-* Some subtitles put all the text on one line, so that has to get broken up.
+## Requirements
 
-## Help
+The INSTALL.md file talks about requirements some more, but Storyboard requires Ruby 1.9.3, FFMpeg 1.1, and any recent version of Imagemagick. If you already have those available, just install the storyboard gem.
 
-For now, best to email me theothermarkolson@gmail.com
+    gem install storyboard

data/bin/storyboard

@@ -9,15 +9,19 @@ require 'bundler'
 ENV['BUNDLE_GEMFILE'] = File.join(File.dirname(__FILE__), '../Gemfile')
 Bundler.require(:default)
 
-require 'nokogiri'
-require 'suby'
-require 'rmagick'
-require 'prawn'
-require 'ruby-progressbar'
-
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'storyboard'
 
+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 = {:scenes => true, :verbose => true, :types => ['pdf'], :scene_threshold => 0.4}
 
 # think about them
@@ -67,16 +71,37 @@ 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[:file] = File.realdirpath(ARGV.shift)
+options[:vidpath] = File.realdirpath(ARGV.shift)
+options[:write_to] = ARGV.shift || Dir.pwd
 
-output_dir = ARGV.shift || Dir.pwd
-options[:basename] = File.basename(options[:file], ".*")
+if !File.exists?(options[:vidpath])
+  puts("#{options[:vidpath]} doesn't exist.")
+  exit
+end
+
+filepaths = []
 
-options[:write_to] = output_dir #File.join(output_dir,options[:basename])
-options[:work_dir] = Dir.mktmpdir
-Dir.mkdir(options[:write_to]) unless File.directory?(options[:write_to])
-LOG.debug(options)
+if File.directory?(options[:vidpath])
+  LOG.info("Ignoring subtitle option because we're looking at a directory") if options[:subs]
+  options[:vidpath] = File.join(options[:vidpath], '*')
+  LOG.info("Reading video files in #{options[:vidpath]}")
+  filepaths += Dir[File.realdirpath(options[:vidpath])]
+else
+  filepaths << options[:vidpath]
+end
 
-Storyboard.new(options)
+filepaths.each {|fp|
+  options[:file] = fp
+  runner = Storyboard.new(options)
+  runner.run if runner.video_file?
+}

data/lib/storyboard.rb

@@ -1,4 +1,5 @@
 require 'storyboard/subtitles.rb'
+require 'storyboard/bincheck.rb'
 require 'storyboard/thread-util.rb'
 require 'storyboard/time.rb'
 require 'storyboard/version.rb'
@@ -7,38 +8,47 @@ require 'storyboard/generators/sub.rb'
 require 'storyboard/generators/pdf.rb'
 
 require 'mime/types'
+require 'fileutils'
+require 'tmpdir'
+
+require 'ruby-progressbar'
+require 'mini_magick'
 
 class Storyboard
   attr_accessor :options, :capture_points, :subtitles, :timings
-  attr_accessor :length, :renderers
+  attr_accessor :length, :renderers, :mime
 
   def initialize(o)
     @capture_points = []
     @renderers = []
     @options = o
 
-    @options[:save_directory] = File.join(o[:work_dir], 'raw_frames')
+    check_video
+  end
 
-    Dir.mkdir(@options[:save_directory]) unless File.directory?(@options[:save_directory])
+  def run
+    LOG.info("Processing #{options[:file]}")
+    setup
 
     @subtitles = SRT.new(options[:subs] ? File.read(options[:subs]) : get_subtitles, options)
-    # temp hack so I don't have to wait all the time.
+    # bit of a temp hack so I don't have to wait all the time.
     @subtitles.save if options[:verbose]
 
+
     @renderers << Storyboard::PDFRenderer.new(self) if options[:types].include?('pdf')
 
-    check_video
     run_scene_detection if options[:scenes]
     consolidate_frames
     extract_frames
     render_output
+
+    cleanup
   end
 
   def run_scene_detection
-    LOG.info("Scanning for scene changes. This may take a moment.")
     pbar = ProgressBar.create(:title => " Analyzing Video", :format => '%t [%B] %e', :total => @length, :smoothing => 0.6)
     bin = File.join(File.dirname(__FILE__), '../bin/storyboard-ffprobe')
-    Open3.popen3(bin, "-show_frames", "-of", "compact=p=0", "-f", "lavfi", %(movie=#{options[:file]},select=gt(scene\\,.30)), "-pretty") {|stdin, stdout, stderr, wait_thr|
+    Open3.popen3('ffprobe', "-show_frames", "-of", "compact=p=0", "-f", "lavfi", %(movie=#{options[:file]},select=gt(scene\\,.30)), "-pretty") {|stdin, stdout, stderr, wait_thr|
         begin
           # trolololol
           o = stdout.gets.split('|').inject({}){|hold,value| s = value.split('='); hold[s[0]]=s[1]; hold }
@@ -69,7 +79,7 @@ class Storyboard
   end
 
   def extract_frames
-    pool = Thread::Pool.new(8)
+    pool = Thread::Pool.new(2)
     pbar = ProgressBar.create(:title => " Extracting Frames", :format => '%t [%c/%C|%B] %e', :total => @capture_points.count)
 
     @capture_points.each_with_index {|f,i|
@@ -93,7 +103,6 @@ class Storyboard
   end
 
   def render_output
-    LOG.info("Rendering output files")
     pbar = ProgressBar.create(:title => " Rendering Output", :format => '%t [%c/%C|%B] %e', :total => @capture_points.count)
     @capture_points.each_with_index {|f,i|
       image_name = File.join(@options[:save_directory], "%04d.jpg" % [i])
@@ -111,9 +120,31 @@ class Storyboard
   end
 
   def check_video
-    LOG.debug MIME::Types.type_for(options[:file])
-    @length = `ffmpeg -i "#{options[:file]}" 2>&1 | grep "Duration" | cut -d ' ' -f 4 | sed s/,//`
-    @length = STRTime.parse(length.strip+'0').value
+    @mime = MIME::Types.type_for(options[:file])
+    if video_file?
+      @length = `ffmpeg -i "#{options[:file]}" 2>&1 | grep "Duration" | cut -d ' ' -f 4 | sed s/,//`
+      @length = STRTime.parse(length.strip+'0').value
+    end
+  end
+
+  def video_file?
+    !@mime.grep(/video\//).empty?
+  end
+
+  def mkv?
+    !@mime.grep(/matroska/).empty?
+  end
+
+  def setup
+    @options[:basename] = File.basename(options[:file], ".*")
+    @options[:work_dir] = Dir.mktmpdir
+    Dir.mkdir(@options[:write_to]) unless File.directory?(@options[:write_to])
+    @options[:save_directory] = File.join(@options[:work_dir], 'raw_frames')
+    Dir.mkdir(@options[:save_directory]) unless File.directory?(@options[:save_directory])
+  end
+
+  def cleanup
+    FileUtils.remove_dir(@options[:work_dir])
   end
 
 end

data/lib/storyboard/bincheck.rb

@@ -0,0 +1,34 @@
+class Object
+  def command?(name)
+    `which #{name}`
+    $?.success?
+  end
+end
+
+class Storyboard
+  def self.mkvtools_installed?
+    command?("mkvextract") && command?("mkvmerge")
+  end
+
+  def self.mp4box_insatlled?
+    command?("MP4Box")
+  end
+
+  def self.magick_installed?
+    command?("mogrify")
+  end
+
+  def self.ffprobe_installed?
+    good = command?("ffprobe")
+    if good
+      version = `ffprobe -version`.scan(/version ([\d\.]+)\n/)
+      if version.empty?
+        good = false
+      else
+        float_version = version.first[0].to_f
+        good = float_version >= 1.1
+      end
+    end
+    return good
+  end
+end

data/lib/storyboard/generators/pdf.rb

@@ -1,7 +1,5 @@
 require 'prawn'
-
-require 'rmagick'
-include Magick
+require 'mini_magick'
 
 class Storyboard
   class PDFRenderer < Storyboard::Renderer
@@ -23,23 +21,25 @@ class Storyboard
     end
 
     def render_frame(frame_name, subtitle = nil)
-      image_output = File.join(@storyboard.options[:save_directory], "sub-#{File.basename(frame_name)}")
-      img = ImageList.new(frame_name)
+      output_filename = File.join(@storyboard.options[:save_directory], "sub-#{File.basename(frame_name)}")
+      image = MiniMagick::Image.open(frame_name)
 
       if(@dimensions.empty?)
-        resize_height = (img.rows * (@storyboard.options[:max_width].to_f/img.columns)).ceil
+        resize_height = (image[:height] * (@storyboard.options[:max_width].to_f/image[:width])).ceil
         set_dimensions(storyboard.options[:max_width], resize_height)
       end
 
-      img.resize_to_fit!(@dimensions[0], @dimensions[1])
+      image.resize "#{@dimensions[0]}x#{@dimensions[1]}"
+
+      self.add_subtitle(image, subtitle, @dimensions) if subtitle
+
+      image.format 'jpeg'
+      image.write(output_filename)
+      image.destroy!
 
-      self.add_subtitle(img, subtitle) if subtitle
+      @pdf.image output_filename, :width => @dimensions[0], :height => @dimensions[1]
 
-      img.format = 'jpeg'
-      img.write(image_output) { self.quality = 60 }
-      img.destroy!
 
-      @pdf.image image_output, :width => @dimensions[0], :height => @dimensions[1]
     end
 
   end

data/lib/storyboard/generators/sub.rb

@@ -1,32 +1,41 @@
+require 'prawn'
 class Storyboard
   class Renderer
-    def add_subtitle(img, subtitle)
-      text = subtitle.lines.join("\n")
-      txt = nil
-      txtwidth = img.columns + 1
-      txtsize = 29
-      while(txtwidth > (img.columns * 0.8))
-        txtsize -= 1
-        txt = Draw.new
-        txt.pointsize = txtsize
-        o = txt.get_multiline_type_metrics(img, text)
-        txtwidth = o.width
-      end
+    @@size_canvas = Prawn::Document.new
+    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
 
-      txt.gravity = Magick::SouthGravity
-      txt.stroke_width = 1
-      txt.stroke = 'transparent'
-      txt.font_weight = Magick::BoldWeight
+          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
 
-      img.annotate(txt, 0,0,-2,-2, text) {
-        txt.fill = '#333333'
-      }
+          #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
 
-      img.annotate(txt, 0,0,0,0, text){
-        txt.fill = "#ffffff"
-        txt.stroke = "#000000"
-      }
-      txt = nil
+          offset += (@@size_canvas.height_of(caption, :size => font_size)).ceil
+        }
     end
   end
 end

data/lib/storyboard/subtitles.rb

@@ -1,5 +1,29 @@
 class Storyboard
   def get_subtitles
+    extensionless = File.join(File.dirname(options[:file]), File.basename(options[:file], ".*") + '.srt')
+
+    if mkv?
+      if Storyboard.mkvtools_installed?
+        output = `mkvmerge -i "#{options[:file]}"`
+        subs = output.scan(/Track ID (\d+): subtitles \(S_TEXT\/UTF8\)/)
+        # until I can play with better output, take the first.
+        if not subs.empty?
+          LOG.info("Extracting embedded subtitles")
+          LOG.info("Multiple subtitles found in the mkv. Taking the first.") if subs.count > 1
+          `mkvextract tracks "#{options[:file]}" #{subs.first[0]}:"#{options[:work_dir]}/subtitles.srt"`
+          return File.read("#{options[:work_dir]}/subtitles.srt", )
+        end
+      else
+        LOG.debug("File is mkv, but no mkvtoolnix installed.")
+      end
+    end
+
+    if File.exists?(options[:file] + '.srt')
+      return File.read(options[:file] + '.srt')
+    elsif File.exists?(extensionless)
+     return File.read(extensionless)
+    end
+
     if false == "the file has subtitles embedded"
 
     else
@@ -8,8 +32,23 @@ class Storyboard
       # 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')
+      #downloader = Suby::Downloader::OpenSubtitles.new(suby_file, 'en')
+      # try Addic7ed first, as, on average, it seems a bit better.
+      downloader = nil
+      begin
+        LOG.debug("Searching for subtitles on Addic7ed")
+        #downloader = Suby::Downloader::Addic7ed.new(suby_file, 'en')
+      rescue Exception => e
+        LOG.debug(e)
+      end
+
+      if downloader.nil?
+        LOG.info("Searching for subtitles on OpenSubtitles")
+        downloader = Suby::Downloader::OpenSubtitles.new(suby_file, 'en')
+      end
+
       LOG.debug("Found #{downloader.download_url}")
+      #LOG.debug(downloader.found)
       downloader.extract(downloader.download_url)
     end
   end
@@ -37,8 +76,9 @@ class Storyboard
       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".force_encoding("UTF-8"), '') if page.nil?
+        l.gsub!("\xEF\xBB\xBF", '') if page.nil?
         case phase
         when :line_no
           if l =~ /^\d+$/
@@ -60,7 +100,7 @@ class Storyboard
             phase = :line_no
             @pages << page
           else
-            page[:lines] << l.gsub(%r{</?[^>]+?>}, '')
+            page[:lines] <<  l.gsub(/<\/?[^>]+?>/, '')
           end
         end
       }

data/lib/storyboard/version.rb

@@ -1,3 +1,3 @@
 class Storyboard
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

data/storyboard.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.version       = Storyboard::VERSION
 
   gem.add_dependency 'nokogiri'
-  gem.add_dependency 'rmagick'
+  gem.add_dependency 'mini_magick'
   gem.add_dependency 'prawn'
   gem.add_dependency 'ruby-progressbar'
   gem.add_dependency 'levenshtein-ffi'
@@ -28,28 +28,4 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'term-ansicolor'
   gem.add_dependency 'mime-types', '>= 1.19'
 
-  if File.exist?('.git')
-    `git submodule --quiet foreach 'echo $path'`.split($\).each do |submodule_path|
-      # for each submodule, change working directory to that submodule
-      Dir.chdir(submodule_path) do
-        # issue git ls-files in submodule's directory
-        submodule_files = `git ls-files`.split($\)
-
-
-        # prepend the submodule path to create absolute file paths
-        submodule_files_fullpaths = submodule_files.map do |filename|
-          "#{submodule_path}/#{filename}"
-        end
-
-        # remove leading path parts to get paths relative to the gem's root dir
-        # (this assumes, that the gemspec resides in the gem's root dir)
-        submodule_files_paths = submodule_files_fullpaths.map do |filename|
-          filename.gsub "#{File.dirname(__FILE__)}/", ""
-        end
-
-        # add relative paths to gem.files
-        gem.files += submodule_files_paths
-      end
-    end
-  end
 end

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

@@ -12,7 +12,7 @@ module Suby
       DOWNLOADERS << downloader
     end
 
-    attr_reader :show, :season, :episode, :video_data, :file, :lang
+    attr_reader :show, :season, :episode, :video_data, :file, :lang, :found
 
     def initialize(file, *args)
       @file = file
@@ -84,9 +84,9 @@ module Suby
         get(url_or_response)
       end
     end
-    
+
     def save(contents)
-      sub_name(contents).write 
+      sub_name(contents).write
     end
 
     def extract(url_or_response)

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

@@ -14,7 +14,29 @@ module Suby
     FILTER_IGNORED = "Couldn't find any subs with the specified language. " +
                      "Filter ignored"
 
+    # TODO - cache the shit out of this
     def subtitles_url
+      response = File.read('/Users/olson/Code/pdftv/shows.xml'); get("http://#{SITE}/ajax_getShows.php", {}, false)
+      series = {}
+      body = response.gsub(/<b>.*<\/b>/,'') #response.body.gsub(/<b>.*<\/b>/,'')
+      Nokogiri(body).css('option').each {|show|
+        series[show.inner_text.strip.downcase] = show['value'].to_i
+      }
+
+      potential_matches = [
+        @video_data[:show],
+        @video_data[:show].gsub(' & ', ' and '),
+        @video_data[:show].gsub(' and ', ' & '),
+        @video_data[:show].gsub('\'', '')
+      ]
+      found = nil
+      potential_matches.each{|name|
+        p series[name.downcase]
+      }
+      #print response.body
+      exit
+
+
       "/serie/#{CGI.escape show}/#{season}/#{episode}/#{LANG_IDS[lang]}"
     end
 

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

@@ -0,0 +1,7 @@
+# http://www.addic7ed.com/ajax_getShows.php
+# http://www.addic7ed.com/ajax_getSeasons.php?showID=SHOW_ID
+# http://www.addic7ed.com/ajax_getEpisodes.php?showID=78&season=4
+
+def find_show_id(title)
+
+end

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

@@ -37,20 +37,9 @@ module Suby
           break subs
         end
       }
-      x = s.select { |t| t['SeriesSeason'].to_i == @video_data[:season].to_i } if @video_data[:season]
-      x.each {|t|
-        puts t['MovieName'] + '/' + "\"#{@video_data[:show]}\" #{@video_data[:title]}" + " - " + Levenshtein.distance(t['MovieName'], "\"#{@video_data[:show]}\" #{@video_data[:title]}").to_i.to_s
-      }
+      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 }
-      p "|||||||||||||||"
-      x.each {|t|
-        puts t['MovieName'] + '/' + "\"#{@video_data[:show]}\" #{@video_data[:title]}" + " - " + Levenshtein.distance(t['MovieName'], "\"#{@video_data[:show]}\" #{@video_data[:title]}").to_i.to_s
-      }
-
-      p "======"
-      p x.first
-      p x.last
-      p "-------"
+      @found = x.first
       x.first['SubDownloadLink']
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storyboard
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rmagick
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -160,7 +160,6 @@ email:
 - ! '"theothermarkolson@gmail.com"'
 executables:
 - storyboard
-- storyboard-ffprobe
 extensions: []
 extra_rdoc_files: []
 files:
@@ -168,12 +167,12 @@ files:
 - .rvmrc
 - Gemfile
 - Gemfile.lock
+- INSTALL.md
 - README.md
-- TODO
 - bin/storyboard
-- bin/storyboard-ffprobe
 - lib/.DS_Store
 - lib/storyboard.rb
+- lib/storyboard/bincheck.rb
 - lib/storyboard/generators/pdf.rb
 - lib/storyboard/generators/sub.rb
 - lib/storyboard/subtitles.rb
@@ -188,6 +187,7 @@ files:
 - vendor/suby/lib/suby.rb
 - vendor/suby/lib/suby/downloader.rb
 - vendor/suby/lib/suby/downloader/addic7ed.rb
+- vendor/suby/lib/suby/downloader/addicted.rb
 - vendor/suby/lib/suby/downloader/opensubtitles.rb
 - vendor/suby/lib/suby/downloader/tvsubtitles.rb
 - vendor/suby/lib/suby/filename_parser.rb
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Video to PDF/ePub generator

data/TODO

@@ -1,6 +0,0 @@
-epub/mobi geenerators - since mobi is generated from epub, should I just always make both?
-passing in a directory instead of a file
-error messages
-extract subtitles from the files
-imdb subtitles
-#{filename}.srt and #{File.basename(filename,".*")}.srt checks