subtitle_it 1.9.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5e89ad4165e8f6502df504f903bea91ab440fa6c
+  data.tar.gz: 9f771d45a07d6720aecd20edd763eadc766ef179
+SHA512:
+  metadata.gz: 4ca034e01f764d55552192df5a5036418699696d7d8b1246ef2ccf345abb83f8866f3c2fc354a0053baf18bf98727e126f7e350b93cdc970800e1282a068c68f
+  data.tar.gz: f8596dd83734c9271881dac335f93dfe19b3a574e146f42db828c8950b05e9aa4032c44639ac53a33914b41116124caeda67c5950e5b4db8e3fc9aed2edfdd9a

data/.gitignore

@@ -0,0 +1,5 @@
+.DS_Store
+doc
+*~
+pkg/*
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/{README.rdoc → README.md}

@@ -1,14 +1,14 @@
-      __                                            __
-    /    )          /          ,        /           /
-----\--------------/__--_/_------_/_---/----__-----/---_/_-
-     \     /   /  /   ) /    /   /    /   /___)   /    /
-_(____/___(___(__(___/_(_ __/___(_ __/___(___ _ _/_ __(_ __
+          __                                            __
+        /    )          /          ,        /           /
+    ----\--------------/__--_/_------_/_---/----__-----/---_/_-
+         \     /   /  /   ) /    /   /    /   /___)   /    /
+    _(____/___(___(__(___/_(_ __/___(_ __/___(___ _ _/_ __(_ __
 
 
 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.
@@ -16,7 +16,7 @@ Ruby tool to download, create, convert and fix subtitles.
 * Compatibility with "sube" (http://github.com/vic/sube)
 
 
-== SYNOPSIS
+# SYNOPSIS
 
 Download subtitle:
 
@@ -26,8 +26,11 @@ This will search all languages for the video. You can filter:
 
   subtitle_it -l Eng Cool-Video.avi
 
+You can use -c option. It convert subtitles to given format:
 
-Bash tool:
+  subtitle_it -l Eng -c srt Cool-Video.avi
+
+## Bash tool
 
 Convert a srt to sub:
   subtitle_it in.srt out.sub
@@ -41,26 +44,27 @@ Create a template
   subtitle_it unexistent.file
 
 
-== INSTALL
+# INSTALL
 
- gem sources add http://gems.github.com
- sudo gem install nofxx-subtitle_it
+ gem install subtitle_it
 
 
-== THE "Ruby Subtitle" Format - RSB
+## THE "Ruby Subtitle" Format - RSB
 
 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!
 
 MM:SS => MM:SS or N == TEXT | NEWLINE
+```
 
 Create a template to check it out.
 
 
-== Automatic Download
+## Automatic Download
 
 * OpenSubtitles.org   -  WORK SubtitleIt Agent
 * addic7ed.com        -  EVIL NOAPI
@@ -70,7 +74,7 @@ Create a template to check it out.
 *NOAPI = Mechanize playground...
 
 
-== DEV
+## DEV
 
 To run tests:
 
@@ -80,7 +84,7 @@ Documentation => doc
 Subtitle examples => spec/fixtures
 
 
-== SUBTITLE EDITORS
+## SUBTITLE EDITORS
 
 Try those nice editors too, if SubtitleIt does not fit your need:
 
@@ -89,20 +93,20 @@ Jubler: http://www.jubler.org/
 Aegisub: http://www.malakith.net/aegiwiki/Main_Page
 
 
-== THANKS
+## THANKS
 
 * Johanlunds - Opensubtitle.org code (to be used as a gem soon).
 * Marcin (tiraeth) Chwedziak - Sub format first implementation.
 
 
-== TODO
+## TODO
 
 Please visit:
 
 * http://github.com/nofxx/subtitle_it
 * Support http://www.podnapisi.net/
 
-== LICENSE:
+## LICENSE:
 
 (The MIT License)
 

data/Rakefile

@@ -1,21 +1,16 @@
-require 'rubygems'
-require 'rake'
+#!/usr/bin/env rake
+require 'bundler/gem_tasks'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "subtitle_it"
-    gem.summary = "Download, edit and create subtitles."
-    gem.description = "Download, edit and create subtitles. Supports various formats."
-    gem.email = "x@nofxx.com"
-    gem.homepage = "http://github.com/nofxx/subtitle_it"
-    gem.authors = ["Marcos Piccinini"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :build
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task default: :spec
+

data/bin/subtitle_it

@@ -5,12 +5,8 @@
 #  Copyleft (c) 2008. MIT License.
 #
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-begin
-  require 'rubygems'
-rescue LoadError
-  # no rubygems to load, so we fail silently
-end
 
+require 'colorize'
 require 'optparse'
 require 'subtitle_it'
 
@@ -43,10 +39,10 @@ BANNER
   end
 
   opts.on("-c", "--convert=FORMAT", String,
-          "Format to convert to") { |of| OPTIONS[:format] = of }
+          "Format to convert to") { |o| OPTIONS[:format] = o }
 
   opts.on("-d", "--delay=DELAY", Float,
-          "Delay to add/remove") { |od| OPTIONS[:delay] = od }
+          "Delay to add/remove") { |o| OPTIONS[:delay] = o }
 
   opts.on("-f", "--force", "Force overwrite") { OPTIONS[:force] = true }
 
@@ -54,7 +50,7 @@ BANNER
           "Show this help message.") { puts opts; exit }
 
   opts.on("-v", "--version",
-          "Show program version") {   puts "SubtitleIt v#{SubtitleIt::VERSION::STRING}"; exit }
+          "Show program version") { puts "SubtitleIt v#{SubtitleIt::VERSION}"; exit }
 
   opts.parse!(ARGV)
 

data/lib/subtitle_it/bin.rb

@@ -1,58 +1,65 @@
 # SubtitleIt
 # Command line tool
 module SubtitleIt
-
   class Subwork
     def run!(file, format)
-      raise unless format
+      fail unless format
       content = File.open(file, 'r')
-      STDOUT.puts "Working on file #{file}..."
-      sub = Subtitle.new({ :dump => content, :format => Bin.get_extension(file) })
+      puts "Working on file #{file}..."
+      sub = Subtitle.new(dump: content, format: Bin.get_extension(file))
       dump = sub.send :"to_#{format}"
-      Bin::write_out(Bin.swap_extension(file, format), dump)
+      Bin.write_out(Bin.swap_extension(file, format), dump)
     end
   end
 
   class Subdownloader
-    def run!(movie,lang=nil)
+    def run!(movie, lang = nil, dst_format = nil)
       @movie = Movie.new(movie)
       @down = Subdown.new
       @down.log_in!
-      res = @down.search_subtitles(@movie, OPTIONS[:lang])
+      res = @down.search_subtitles(@movie, lang).sort
       if res.length == 0
-        STDOUT.puts "No results found."
+        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: "
+      puts 'You can choose multiple ones separated with spaces '\
+                  'or a range separated with a hifen.'
+      puts "Found #{res.size.to_s.yellow} result#{'s' if res.size > 1}:\n"
+      res.each_with_index { |r, i| puts print_option(r.info, i) }
+      STDOUT.print "Choose (1-#{res.size}): "
       choose = parse_input(STDIN.gets.chomp)
-      choose = choose.map { |c| res[c.to_i-1] }
-      STDOUT.puts "Downloading #{choose.length} subtitle#{'s' if choose.length > 1}..."
+      choose = choose.map { |c| res[c.to_i - 1] }
+      puts "Downloading #{choose.size} subtitle#{'s' if choose.size > 1}..."
       choose.each do |sub|
-        down_a_sub(sub, sub.format)
+        down_a_sub(sub, dst_format)
       end
       @down.log_out!
     end
 
-    def down_a_sub(sub, format)
+    def down_a_sub(sub, dst_format)
+      dst_format ||= sub.format
       dump = @down.download_subtitle(sub)
-      movie_name = @movie.filename[0..-4]
-      Bin::write_out(movie_name + format, dump)
+      if sub.format != dst_format
+        subt = Subtitle.new(dump: dump, format: dst_format)
+        dump = subt.send :"to_#{dst_format}"
+      end
+      fname = @movie.filename[0..-4] + sub.info['SubLanguageID']
+      Bin.write_out("#{fname}.#{dst_format}", dump)
     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"
+      date = Date.parse(r['SubAddDate'])
+      "  #{(index + 1).to_s.yellow}. #{r['LanguageName'][0,3].green}"\
+      " | #{r['SubFormat'].upcase.blue} | #{r['MovieName'].cyan}"\
+      " / #{r['MovieYear'].cyan} | #{r['SubRating'].yellow}"\
+      " | FPS #{r['MovieFPS']} | #{r['SubSumCD']} CDs | #{date}"
     end
 
     def parse_input(input)
-      choose = input.split(" ").map do |c|
+      choose = input.split(' ').map do |c|
         if c =~ /-/
-          numbers = c.split("-").map { |d| d.to_i }
-          new_range = (numbers[0]..numbers[1]).to_a
+          numbers = c.split('-').map(&:to_i)
+          (numbers[0]..numbers[1]).to_a
         else
           c.to_i
         end
@@ -62,18 +69,13 @@ module SubtitleIt
   end
 
   class Bin
-
-
-    def Bin.run! argv, lang=nil, format=nil, force=false, delay=nil
-      raise unless argv
+    def self.run!(argv, lang = nil, format = nil, force = false, _delay = nil)
+      fail unless argv
       @force = force
       @format = format
 
-      unless File.exists?(argv[0])
-        # TODO       generate_rsb
-        return
-      end
-
+      # TODO: generate_rsb
+      return unless File.exist?(argv[0])
 
       @file_in = argv[0]
       @file_in_ext = Bin.get_extension(@file_in)
@@ -82,50 +84,40 @@ module SubtitleIt
         @file_out_ext = Bin.get_extension(@file_out)
         @format = @file_out_ext
       end
+
       if MOVIE_EXTS.include? @file_in_ext
-        Subdownloader.new.run!(argv[0], lang)
+        Subdownloader.new.run!(@file_in, lang, @format)
       elsif SUB_EXTS.include? @file_in_ext
         Subwork.new.run!(@file_in, @format)
       else
-        raise "Unknown file."
+        fail "Unknown file type '#{@file_in_ext}'."
       end
-
-    rescue Exception => e
-      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|
-        fd.gets =~ /\r\n/ ? "WIN" : "UNIX"
-      end
+    def self.get_extension(file)
+      fail unless file =~ /\./
+      file.split('.').last
     end
 
-    def Bin.swap_extension(file,extension)
+    def self.swap_extension(file, extension)
       f = file.dup
       f[-3..-1] = extension
       f
     end
 
-    def Bin.print_languages
-      STDOUT.puts "CODE |  LANGUAGE"
+    def self.print_languages
+      puts 'CODE |  LANGUAGE'
       LANGS.each do |l|
-        STDOUT.puts "  #{l[0]}  | #{l[1]}"
+        puts "  #{l[0]}  | #{l[1]}"
       end
     end
 
-    def Bin.write_out(filename,dump)
-      if File.exists?(filename) && !@force
-          STDOUT.puts "File exists. #{filename}"
+    def self.write_out(filename, dump)
+      if File.exist?(filename) && !@force
+        puts "File exist: #{filename}".red
       else
-        File.open(filename, 'w') {|f| f.write(dump) }
-        STDOUT.puts "Done. Wrote: #{filename}."
+        File.open(filename, 'w') { |f| f.write(dump) }
+        puts "Done: #{filename}".yellow
       end
     end
   end

data/lib/subtitle_it/fixes.rb

@@ -2,11 +2,10 @@ module SubtitleIt
   #   class TimeFix
   #     def fix_delay
   #       argv[1] ||= argv[0] + "_new"
-  #       SubtitleIt.srt_delay(argv[0],argv[1])  
+  #       SubtitleIt.srt_delay(argv[0], argv[1])
   #     end
   #   end
-  # 
+  #
   # class CdCountFix
-  #end
-
+  # end
 end

data/lib/subtitle_it/formats/ass.rb

@@ -1,13 +1,12 @@
 # SubtitleIt
 #  ASS - http://en.wikipedia.org/wiki/SubStation_Alpha
 #  http://www.malakith.net/aegiwiki/ASS
-#TODO ass!
-module Formats    
+# TODO: ass!
+module Formats
   def parse_ass
-
   end
-  
-  #not mine!
+
+  # not mine!
   def to_ass
-  end    
+  end
 end

data/lib/subtitle_it/formats/mpl.rb

@@ -5,25 +5,25 @@
 #
 # Where N is sec * 10
 #
-module Formats       
+module Formats
   include PlatformEndLine
   def parse_mpl
-    @raw.to_a.inject([]) do |i,l|
+    @raw.to_a.inject([]) do |i, l|
       line_data = l.scan(/^\[([0-9]{1,})\]\[([0-9]{1,})\](.+)$/)
       line_data = line_data.at 0
       time_on, time_off, text = line_data
-      time_on, time_off = [time_on.to_i, time_off.to_i].map { |t| t.to_i * 1000 }	    
+      time_on, time_off = [time_on.to_i, time_off.to_i].map { |t| t.to_i * 1000 }
       i << Subline.new(time_on, time_off, text.chomp)
     end
   end
-      
+
   def to_mpl
-    endl = endline( @raw )
+    endl = endline(@raw)
     line_ary = []
     @lines.each do |l|
       start, stop = [l.time_on, l.time_off].map { |val| val.to_i / 100 }
-      line_ary << "[%d][%d]%s" % [start, stop, l.text]
+      line_ary << '[%d][%d]%s' % [start, stop, l.text]
     end
-    return line_ary.join( endl ) + endl
-  end    
-end 
+    line_ary.join(endl) + endl
+  end
+end

data/lib/subtitle_it/formats/rsb.rb

@@ -15,23 +15,23 @@ module Formats
     @title = inn.delete_at(0).split(':')[1]
     @authors = inn.delete_at(0).split(':')[1]
     @version = inn.delete_at(0).split(':')[1]
-    inn.inject([]) do |final,line|
-      time_on,time_off = line.split('=>').map { |t| t.strip }
-      text = line.split('==')[1] #.strip
+    inn.inject([]) do |final, line|
+      time_on, time_off = line.split('=>').map(&:strip)
+      text = line.split('==')[1] # .strip
       final << Subline.new(time_on, time_off, text ? text.strip : nil)
     end
   end
 
   def to_rsb
-    endl = endline( @raw )
+    endl = endline(@raw)
     out = ["- title: #{@title}", "- authors: #{@authors}", "- version: #{@version}"]
     @lines.each do |l|
-      out << "%s => %s == %s" % [l.time_on.to_s, l.time_off.to_s, l.text]
+      out << '%s => %s == %s' % [l.time_on.to_s, l.time_off.to_s, l.text]
     end
-    return out.join( endl ) + endl
-    #out = "- title: #{@title}\n- authors: #{@authors}\n- version: #{@version}\n"
-    #out << @lines.inject([]) do |i,l|
+    out.join(endl) + endl
+    # out = "- title: #{@title}\n- authors: #{@authors}\n- version: #{@version}\n"
+    # out << @lines.inject([]) do |i,l|
     #  i << "%s => %s == %s" % [l.time_on.to_s, l.time_off.to_s, l.text]
-    #end.join("\n")
+    # end.join("\n")
   end
 end

data/lib/subtitle_it/formats/srt.rb

@@ -8,33 +8,36 @@
 #
 # Where N is the sub index number
 #
-module Formats    
+module Formats
   include PlatformEndLine
+
+  def endl
+    endline(@raw)
+  end
+
   def parse_srt
-    endl = endline( @raw )
-    @raw.split( endl*2 ).inject([]) do |final,line|
+    @raw.split(endl * 2).inject([]) do |final, line|
       line = line.split(endl)
       line.delete_at(0)
-      time_on,time_off = line[0].split('-->').map { |t| t.strip }
-      line.delete_at(0)        
-      text = line.join("|")
+      time_on, time_off = line[0].split('-->').map(&:strip)
+      line.delete_at(0)
+      text = line.join('|')
       final << Subline.new(time_on, time_off, text)
     end
   end
 
   def to_srt
-    endl = endline( @raw )
     out = []
-    @lines.each_with_index do |l,i|
-      out << "#{i+1}"
-      out << "%s --> %s" % [l.time_on.to_s(','), l.time_off.to_s(',')]
-      out << l.text.gsub("|", endl) + endl
+    @lines.each_with_index do |l, i|
+      out << "#{i + 1}"
+      out << '%s --> %s' % [l.time_on.to_s(','), l.time_off.to_s(',')]
+      out << (l.text ? l.text.gsub('|', endl) : ' ') + endl
     end
-    out.join( endl )
-  end    
+    out.join(endl)
+  end
 end
 
-#looks like subrip accepts some styling:
+# looks like subrip accepts some styling:
 #     sdict.add(new StyledFormat(ITALIC, "i", true));
 #     sdict.add(new StyledFormat(ITALIC, "/i", false));
 #     sdict.add(new StyledFormat(BOLD, "b", true));

data/lib/subtitle_it/formats/sub.rb

@@ -1,6 +1,6 @@
 # SubtitleIt
 # MPSub, MicroDVD or VOBSub format
-#TODO: tricky.. detect which format we got.
+# TODO: tricky.. detect which format we got.
 #
 # {1025}{1115}You always say that.|The same thing every time.
 # {1118}{1177}"l'm throug h, never again,|too dangerous."
@@ -17,14 +17,14 @@
 #
 module Formats
   include PlatformEndLine
-  #between our formats, what changes can be reduced to a value
+  # between our formats, what changes can be reduced to a value
   def ratio
-   1
+    1
   end
 
   def parse_sub
     # FIXME: 1.8 and 1.9 way of working
-    @raw.send(@raw.respond_to?(:lines) ? :lines : :to_a).reduce([]) do |i,l|
+    @raw.send(@raw.respond_to?(:lines) ? :lines : :to_a).reduce([]) do |i, l|
       line_data = l.scan(/^\{([0-9]{1,})\}\{([0-9]{1,})\}(.+)$/)
       line_data = line_data.at 0
       time_on, time_off, text = line_data
@@ -36,12 +36,12 @@ module Formats
   end
 
   def to_sub
-    endl = endline( @raw )
+    endl = endline(@raw)
     line_ary = []
     @lines.each do |l|
-      line_ary << "{%d}{%d}%s" % [parse_time(l.time_on), parse_time(l.time_off), l.text]
+      line_ary << '{%d}{%d}%s' % [parse_time(l.time_on), parse_time(l.time_off), l.text]
     end
-    return line_ary.join( endl ) + endl
+    line_ary.join(endl) + endl
   end
 
   def parse_time(n)

data/lib/subtitle_it/formats/xml.rb

@@ -18,34 +18,35 @@
 #    <p begin="00:00:29.02" dur="00:00:01.30" style="1">as <span tts:color="#ccc333">easy</span> as drawing on paper.</p>
 #    </div>
 #  </body>
-#</tt>
-require 'hpricot'
+# </tt>
+require 'nokogiri'
+
 module Formats
   include PlatformEndLine
 
   def parse_xml
     final = []
-    doc = Hpricot.XML(@raw)
-    (doc/'tt'/'p').each do |line|
-      time_on, time_off = ['begin', 'dur'].map { |str| line[str.to_sym] }
-      text = line.innerHTML
-      final << Subline.new(time_on,time_off,text)
+    doc = Nokogiri::XML.parse(@raw)
+    (doc / 'tt' / 'p').each do |line|
+      time_on, time_off = %w(begin dur).map { |str| line[str.to_sym] }
+      text = line.inner_html
+      final << Subline.new(time_on, time_off, text)
     end
-    return final
+    final
   end
 
   def xml_lines
-    endl = endline( @raw )
+    endl = endline(@raw)
     line_ary = []
     @lines.each do |l|
       toff = l.time_off - l.time_on
       line_ary << "      <p begin=\"#{l.time_on}\" dur=\"#{toff}\">#{l.text}</p>"
     end
-    return line_ary.join( endl )
+    line_ary.join(endl)
   end
 
   def to_xml
-    endl = endline( @raw )
+    endl = endline(@raw)
     out = <<XML
 <?xml version="1.0" encoding="UTF-8"?>
 <tt xml:lang="en" xmlns="http://www.w3.org/2006/10/ttaf1"  xmlns:tts="http://www.w3.org/2006/10/ttaf1#styling">
@@ -60,6 +61,6 @@ module Formats
   </body>
 </tt>
 XML
-  out.chomp
+    out.chomp
   end
 end

data/lib/subtitle_it/formats/yml.rb

@@ -1,18 +1,18 @@
 # SubtitleIt
 # YML Dump
 #
-require 'yaml'
-module Formats    
+
+module Formats
   def parse_yml
-    @yaml = YAML::load(@raw)
+    @yaml = YAML.load(@raw)
     header = @yaml.delete('header')
     @title = header['title']
     @author = header['authors']
     @version = header['version']
     @yaml['lines'].map { |l| Subline.new(l[0], l[1], l[2]) }
   end
-      
+
   def to_yml
     YAML.dump(self)
-  end    
+  end
 end