subtitle_it 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e89ad4165e8f6502df504f903bea91ab440fa6c
-  data.tar.gz: 9f771d45a07d6720aecd20edd763eadc766ef179
+  metadata.gz: 6618182f0ae7b04e5195693c1c65f7898b0d80b0
+  data.tar.gz: 4721ff41267fbb1c970e6b92c80e082357a37cfb
 SHA512:
-  metadata.gz: 4ca034e01f764d55552192df5a5036418699696d7d8b1246ef2ccf345abb83f8866f3c2fc354a0053baf18bf98727e126f7e350b93cdc970800e1282a068c68f
-  data.tar.gz: f8596dd83734c9271881dac335f93dfe19b3a574e146f42db828c8950b05e9aa4032c44639ac53a33914b41116124caeda67c5950e5b4db8e3fc9aed2edfdd9a
+  metadata.gz: 65330e0721ba021eef2d7dd7446e09eb87c9da729af85c8f9da2128fced8a51e4983343cc8060cae0ee9cc6d552d05e7923b479df4a432b40df9a0c798f8ed3f
+  data.tar.gz: fbcebf4d10dd6194956d4e47d580c01ac22f909fea474deb357140f74e5c796801b510ee1a24adba8fb4e67ad71fbe99be373c438e9d6bdb9618027aa786c72a

data/.rspec

@@ -0,0 +1,3 @@
+--tty
+--color
+--format documentation

data/.travis.yml

@@ -0,0 +1,21 @@
+language: ruby
+bundler_args: --without development
+rvm:
+  - 1.9.3
+  - 2.2.2
+  - ruby-head
+  - jruby
+  - rbx-2
+
+jdk:
+  - oraclejdk7
+  - openjdk7
+
+env: CI="travis" JRUBY_OPTS="--2.0 --server -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -J-Xms512m -J-Xmx1024m"
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby
+
+env: CI="travis"

data/Gemfile

@@ -1,3 +1,13 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :test do
+  gem 'rake'
+  gem 'guard'
+  gem 'rubocop'
+  gem 'guard-rspec'
+  gem 'guard-rubocop'
+  gem 'rspec', '>= 3.2.0'
+  gem 'codeclimate-test-reporter', require: nil
+end

data/Guardfile

@@ -0,0 +1,16 @@
+#
+# Subtitle It
+#
+ignore(/\/.#.+/)
+
+# notification :off
+
+guard :rubocop, all_on_start: false, keep_failed: false, notification: false, cli: ['--format', 'emacs'] do
+  watch(/^lib\/(.+)\.rb$/)
+end
+
+guard :rspec, cmd: 'bundle exec rspec', notification: true do
+  watch(/^spec\/.+_spec\.rb$/)
+  watch(/^lib\/(.+)\.rb$/)     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { 'spec' }
+end

data/README.md

@@ -5,51 +5,83 @@
     _(____/___(___(__(___/_(_ __/___(_ __/___(___ _ _/_ __(_ __
 
 
+[![Gem Version](https://badge.fury.io/rb/subtitle_it.svg)](http://badge.fury.io/rb/subtitle_it)
+[![Build Status](https://travis-ci.org/nofxx/subtitle_it.svg?branch=master)](https://travis-ci.org/nofxx/subtitle_it)
+[![Dependency Status](https://gemnasium.com/nofxx/subtitle_it.svg)](https://gemnasium.com/nofxx/subtitle_it)
+
+
 Ruby tool to download, create, convert and fix subtitles.
 
 
-# FEATURES
+## Features
 
-* Automatic Download on the terminal
+* **Automatic Download** on the terminal
 * To and from: SRT, SUB, XML(TT), YML, MPL2, RSB and ASS.
 * Fixes delays. (SrtResync)
 * Compatibility with "sube" (http://github.com/vic/sube)
+* Detects and converts any encoding to `UTF-8`
 
 
-# SYNOPSIS
+## Synopsis
 
 Download subtitle:
 
-  subtitle_it Cool-Video.avi
+    subtitle_it Cool-Video.avi
+
+This will search all languages for the video.
+
+```
+Found 88 results:
+
+   1.    Finnish | SRT | Movie / 2015 | 0.0 | FPS 23.976 | 1 CDs | 2015-05-18
+   2.    English | SRT | Movie / 2015 | 0.0 | FPS 23.976 | 1 CDs | 2015-05-18
+   3.   Romanian | SRT | Movie / 2015 | 0.0 | FPS 23.976 | 1 CDs | 2015-05-18
+   4.     Polish | SRT | Movie / 2015 | 0.0 | FPS 23.976 | 1 CDs | 2015-05-18
+   5.    Italian | SRT | Movie / 2015 | 0.0 | FPS 23.976 | 1 CDs | 2015-05-18
+   6.  Portugues | SRT | Movie / 2015 | 0.0 | FPS 23.976 | 1 CDs | 2015-05-18
+   7.  Bulgarian | SRT | Movie / 2015 | 0.0 | FPS 0.000  | 1 CDs | 2015-05-18
+   8.   Romanian | SRT | Movie / 2015 | 0.0 | FPS 25.000 | 1 CDs | 2015-05-18
+   9.   Japanese | SRT | Movie / 2015 | 0.0 | FPS 23.976 | 1 CDs | 2015-05-18
+
+You can choose multiple ones separated with spaces: 1 3 5
+Or a range separated with a hifen: 3-5
+Choose (1..88): _
+```
 
-This will search all languages for the video. You can filter:
+You can filter by language:
 
-  subtitle_it -l Eng Cool-Video.avi
+    subtitle_it -l Eng Cool-Video.avi
 
 You can use -c option. It convert subtitles to given format:
 
-  subtitle_it -l Eng -c srt Cool-Video.avi
+    subtitle_it -l Eng -c srt Cool-Video.avi
 
-## Bash tool
+### Bash tool
 
 Convert a srt to sub:
-  subtitle_it in.srt out.sub
-  or
-  subtitle_it -c sub in.srt
+
+    subtitle_it in.srt out.sub
+
+or
+
+    subtitle_it -c sub in.srt
 
 Add a delay of 1 minute:
-  subtitle_it -d 60 in.srt
+
+    subtitle_it -d 60 in.srt
 
 Create a template
-  subtitle_it unexistent.file
+
+    subtitle_it unexistent.file
 
 
-# INSTALL
+## Install
 
- gem install 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:
@@ -67,14 +99,14 @@ Create a template to check it out.
 ## Automatic Download
 
 * OpenSubtitles.org   -  WORK SubtitleIt Agent
-* addic7ed.com        -  EVIL NOAPI
+* addic7ed.com        -  `gem install addic7ed`
 * legendas.tv         -  EVIL NOAPI
 
 
 *NOAPI = Mechanize playground...
 
 
-## DEV
+## Dev
 
 To run tests:
 
@@ -84,7 +116,11 @@ Documentation => doc
 Subtitle examples => spec/fixtures
 
 
-## SUBTITLE EDITORS
+## Others
+
+Series: https://github.com/michaelbaudino/addic7ed-ruby
+
+## Editors
 
 Try those nice editors too, if SubtitleIt does not fit your need:
 
@@ -105,29 +141,3 @@ Please visit:
 
 * http://github.com/nofxx/subtitle_it
 * Support http://www.podnapisi.net/
-
-## LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2008 Marcos Piccinini, Giovanni Rapagnani, Warlley Rezende
-
-
-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/bin/subtitle_it

@@ -29,7 +29,7 @@ BANNER
 
   opts.separator " Options are:"
 
-  opts.on("-l", "--language [LANGUAGE]", String,
+  opts.on("-l", "--language=LANGUAGE", String,
           "Language to search subtitles for, try it empty to see the supported ones.") do |ol|
     if ol.nil?
       puts Subdown.subtitle_languages
@@ -44,6 +44,8 @@ BANNER
   opts.on("-d", "--delay=DELAY", Float,
           "Delay to add/remove") { |o| OPTIONS[:delay] = o }
 
+  opts.on("-1", "--first") { OPTIONS[:first] = true }
+
   opts.on("-f", "--force", "Force overwrite") { OPTIONS[:force] = true }
 
   opts.on("-h", "--help",
@@ -63,5 +65,5 @@ if ARGV.empty?
   puts parser
   exit
 else
-  SubtitleIt::Bin.run! ARGV, OPTIONS[:lang], OPTIONS[:format], OPTIONS[:force], OPTIONS[:delay]
+  SubtitleIt::Bin.run! ARGV, OPTIONS[:lang], OPTIONS[:format], OPTIONS[:force], OPTIONS[:delay], OPTIONS[:first]
 end

data/lib/subtitle_it/bin.rb

@@ -13,7 +13,7 @@ module SubtitleIt
   end
 
   class Subdownloader
-    def run!(movie, lang = nil, dst_format = nil)
+    def run!(movie, lang = nil, dst_format = nil, first = false)
       @movie = Movie.new(movie)
       @down = Subdown.new
       @down.log_in!
@@ -22,13 +22,17 @@ module SubtitleIt
         puts 'No results found.'
         return
       end
-      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] }
+      unless first
+        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) }
+        puts 'You can choose multiple ones separated with spaces: 1 3 5 '
+        puts 'Or a range separated with a hifen: 3-5'
+        STDOUT.print "Choose (1..#{res.size}): "
+        choose = parse_input(STDIN.gets.chomp)
+        choose = choose.map { |c| res[c.to_i - 1] }
+      else
+        choose = [res.first]
+      end
       puts "Downloading #{choose.size} subtitle#{'s' if choose.size > 1}..."
       choose.each do |sub|
         down_a_sub(sub, dst_format)
@@ -40,7 +44,7 @@ module SubtitleIt
       dst_format ||= sub.format
       dump = @down.download_subtitle(sub)
       if sub.format != dst_format
-        subt = Subtitle.new(dump: dump, format: dst_format)
+        subt = Subtitle.new(dump: dump, format: sub.format)
         dump = subt.send :"to_#{dst_format}"
       end
       fname = @movie.filename[0..-4] + sub.info['SubLanguageID']
@@ -49,8 +53,9 @@ module SubtitleIt
 
     def print_option(r, index)
       date = Date.parse(r['SubAddDate'])
-      "  #{(index + 1).to_s.yellow}. #{r['LanguageName'][0,3].green}"\
-      " | #{r['SubFormat'].upcase.blue} | #{r['MovieName'].cyan}"\
+      "  #{(index + 1).to_s.rjust(2, ' ').yellow}."\
+      " #{r['LanguageName'][0, 9].rjust(10, ' ').green}"\
+      " | #{r['SubFormat'].upcase.blue} | #{r['MovieName'][0, 20].cyan}"\
       " / #{r['MovieYear'].cyan} | #{r['SubRating'].yellow}"\
       " | FPS #{r['MovieFPS']} | #{r['SubSumCD']} CDs | #{date}"
     end
@@ -69,13 +74,19 @@ module SubtitleIt
   end
 
   class Bin
-    def self.run!(argv, lang = nil, format = nil, force = false, _delay = nil)
+    def self.run!(argv, lang = nil, format = nil, force = false, _delay = nil, first = false)
       fail unless argv
+
+      @lang = lang
       @force = force
       @format = format
+      @first = first
 
       # TODO: generate_rsb
-      return unless File.exist?(argv[0])
+      unless File.exist?(argv[0])
+        puts "Can't find '#{argv.join}'".yellow
+        exit 1
+      end
 
       @file_in = argv[0]
       @file_in_ext = Bin.get_extension(@file_in)
@@ -86,7 +97,7 @@ module SubtitleIt
       end
 
       if MOVIE_EXTS.include? @file_in_ext
-        Subdownloader.new.run!(@file_in, lang, @format)
+        Subdownloader.new.run!(@file_in, @lang, @format, @first)
       elsif SUB_EXTS.include? @file_in_ext
         Subwork.new.run!(@file_in, @format)
       else

data/lib/subtitle_it/formats/mpl.rb

@@ -8,7 +8,7 @@
 module Formats
   include PlatformEndLine
   def parse_mpl
-    @raw.to_a.inject([]) do |i, l|
+    @raw.lines.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

data/lib/subtitle_it/formats/rsb.rb

@@ -11,7 +11,7 @@
 module Formats
   include PlatformEndLine
   def parse_rsb
-    inn = @raw.to_a
+    inn = @raw.lines
     @title = inn.delete_at(0).split(':')[1]
     @authors = inn.delete_at(0).split(':')[1]
     @version = inn.delete_at(0).split(':')[1]

data/lib/subtitle_it/formats/sub.rb

@@ -23,8 +23,7 @@ module Formats
   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.lines.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

data/lib/subtitle_it/subtitle.rb

@@ -13,9 +13,11 @@ module SubtitleIt
   SUB_EXTS = %w(srt sub smi txt ssa ass mpl xml yml rsb)
 
   class Subtitle
+    include Comparable
     include Formats
     attr_reader :id, :raw, :format, :lines, :style, :info, :filename, :rating, :language, :user, :release_name,
                 :osdb_id, :download_count, :download_url, :original_filename
+    attr_writer :style, :lines, :fps
 
     def initialize(args = {})
       # Looks like opensubtitle is the only provider around..
@@ -34,13 +36,10 @@ module SubtitleIt
         @download_url      = @info['SubDownloadLink'].to_s
       end
       @fps = args[:fps] || 23.976
-      parse_dump(args[:dump], args[:format]) if args[:dump]
+      return unless dump = args[:dump]
+      parse_dump(args[:dump], args[:format])
     end
 
-    attr_writer :style
-
-    attr_writer :fps
-
     def data=(data)
       @raw = data
     end
@@ -48,13 +47,24 @@ module SubtitleIt
     def <=>(other)
       rating <=> other.rating
     end
-    include Comparable
 
     private
 
+    # Force subtitles to be UTF-8
+    def encode_dump(dump)
+      dump = dump.read unless dump.kind_of?(String)
+
+      enc = CharlockHolmes::EncodingDetector.detect(dump)
+      if enc[:encoding] != 'UTF-8'
+        puts "Converting `#{enc[:encoding]}` to `UTF-8`".yellow
+        dump = CharlockHolmes::Converter.convert dump, enc[:encoding], 'UTF-8'
+      end
+      dump
+    end
+
     def parse_dump(dump, format)
       fail unless SUB_EXTS.include?(format)
-      @raw = dump.is_a?(String) ? dump : dump.read
+      @raw = encode_dump(dump)
       @format = format
       parse_lines!
     end
@@ -62,7 +72,5 @@ module SubtitleIt
     def parse_lines!
       self.lines = send :"parse_#{@format}"
     end
-
-    attr_writer :lines
   end
 end

data/lib/subtitle_it/version.rb

@@ -1,3 +1,3 @@
 module SubtitleIt
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/lib/subtitle_it.rb

@@ -1,6 +1,8 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__)) unless
 $LOAD_PATH.include?(File.dirname(__FILE__)) || $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
 require 'yaml'
+require 'nokogiri'
+require 'charlock_holmes'
 
 require 'subtitle_it/version'
 require 'subtitle_it/languages'
@@ -22,10 +24,10 @@ class Numeric
   end
 end
 
-if RUBY_PLATFORM >= '1.9'
+if RUBY_PLATFORM <= '1.9'
   class String
-    def to_a
-      lines.to_a
+    def lines
+      to_a
     end
   end
 end

data/spec/subtitle_it/bin_spec.rb

@@ -45,7 +45,7 @@ describe Bin do
   include BinspecHelper
 
   it 'should require ARGV' do
-    expect { Bin.run!(nil) }.to raise_error
+    expect { Bin.run!(nil) }.to raise_error RuntimeError
   end
 
   # Having a hard time testing the command line tool...
@@ -104,7 +104,7 @@ describe Subdownloader do
 
   it 'should get extension files' do
     expect(Bin.get_extension('Lots.of.dots.happen')).to eql('happen')
-    expect { Bin.get_extension('Nodotstoo') }.to raise_error
+    expect { Bin.get_extension('Nodotstoo') }.to raise_error RuntimeError
   end
 
   it 'should swap extensions' do

data/spec/subtitle_it/subdown_spec.rb

@@ -44,7 +44,7 @@ describe Subdown do
                                                                                                                      'seconds' => 0.004,
                                                                                                                      'token' => '')
     @down = Subdown.new
-    expect { @down.log_in! }.to raise_error
+    expect { @down.log_in! }.to raise_error XMLRPC::FaultException
     expect(@down).not_to be_logged_in
   end
 

data/subtitle_it.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
   s.date = Time.now.strftime("%Y-%m-%d")
   s.default_executable = 'subtitle_it'
 
-  s.homepage = 'http://github.com/nofxx/subtitle_it'
+  s.homepage    = 'http://github.com/nofxx/subtitle_it'
   s.description = 'Download, edit and create subtitles. Supports various formats.'
-  s.summary = 'Download, edit and create subtitles.'
+  s.summary     = 'Download, edit and create subtitles.'
   s.license     = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
@@ -26,7 +26,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'colorize'
   s.add_dependency 'nokogiri'
-  s.add_development_dependency 'rake', '~> 10.0'
-  s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'rspec-mocks', '~> 3.0'
+  s.add_dependency 'charlock_holmes'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subtitle_it
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Marcos Piccinini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -39,47 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: charlock_holmes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: Download, edit and create subtitles. Supports various formats.
 email: x@nofxx.com
 executables:
@@ -88,9 +60,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
+- Guardfile
 - History.txt
-- License.txt
+- MIT-LICENSE
 - README.md
 - Rakefile
 - VERSION
@@ -162,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Download, edit and create subtitles.
@@ -193,4 +168,3 @@ test_files:
 - spec/subtitle_it/subtime_spec.rb
 - spec/subtitle_it/subtitle_spec.rb
 - spec/subtitle_it_spec.rb
-has_rdoc: