storyboard 0.2.3 → 0.2.4

data/Gemfile

@@ -2,9 +2,11 @@ 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,30 +1,50 @@
 GIT
-  remote: http://github.com/markolson/suby
-  revision: f44e9821f0f6ff07d2729a3a0b3abc386861b9e9
+  remote: https://github.com/nddrylliog/tvdb_party
+  revision: 60ce3c28e664078da0206075e025ee06547f5826
   specs:
-    suby (0.4.0)
+    tvdb_party (0.6.2)
+      httparty (>= 0.6.1)
+
+PATH
+  remote: .
+  specs:
+    storyboard (0.2.3)
+      levenshtein-ffi
       mime-types (>= 1.19)
       nokogiri
       path (>= 1.3.0)
+      prawn
+      rmagick
+      ruby-progressbar
       rubyzip
       term-ansicolor
 
 PATH
-  remote: .
+  remote: vendor/suby
   specs:
-    Storyboard (0.1.1)
+    suby (0.4.0)
+      mime-types (>= 1.19)
       nokogiri
-      prawn
-      rmagick
-      ruby-progressbar
+      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)
+    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)
     nokogiri (1.5.6)
     path (1.3.1)
     pdf-reader (1.3.0)
@@ -47,9 +67,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  Storyboard!
+  levenshtein-ffi
   nokogiri
   prawn
   rmagick
   ruby-progressbar
+  rubyzip
+  storyboard!
   suby!
+  tvdb_party!

data/README.md

@@ -4,6 +4,8 @@ Read the TV and Movies you don't have time to watch.
 
 ## 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 /path/to/video-file.mkv
@@ -29,11 +31,12 @@ Storyboard requires a recent version of *ffmpeg*. This gem includes a build of *
 
 * 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.
-* Some subtitles are encoded in UTF-16, and I haven't care quite enough yet to get them to work.
+* 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.
 
 ## Help
 

data/lib/storyboard/version.rb

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

data/storyboard.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Video to PDF/ePub generator}
   gem.homepage      = "http://github.com/markolson/storyboard"
 
-  gem.required_ruby_version = '>= 1.9.2'
+  gem.required_ruby_version = '>= 1.9.3'
 
   gem.files         = `git ls-files`.split($\) if File.exist?('.git')
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -20,16 +20,15 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rmagick'
   gem.add_dependency 'prawn'
   gem.add_dependency 'ruby-progressbar'
+  gem.add_dependency 'levenshtein-ffi'
 
   # suby stuff.
   gem.add_dependency 'path', '>= 1.3.0'
-  gem.add_dependency 'nokogiri'
   gem.add_dependency 'rubyzip'
   gem.add_dependency 'term-ansicolor'
   gem.add_dependency 'mime-types', '>= 1.19'
 
   if File.exist?('.git')
-    p "RUNNING"
     `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

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

@@ -1,3 +1,6 @@
+require 'json'
+require 'levenshtein'
+
 module Suby
   # Based on https://github.com/byroot/ruby-osdb/blob/master/lib/osdb/server.rb
   class Downloader::OpenSubtitles < Downloader
@@ -28,12 +31,27 @@ module Suby
     LANG_MAPPING.default = 'all'
 
     def download_url
-      SEARCH_QUERIES_ORDER.find(lambda { raise NotFoundError, "no subtitles available" }) { |type|
+      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
-      }.first['SubDownloadLink']
+      }
+      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.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 "-------"
+      x.first['SubDownloadLink']
     end
 
     def search_subtitles(query)

data/vendor/suby/lib/suby/filename_parser.rb

@@ -11,7 +11,7 @@ module Suby
       [Ss](?<season>[0-9]{2})
       [\.\- ]?
       (?<episode>[0-9]{2})
-      [^0-9]*$/x,
+      (?<title>[^0-9]*)$/x,
 
       # foo.1x09*
       /^(?<show>.+?)
@@ -21,7 +21,8 @@ module Suby
       [xX]
       (?<episode>[0-9]+)
       \]?
-      [^\/]*$/x,
+      [ \._\-]*
+      (?<title>[^\/]*)$/x,
 
       # foo.s01.e01, foo.s01_e01
       /^(?<show>.+?)
@@ -30,7 +31,8 @@ module Suby
       [Ss](?<season>[0-9]+)[\. _-]?
       [Ee]?(?<episode>[0-9]+)
       \]?
-      [^\/]*$/x,
+      [ \._\-]*
+      (?<title>[^\/]*)$/x,
 
       # foo - [01.09]
       /^(?<show>.+?)
@@ -41,14 +43,14 @@ module Suby
       (?<episode>[0-9]+?)
       \]
       [ \._\-]?
-      [^\/]*$/x,
+      (?<title>[^\/]*)$/x,
 
       # Foo - S2 E 02 - etc
       /^(?<show>.+?)
       [ ]?[ \._\-][ ]?
       [Ss](?<season>[0-9]+)[\.\- ]?
       [Ee]?[ ]?(?<episode>[0-9]+)
-      [^\/]*$/x,
+      (?<title>[^\/]*)$/x,
 
       # Show - Episode 9999 [S 12 - Ep 131] - etc
       /(?<show>.+)
@@ -60,22 +62,22 @@ module Suby
       ([ ]|[ ]-[ ]|-)
       ([eE]|[eE]p)[ ]?(?<episode>\d+)
       \]
-      .*$/x,
+      (?<title>.*)$/x,
 
       # foo.103*
       /^(?<show>.+)
       [ \._\-]
       (?<season>[0-9]{1})
       (?<episode>[0-9]{2})
-      [\._ -][^\/]*$/x,
+      (?<title>[\._ -][^\/]*)$/x,
     ]
     MOVIE_PATTERN = /^(?<movie>.*)[.\[( ](?<year>(?:19|20)\d{2})/
 
     def parse(file)
-      filename = file.basename.to_s
+      filename = File.basename(file, ".*")
       if TVSHOW_PATTERNS.find { |pattern| pattern.match(filename) }
         m = $~
-        { type: :tvshow, show: clean_show_name(m[:show]), season: m[:season].to_i, episode: m[:episode].to_i }
+        { type: :tvshow, show: clean_show_name(m[:show]), season: m[:season].to_i, episode: m[:episode].to_i, title: m[:title] }
       elsif m = MOVIE_PATTERN.match(filename)
         { type: :movie, name: clean_show_name(m[:movie]), year: m[:year].to_i }
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storyboard
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-13 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -76,13 +76,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: path
+  name: levenshtein-ffi
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,15 +90,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: path
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +165,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .gitmodules
 - .rvmrc
 - Gemfile
 - Gemfile.lock
@@ -216,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "vendor/suby"]
-	path = vendor/suby
-	url = http://github.com/markolson/suby