encoder-tools 0.0.2 → 1.0.0

data/lib/encoder-tools/cli/subtitles.rb

@@ -5,6 +5,7 @@ module EncoderTools
       autoload :FixLengths, 'encoder-tools/cli/subtitles/fix_lengths'
       autoload :Offset,     'encoder-tools/cli/subtitles/offset'
       autoload :Renumber,   'encoder-tools/cli/subtitles/renumber'
+      autoload :SpellCheck, 'encoder-tools/cli/subtitles/spell_check'
     end
   end
 end

data/lib/encoder-tools/cli/subtitles/base.rb

@@ -2,12 +2,35 @@ module EncoderTools
   class CLI
     module Subtitles
       class Base < CLI::Base
+        def self.parser(parser=nil)
+          case parser
+          when nil
+            @parser || EncoderTools::Subtitles::Parser
+          when :default
+            @parser = EncoderTools::Subtitles::Parser
+          when :relaxed
+            @parser = EncoderTools::Subtitles::RelaxedParser
+          when Class
+            @parser = parser
+          else
+            raise ArgumentError, "unexpected parser type: #{parser.inspect}"
+          end
+        end
+
+        def parser
+          self.class.parser
+        end
+
         def parse(text)
-          EncoderTools::Subtitles::List.load(text)
+          EncoderTools::Subtitles::List.load(text, parser)
+        end
+
+        def read
+          parse(input.read)
         end
 
-        def parse_relaxed(text)
-          EncoderTools::Subtitles::List.load(text, EncoderTools::Subtitles::RelaxedParser)
+        def write(result)
+          output << result.to_s
         end
       end
     end

data/lib/encoder-tools/cli/subtitles/fix_lengths.rb

@@ -2,43 +2,57 @@ module EncoderTools
   class CLI
     module Subtitles
       class FixLengths < Base
-        THRESHOLD = 5
+        DEFAULT_THRESHOLD = 5
 
         def run
-          if long_subtitles.empty?
-            shell.say "No subtitles found over #{THRESHOLD}s"
-            return
-          end
+          begin
+            if long_subtitles? && fix_subtitles?
+              write fix_subtitles
+            end
 
-          if not shell.yes?("Found #{long_subtitles.size} long subtitles. Would you like to fix them?")
-            return
+            return nil
+          rescue Interrupt
+            # just return on ^C
           end
+        end
 
-          long_subtitles.each do |subtitle|
-            lines = subtitle.to_s.to_a
-            range = lines.shift.chomp
-            range += " (#{subtitle.duration.to_i}s)\n"
-            lines.unshift(range)
-            lines << "\n" << "\n"
+        private
+          def long_subtitles?
+            return true if long_subtitles.any?
 
-            shell.say(lines.join)
-            subtitle.duration = shell.ask("How long should it be?").to_i
+            shell.say "No subtitles found over #{threshold}s"
+            return false
           end
 
-          output << list.to_s
+          def fix_subtitles?
+            shell.yes?("Found #{long_subtitles.size} long subtitles. Would you like to fix them?")
+          end
 
-          return nil
-        end
+          def fix_subtitles
+            long_subtitles.each do |subtitle|
+              fix_subtitle(subtitle)
+            end
+            return list
+          end
+
+          def fix_subtitle(subtitle)
+            range = "%s (%s)" % [subtitle.range_string, subtitle.timestamp(subtitle.duration)]
+            shell.say([range, subtitle.text, '', ''].join("\n"))
+            subtitle.duration = BigDecimal(shell.ask("How long should it be?"))
+          end
 
-        private
           def long_subtitles
             @long_subtitles ||= list.entries.select do |subtitle|
-              subtitle.duration > THRESHOLD
+              subtitle.duration > threshold
             end
           end
 
           def list
-            @list ||= parse(input.read)
+            @list ||= read
+          end
+
+          def threshold
+            options[:threshold] || DEFAULT_THRESHOLD
           end
       end
     end

data/lib/encoder-tools/cli/subtitles/offset.rb

@@ -2,26 +2,47 @@ module EncoderTools
   class CLI
     module Subtitles
       class Offset < Base
+        NUMBER = '(\d+|\d*\.\d+)'
+        HH_MM_SS_OFFSET = %r{\A(?:(\d\d?):)?(\d\d?):(\d\d?)\Z}
+        ABSOLUTE_OFFSET = %r{\A#{NUMBER}\Z}
+        NEGATIVE_OFFSET = %r{\A-#{NUMBER}\Z}
+        POSITIVE_OFFSET = %r{\A\+#{NUMBER}\Z}
+
+        MIN_PER_HOUR = 60
+        SEC_PER_MIN  = 60
+
         def run
-          output << offset(parse(input.read), options[:offset]).to_s
+          value = if options[:set]
+                    options[:set]
+                  elsif options[:add]
+                    "+#{options[:add]}"
+                  elsif options[:subtract]
+                    "-#{options[:subtract]}"
+                  else
+                    raise ArgumentError, "Must provide a set, add, or subtract option to determine the offset"
+                  end
+
+          write offset(read, value)
         end
 
         protected
-          def offset(list, offset)
-            list.offset = parse_offset(list, offset)
+          def offset(list, value)
+            list.offset = parse_offset(list, value)
             return list
           end
 
-          def parse_offset(list, offset)
-            case offset
+          def parse_offset(list, value)
+            case value
             when Fixnum
-              offset
-            when /^\+(\d+)$/
-              list.offset + $1.to_i
-            when /^-(\d+)$/
-              list.offset - $1.to_i
-            when /^\d+$/
-              offset.to_i
+              value
+            when HH_MM_SS_OFFSET
+              ((BigDecimal($1 || '0') * MIN_PER_HOUR) + BigDecimal($2)) * SEC_PER_MIN + BigDecimal($3)
+            when POSITIVE_OFFSET
+              list.offset + BigDecimal($1)
+            when NEGATIVE_OFFSET
+              list.offset - BigDecimal($1)
+            when ABSOLUTE_OFFSET
+              BigDecimal(value)
             end
           end
       end

data/lib/encoder-tools/cli/subtitles/renumber.rb

@@ -2,8 +2,10 @@ module EncoderTools
   class CLI
     module Subtitles
       class Renumber < Base
+        parser :relaxed
+
         def run
-          output << parse_relaxed(input.read).to_s
+          write(read)
         end
       end
     end

data/lib/encoder-tools/cli/subtitles/spell_check.rb

@@ -0,0 +1,73 @@
+require 'set'
+
+module EncoderTools
+  class CLI
+    module Subtitles
+      class SpellCheck < Base
+        DEFAULT_DICT = '/usr/share/dict/words'.freeze
+
+        def run
+          write(read.each do |subtitle|
+            subtitle.text.gsub!(/\w+/) do |word|
+              fix_word(word)
+            end
+          end)
+        end
+
+        private
+
+        def fix_word(word)
+          return word if word?(word)
+          fix_ls_that_should_be_is(word)
+        end
+
+        def fix_ls_that_should_be_is(word)
+          # example: word == "bllllng"
+
+          ls = []
+
+          word.each_char.with_index do |char, i|
+            ls << i if char == 'l'
+          end
+
+          # ls == [1, 2, 3, 4]
+
+          ls.size.downto(1) do |n|
+            # substitute all 'l' with 'i' to start, then one less, etc
+            ls.combination(n) do |to_change|
+              # to_change == [1, 2, 3, 4], then [1, 2, 3], [1, 3, 4], etc
+              candidate = word.dup
+              to_change.each do |pos|
+                candidate[pos] = 'i'
+              end
+              # candidate == "biiiing", "biliing", "biiling", etc
+              return candidate if word?(candidate)
+            end
+          end
+
+          return word
+        end
+
+        def word?(word)
+          words.include?(word.downcase)
+        end
+
+        def words
+          @words ||= read_words
+        end
+
+        def read_words
+          if dict
+            Set.new(File.read(dict).split($/).map {|w| w.downcase })
+          else
+            raise ArgumentError, "Must provide a dictionary of valid words"
+          end
+        end
+
+        def dict
+          options.fetch(:dict, File.exist?(DEFAULT_DICT) ? DEFAULT_DICT : nil)
+        end
+      end
+    end
+  end
+end

data/lib/encoder-tools/subtitles/list.rb

@@ -24,6 +24,11 @@ module EncoderTools
         return str
       end
 
+      def each(&block)
+        entries.each(&block)
+        return self
+      end
+
       def self.load(input, parser_class=Parser)
         result = new
         parser = parser_class.new(input)

data/lib/encoder-tools/subtitles/parser.rb

@@ -7,7 +7,7 @@ module EncoderTools
       class ParseError < RuntimeError; end
 
       def initialize(input)
-        @scanner = StringScanner.new(input)
+        @scanner = StringScanner.new(Util::TextReader.read(input))
         @last_index = 0
       end
 

data/lib/encoder-tools/subtitles/subtitle.rb

@@ -29,12 +29,19 @@ module EncoderTools
           other.text == self.text
       end
 
+      def range_string
+        "#{timestamp range.begin} --> #{timestamp range.end}"
+      end
+
       def to_s
-        "#{timestamp range.begin} --> #{timestamp range.end}\n#{text}"
+        [range_string, text].join("\n")
       end
 
-      private
       def timestamp(value)
+        self.class.timestamp(value)
+      end
+
+      def self.timestamp(value)
         seconds = value.to_i
         millis = ((value - seconds) * 1000).to_i
         minutes, seconds = seconds.divmod(60)

data/lib/encoder-tools/util.rb

@@ -0,0 +1,5 @@
+module EncoderTools
+  module Util
+    autoload :TextReader, 'encoder-tools/util/text_reader'
+  end
+end

data/lib/encoder-tools/util/text_reader.rb

@@ -0,0 +1,26 @@
+module EncoderTools
+  module Util
+    class TextReader
+      ENCODING_MARKER = "\xef\xbb\xbf".freeze
+
+      def initialize(input)
+        @input = input
+      end
+
+      def read
+        strip_encoding_marker(
+          @input.respond_to?(:read) ?  @input.read : @input)
+      end
+
+      def self.read(input)
+        new(input).read
+      end
+
+      private
+        def strip_encoding_marker(string)
+          string[0, ENCODING_MARKER.size] == ENCODING_MARKER ?
+            string[ENCODING_MARKER.size..-1] : string
+        end
+    end
+  end
+end

data/lib/encoder-tools/version.rb

@@ -0,0 +1,3 @@
+module EncoderTools
+  VERSION = '1.0.0'.freeze
+end

metadata

@@ -1,66 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: encoder-tools
-version: !ruby/object:Gem::Version 
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Brian Donovan
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-
-date: 2010-02-14 00:00:00 -08:00
-default_executable: encoder-tools
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2017-12-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.1
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: yard
+  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
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Tools for ripping, encoding, and subtitling movies and TV shows
-email: brian.donovan@gmail.com
-executables: 
-- encoder-tools
+email:
+- me@brian-donovan.com
+executables: []
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
-- .document
-- .gitignore
+extra_rdoc_files: []
+files:
+- ".document"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
-- VERSION
+- bin/console
 - bin/encoder-tools
+- bin/setup
+- encoder-tools.gemspec
 - lib/encoder-tools.rb
 - lib/encoder-tools/cli.rb
 - lib/encoder-tools/cli/base.rb
@@ -69,6 +95,7 @@ files:
 - lib/encoder-tools/cli/subtitles/fix_lengths.rb
 - lib/encoder-tools/cli/subtitles/offset.rb
 - lib/encoder-tools/cli/subtitles/renumber.rb
+- lib/encoder-tools/cli/subtitles/spell_check.rb
 - lib/encoder-tools/options.rb
 - lib/encoder-tools/options/title.rb
 - lib/encoder-tools/strategies.rb
@@ -80,59 +107,31 @@ files:
 - lib/encoder-tools/subtitles/parser.rb
 - lib/encoder-tools/subtitles/relaxed_parser.rb
 - lib/encoder-tools/subtitles/subtitle.rb
-- spec/cli/subtitles/fix_lengths_spec.rb
-- spec/cli/subtitles/offset_spec.rb
-- spec/cli/subtitles/renumber_spec.rb
-- spec/fixtures/subtitles/adjusted-long-subtitles.srt
-- spec/fixtures/subtitles/bad-numbering-corrected.srt
-- spec/fixtures/subtitles/bad-numbering.srt
-- spec/fixtures/subtitles/kill-bill-vol-2.srt
-- spec/fixtures/subtitles/no-long-subtitles.srt
-- spec/fixtures/subtitles/short-example-offset-2.srt
-- spec/fixtures/subtitles/short-example-offset-minus-2.srt
-- spec/fixtures/subtitles/short-example-offset-plus-2.srt
-- spec/fixtures/subtitles/short-example.srt
-- spec/fixtures/subtitles/some-long-subtitles.srt
-- spec/options/title_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/strategies/movie_spec.rb
-- spec/subtitles/list_spec.rb
-- spec/subtitles/subtitle_spec.rb
-has_rdoc: true
-homepage: http://github.com/eventualbuddha/encoder-tools
-licenses: []
-
+- lib/encoder-tools/util.rb
+- lib/encoder-tools/util/text_reader.rb
+- lib/encoder-tools/version.rb
+homepage: https://github.com/eventualbuddha/encoder-tools
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 2.5.2
 signing_key: 
-specification_version: 3
-summary: Some tools to make encoding from DVDs easier
-test_files: 
-- spec/cli/subtitles/fix_lengths_spec.rb
-- spec/cli/subtitles/offset_spec.rb
-- spec/cli/subtitles/renumber_spec.rb
-- spec/options/title_spec.rb
-- spec/spec_helper.rb
-- spec/strategies/movie_spec.rb
-- spec/subtitles/list_spec.rb
-- spec/subtitles/subtitle_spec.rb
+specification_version: 4
+summary: Tools for ripping, encoding, and subtitling movies and TV shows
+test_files: []