subtitle_it 1.5.0 → 1.9.0

data/.rspec

@@ -0,0 +1,2 @@
+--require rspec_spinner --format RspecSpinner::Bar
+

data/{README.txt → README.rdoc}

@@ -8,15 +8,24 @@ _(____/___(___(__(___/_(_ __/___(_ __/___(___ _ _/_ __(_ __
 Ruby tool to download, create, convert and fix subtitles.
 
 
-== FEATURES:
+== FEATURES
 
+* Automatic Download on the terminal
 * To and from: SRT, SUB, XML(TT), YML, MPL2, RSB and ASS.
-* Automatic Download from opensubtitles.org
 * Fixes delays. (SrtResync)
 * Compatibility with "sube" (http://github.com/vic/sube)
 
 
-== SYNOPSIS:
+== SYNOPSIS
+
+Download subtitle:
+
+  subtitle_it Cool-Video.avi
+
+This will search all languages for the video. You can filter:
+
+  subtitle_it -l Eng Cool-Video.avi
+
 
 Bash tool:
 
@@ -32,7 +41,7 @@ Create a template
   subtitle_it unexistent.file
 
 
-== INSTALL:
+== INSTALL
 
  gem sources add http://gems.github.com
  sudo gem install nofxx-subtitle_it
@@ -40,7 +49,8 @@ Create a template
 
 == THE "Ruby Subtitle" Format - RSB
 
-It`s just a easy way, proof of concept to edit subtitles. Here is what it looks like:
+It`s just a easy way, proof of concept to edit subtitles.
+Here is what it looks like:
 
 00:32 => 00:33 == Nice police work! | Thank you!
 00:35 => 3 == Nice job!
@@ -50,7 +60,17 @@ MM:SS => MM:SS or N == TEXT | NEWLINE
 Create a template to check it out.
 
 
-== DEV:
+== Automatic Download
+
+* OpenSubtitles.org   -  WORK SubtitleIt Agent
+* addic7ed.com        -  EVIL NOAPI
+* legendas.tv         -  EVIL NOAPI
+
+
+*NOAPI = Mechanize playground...
+
+
+== DEV
 
 To run tests:
 
@@ -60,7 +80,7 @@ Documentation => doc
 Subtitle examples => spec/fixtures
 
 
-== SUBTITLE EDITORS:
+== SUBTITLE EDITORS
 
 Try those nice editors too, if SubtitleIt does not fit your need:
 
@@ -75,12 +95,12 @@ Aegisub: http://www.malakith.net/aegiwiki/Main_Page
 * Marcin (tiraeth) Chwedziak - Sub format first implementation.
 
 
-== TODO:
+== TODO
 
 Please visit:
 
 * http://github.com/nofxx/subtitle_it
-
+* Support http://www.podnapisi.net/
 
 == LICENSE:
 

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.9.0

data/lib/subtitle_it/bin.rb

@@ -1,8 +1,8 @@
 # SubtitleIt
 # Command line tool
-module SubtitleIt  
-  
-  class Subwork   
+module SubtitleIt
+
+  class Subwork
     def run!(file, format)
       raise unless format
       content = File.open(file, 'r')
@@ -12,42 +12,42 @@ module SubtitleIt
       Bin::write_out(Bin.swap_extension(file, format), dump)
     end
   end
-    
+
   class Subdownloader
     def run!(movie,lang=nil)
-      @movie = Movie.new(movie)       
+      @movie = Movie.new(movie)
       @down = Subdown.new
       @down.log_in!
-      res = @down.search_subtitles(@movie, lang)
+      res = @down.search_subtitles(@movie, OPTIONS[:lang])
       if res.length == 0
         STDOUT.puts "No results found."
         return
       end
       STDOUT.puts "Found #{res.length} result#{"s" if res.length > 1}. Choose one:\n"
       res.sort.each_with_index { |r,i| STDOUT.puts print_option(r,i) }
-      STDOUT.puts "You can choose multiple ones, separated with spaces or a range separated with hifen."      
-      STDOUT.printf "Choose: "  
+      STDOUT.puts "You can choose multiple ones, separated with spaces or a range separated with hifen."
+      STDOUT.printf "Choose: "
       choose = parse_input(STDIN.gets.chomp)
-      choose = choose.map { |c| res[c.to_i-1] }     
-      STDOUT.puts "Downloading #{choose.length} subtitles..."
-      choose.each do |sub| 
+      choose = choose.map { |c| res[c.to_i-1] }
+      STDOUT.puts "Downloading #{choose.length} subtitle#{'s' if choose.length > 1}..."
+      choose.each do |sub|
         down_a_sub(sub, sub.format)
       end
       @down.log_out!
     end
-    
+
     def down_a_sub(sub, format)
       dump = @down.download_subtitle(sub)
       movie_name = @movie.filename[0..-4]
       Bin::write_out(movie_name + format, dump)
-    end  
+    end
 
     def print_option(r, index)
       c = "#{index+1}) #{r.info["MovieName"]} / #{r.info["MovieYear"]} | #{r.info["SubFileName"]} | Movie score: #{r.info["MovieImdbRating"]}\n"
       c << "   Lang: #{r.info["SubLanguageID"].capitalize} | Format: #{r.info["SubFormat"].upcase} | Downloads: #{r.info["SubDownloadsCnt"]} | Rating: #{r.info["SubRating"]} | CDs: #{r.info["SubSumCD"]}\n"
       c << "   Comments: #{r.info["SubAuthorComment"]} \n\n"
     end
-    
+
     def parse_input(input)
       choose = input.split(" ").map do |c|
         if c =~ /-/
@@ -58,32 +58,32 @@ module SubtitleIt
         end
       end
       choose.flatten.uniq
-    end    
+    end
   end
 
-  class Bin  
-    
-       
+  class Bin
+
+
     def Bin.run! argv, lang=nil, format=nil, force=false, delay=nil
       raise unless argv
       @force = force
       @format = format
-      
-      unless File.exists?(argv[0]) 
+
+      unless File.exists?(argv[0])
         # TODO       generate_rsb
         return
       end
-      
-      
+
+
       @file_in = argv[0]
-      @file_in_ext = Bin.get_extension(@file_in)        
+      @file_in_ext = Bin.get_extension(@file_in)
       if argv[1]
-        @file_out = argv[1] 
+        @file_out = argv[1]
         @file_out_ext = Bin.get_extension(@file_out)
         @format = @file_out_ext
-      end        
+      end
       if MOVIE_EXTS.include? @file_in_ext
-        Subdownloader.new.run!(argv[0], lang)        
+        Subdownloader.new.run!(argv[0], lang)
       elsif SUB_EXTS.include? @file_in_ext
         Subwork.new.run!(@file_in, @format)
       else
@@ -94,15 +94,15 @@ module SubtitleIt
       puts e.message
       exit 1
     end
-    
+
     def Bin.get_extension(file)
       raise unless file =~ /\./
       file.split(".").last
     end
-    
+
     def Bin.get_enc_platform(filename)
       raise unless File.exist?(filename)
-      File.open(filename, 'r') do |fd| 
+      File.open(filename, 'r') do |fd|
         fd.gets =~ /\r\n/ ? "WIN" : "UNIX"
       end
     end
@@ -112,19 +112,19 @@ module SubtitleIt
       f[-3..-1] = extension
       f
     end
-    
+
     def Bin.print_languages
       STDOUT.puts "CODE |  LANGUAGE"
       LANGS.each do |l|
         STDOUT.puts "  #{l[0]}  | #{l[1]}"
       end
     end
-    
+
     def Bin.write_out(filename,dump)
       if File.exists?(filename) && !@force
           STDOUT.puts "File exists. #{filename}"
       else
-        File.open(filename, 'w') {|f| f.write(dump) }  
+        File.open(filename, 'w') {|f| f.write(dump) }
         STDOUT.puts "Done. Wrote: #{filename}."
       end
     end

data/lib/subtitle_it/subdown.rb

@@ -23,7 +23,7 @@ module SubtitleIt
     end
 
     def log_in!
-      result = call('LogIn', '', '', '', USER_AGENT)
+      result = request('LogIn', '', '', '', USER_AGENT)
       @token = result['token'].to_s
     end
 
@@ -32,25 +32,25 @@ module SubtitleIt
     end
 
     def log_out!
-      call('LogOut')
+      request('LogOut')
       @token = nil
     end
 
     def server_info
-      call('ServerInfo')
+      request('ServerInfo')
     end
 
-    def search_subtitles(movie, lang_id=nil)
-      lang_name, lang_code = LANGS[lang_id.to_sym] if lang_id
-      print "Searching for "
-      puts lang_id ? lang_name + "..." : "all languages."
+    def search_subtitles(movie, lang_name=nil)
+      # lang_name, lang_code = LANGS[lang_id.to_sym] if lang_id
+      # print "Searching for "
+      # puts lang_id ? lang_name + "..." : "all languages."
       args = {
-        'sublanguageid' => lang_name,
+        'sublanguageid' => lang_name || "",
         'moviehash'     => movie.haxx,
         'moviebytesize' => movie.size
       }
 
-      result = call('SearchSubtitles', [args])
+      result = request('SearchSubtitles', [args])
       return [] unless result['data'] # if no results result['data'] == false
       result['data'].inject([]) do |subs, sub_info|
         subs << Subtitle.new({:info => sub_info})
@@ -59,7 +59,7 @@ module SubtitleIt
     end
 
     def download_subtitle(sub)
-      result = call('DownloadSubtitles', [sub.osdb_id])
+      result = request('DownloadSubtitles', [sub.osdb_id])
       sub.data = self.class.decode_and_unzip(result['data'][0]['data'])
     end
 
@@ -67,7 +67,7 @@ module SubtitleIt
     end
 
     def imdb_info(movie)
-      result = call('CheckMovieHash', [movie.haxx])
+      result = request('CheckMovieHash', [movie.haxx])
       movie.info = result['data'][movie.haxx] # TODO: Handle if no result for movie
     end
 
@@ -94,14 +94,17 @@ module SubtitleIt
 
     private
 
-    def call(method, *args)
+    def request(method, *args)
+
       unless NO_TOKEN.include? method
         raise 'Need to be logged in for this.' unless logged_in?
         args = [@token, *args]
       end
 
+            p method, args
       result = @client.call(method, *args)
-#        $LOG.debug "Client#call #{method}, #{args.inspect}: #{result.inspect}"
+      p result
+      # $LOG.debug "Client#call #{method}, #{args.inspect}: #{result.inspect}"
 
       unless self.class.result_status_ok?(result)
         raise XMLRPC::FaultException.new(result['status'].to_i, result['status'][4..-1]) # 'status' of the form 'XXX Message'
@@ -116,7 +119,7 @@ module SubtitleIt
     end
 
     def prevent_session_expiration
-      call('NoOperation')
+      request('NoOperation')
     end
 
     def self.decode_and_unzip(data)

data/lib/subtitle_it/version.rb

@@ -1,7 +1,7 @@
 module SubtitleIt
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 0
+    MINOR = 9
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rspec'
+require 'rspec_spinner'
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'subtitle_it'
@@ -6,35 +7,35 @@ include SubtitleIt
 
 module SubFixtures
   def sub_fixture
-    File.open(File.expand_path(File.dirname(__FILE__) + '/fixtures/pulpfiction.sub')) 
+    File.open(File.expand_path(File.dirname(__FILE__) + '/fixtures/pulpfiction.sub'))
   end
-  
+
   def srt_fixture
-    File.open(File.expand_path(File.dirname(__FILE__) + '/fixtures/godfather.srt'))     
+    File.open(File.expand_path(File.dirname(__FILE__) + '/fixtures/godfather.srt'))
   end
-  
+
   def yml_fixture
-    File.open(File.expand_path(File.dirname(__FILE__) + '/fixtures/sincity.yml')) 
+    File.open(File.expand_path(File.dirname(__FILE__) + '/fixtures/sincity.yml'))
   end
-  
+
   def rsb_fixture
-    File.open(File.expand_path(File.dirname(__FILE__) + '/fixtures/pseudo.rsb')) 
-  end 
-  
+    File.open(File.expand_path(File.dirname(__FILE__) + '/fixtures/pseudo.rsb'))
+  end
+
   def xml_fixture
-    File.open(File.expand_path(File.dirname(__FILE__) + '/fixtures/movie.xml')) 
-  end  
-  
+    File.open(File.expand_path(File.dirname(__FILE__) + '/fixtures/movie.xml'))
+  end
+
   def mpl_fixture
-    File.open(File.expand_path(File.dirname(__FILE__) + '/fixtures/puplfiction.mpl')) 
-  end  
+    File.open(File.expand_path(File.dirname(__FILE__) + '/fixtures/puplfiction.mpl'))
+  end
 end
 
 
 # ##
 # rSpec Hash additions.
 #
-# From 
+# From
 #   * http://wincent.com/knowledge-base/Fixtures_considered_harmful%3F
 #   * Neil Rahilly
 class Hash

data/subtitle_it.gemspec

@@ -5,23 +5,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{subtitle_it}
-  s.version = "1.5.0"
+  s.version = "1.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2011-04-15}
+  s.date = %q{2011-05-30}
   s.default_executable = %q{subtitle_it}
   s.description = %q{Download, edit and create subtitles. Supports various formats.}
   s.email = %q{x@nofxx.com}
   s.executables = ["subtitle_it"]
   s.extra_rdoc_files = [
-    "README.txt"
+    "README.rdoc"
   ]
   s.files = [
+    ".rspec",
     "History.txt",
     "License.txt",
-    "Manifest.txt",
-    "README.txt",
+    "README.rdoc",
     "Rakefile",
     "VERSION",
     "bin/subtitle_it",
@@ -52,7 +52,6 @@ Gem::Specification.new do |s|
     "script/destroy",
     "script/generate",
     "script/txt2html",
-    "setup.rb",
     "spec/fixtures/godfather.srt",
     "spec/fixtures/huge.ass",
     "spec/fixtures/movie.xml",
@@ -89,27 +88,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Download, edit and create subtitles.}
-  s.test_files = [
-    "spec/spec_helper.rb",
-    "spec/subtitle_it/bin_spec.rb",
-    "spec/subtitle_it/fixes_spec.rb",
-    "spec/subtitle_it/formats/ass_spec.rb",
-    "spec/subtitle_it/formats/mpl_spec.rb",
-    "spec/subtitle_it/formats/rsb_spec.rb",
-    "spec/subtitle_it/formats/srt_spec.rb",
-    "spec/subtitle_it/formats/sub_spec.rb",
-    "spec/subtitle_it/formats/xml_spec.rb",
-    "spec/subtitle_it/formats/yml_spec.rb",
-    "spec/subtitle_it/generator_spec.rb",
-    "spec/subtitle_it/movie_hasher_spec.rb",
-    "spec/subtitle_it/movie_spec.rb",
-    "spec/subtitle_it/subdown_spec.rb",
-    "spec/subtitle_it/subline_spec.rb",
-    "spec/subtitle_it/substyle_spec.rb",
-    "spec/subtitle_it/subtime_spec.rb",
-    "spec/subtitle_it/subtitle_spec.rb",
-    "spec/subtitle_it_spec.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION