subtitle_it 1.9.0 → 2.0.0

data/lib/subtitle_it/generator.rb

@@ -1,9 +1,9 @@
 module SubtitleIt
   #   class Generate
-  #     def generate_rsb(filename)      
+  #     def generate_rsb(filename)
   #       dump = <<GEN
   # - title: #{argv[0]}
-  # - authors: FIXME 
+  # - authors: FIXME
   # - version: FIXME
   # 00:05:26.500 => 00:05:28.500 == worth killing for...
   # 00:06:00.400 => 00:06:03.400 == worth dying for...

data/lib/subtitle_it/languages.rb

@@ -7,58 +7,57 @@ module SubtitleIt
   #
   # Need to rewrite "Portuguese" => [:pt, :por, :whatever]
   LANGS = {
-    :aa =>  'Afar',
-    :ab =>  'Abkhazian',
-    :af =>  'Afrikaans',
-    :ak =>  'Akan',
-    :ay =>  'Assyrian',
-    :sq =>  'Albanian',
-    :am =>  'Amharic',
-    :ar =>  'Arabic',
-    :br =>  ['Brazilian', 'por'],
-    :hy =>  'Armenian',
-    :bs =>  'Bosnian',
-    :bg =>  'Bulgarian',
-    :ca =>  'Catalan',
-    :cs =>  'Czech',
-    :da =>  'Danish',
-    :nl =>  'Dutch',
-    :en =>  ['English','eng'],
-    :et =>  'Estonian',
-    :fr =>  ['French', 'fra'],
-    :de =>  'German',
-    :gl =>  'Galician',
-    :el =>  'Greek',
-    :he =>  'Hebrew',
-    :hi =>  'Hindi',
-    :hr =>  'Croatian',
-    :hu =>  'Hungarian',
-    :is =>  'Icelandic',
-    :id =>  'Indonesian',
-    :it =>  'Italian',
-    :ja =>  'Japanese',
-    :kk =>  'Kazakh',
-    :ko =>  'Korean',
-    :lv =>  'Latvian',
-    :lt =>  'Lithuanian',
-    :lb =>  'Luxembourgish',
-    :mk =>  'Macedonian',
-    :ms =>  'Malay',
-    :no =>  'Norwegian',
-    :pl =>  'Polish',
-    :pt =>  'Portuguese',
-    :ru =>  'Russian',
-    :sr =>  'Serbian',
-    :es =>  'Spanish',
-    :sk =>  'Slovak',
-    :sl =>  'Slovenian',
-    :sv =>  'Swedish',
-    :th =>  'Thai',
-    :tr =>  'Turkish',
-    :uk =>  'Ukrainian',
-    :vi =>  'Vietnamese',
-    :ro =>  'Romanian',
-    :zh =>  'Chinese'
+    aa: 'Afar',
+    ab: 'Abkhazian',
+    af: 'Afrikaans',
+    ak: 'Akan',
+    ay: 'Assyrian',
+    sq: 'Albanian',
+    am: 'Amharic',
+    ar: 'Arabic',
+    br: %w(Brazilian por),
+    hy: 'Armenian',
+    bs: 'Bosnian',
+    bg: 'Bulgarian',
+    ca: 'Catalan',
+    cs: 'Czech',
+    da: 'Danish',
+    nl: 'Dutch',
+    en: %w(English eng),
+    et: 'Estonian',
+    fr: %w(French fra),
+    de: 'German',
+    gl: 'Galician',
+    el: 'Greek',
+    he: 'Hebrew',
+    hi: 'Hindi',
+    hr: 'Croatian',
+    hu: 'Hungarian',
+    is: 'Icelandic',
+    id: 'Indonesian',
+    it: 'Italian',
+    ja: 'Japanese',
+    kk: 'Kazakh',
+    ko: 'Korean',
+    lv: 'Latvian',
+    lt: 'Lithuanian',
+    lb: 'Luxembourgish',
+    mk: 'Macedonian',
+    ms: 'Malay',
+    no: 'Norwegian',
+    pl: 'Polish',
+    pt: 'Portuguese',
+    ru: 'Russian',
+    sr: 'Serbian',
+    es: 'Spanish',
+    sk: 'Slovak',
+    sl: 'Slovenian',
+    sv: 'Swedish',
+    th: 'Thai',
+    tr: 'Turkish',
+    uk: 'Ukrainian',
+    vi: 'Vietnamese',
+    ro: 'Romanian',
+    zh: 'Chinese'
   }
-
 end

data/lib/subtitle_it/movie.rb

@@ -1,23 +1,43 @@
-# downsub - github.com/johanlunds/downsub
-require 'subtitle_it/movie_hasher'
-
 module SubtitleIt
   class Movie
-
     attr_reader :filename
     attr_accessor :info
+    CHUNK_SIZE = 64 * 1024 # in bytes
 
     def initialize(filename)
       @filename = filename
       @info = {}
     end
 
+    def compute_haxx
+      filesize = File.size(@filename)
+      out = filesize
+
+      # Read 64 kbytes, divide up into 64 bits and add each
+      # to hash. Do for beginning and end of file.
+      File.open(filename, 'rb') do |f|
+        # Q = unsigned long long = 64 bit
+        f.read(CHUNK_SIZE).unpack('Q*').each do |n|
+          out = out + n & 0xffffffffffffffff # to remain as 64 bit number
+        end
+
+        f.seek([0, filesize - CHUNK_SIZE].max, IO::SEEK_SET)
+
+        # And again for the end of the file
+        f.read(CHUNK_SIZE).unpack('Q*').each do |n|
+          out = out + n & 0xffffffffffffffff
+        end
+      end
+
+      sprintf('%016x', out)
+    end
+
     def haxx
-      @haxx ||= MovieHasher::compute_haxx(@filename)
+      @haxx ||= compute_haxx
     end
 
     def size
       @size ||= File.size(@filename)
     end
   end
-end
+end

data/lib/subtitle_it/platform_endl.rb

@@ -1,9 +1,11 @@
 module PlatformEndLine
-  def platform( raw ) 
-    raw =~ /\r\n/ ? "WIN" : "UNIX"
+  def platform(raw)
+    raw =~ /\r\n/ ? 'WIN' : 'UNIX'
+  rescue ArgumentError => e
+    'WIN'
   end
-  def endline( raw )
-    platform( raw ) == "WIN" ? "\r\n" : "\n"
+
+  def endline(raw)
+    platform(raw) == 'WIN' ? "\r\n" : "\n"
   end
 end
-

data/lib/subtitle_it/subdown.rb

@@ -8,12 +8,12 @@ require 'subtitle_it/subtitle'
 require 'subtitle_it/languages'
 
 module SubtitleIt
+  # Download subtitles
   class Subdown
-    HOST = "http://api.opensubtitles.org/xml-rpc"
-    HOST_DEV = "http://dev.opensubtitles.org/xml-rpc"
+    HOST = 'http://api.opensubtitles.org/xml-rpc'
+    HOST_DEV = 'http://dev.opensubtitles.org/xml-rpc'
 
-   # USER_AGENT = "SubDownloader #{SubtitleIt::VERSION::STRING}"
-    USER_AGENT = "SubtitleIt #{SubtitleIt::VERSION::STRING}"
+    USER_AGENT = "SubtitleIt #{SubtitleIt::VERSION}"
 
     NO_TOKEN = %w(ServerInfo LogIn)
 
@@ -40,12 +40,9 @@ module SubtitleIt
       request('ServerInfo')
     end
 
-    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."
+    def search_subtitles(movie, lang_name = nil)
       args = {
-        'sublanguageid' => lang_name || "",
+        'sublanguageid' => lang_name || '',
         'moviehash'     => movie.haxx,
         'moviebytesize' => movie.size
       }
@@ -53,7 +50,7 @@ module SubtitleIt
       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})
+        subs << Subtitle.new(info: sub_info)
         subs
       end
     end
@@ -63,12 +60,12 @@ module SubtitleIt
       sub.data = self.class.decode_and_unzip(result['data'][0]['data'])
     end
 
-    def upload_subtitle(movie, subs)
+    def upload_subtitle(_movie, _subs)
     end
 
     def imdb_info(movie)
       result = request('CheckMovieHash', [movie.haxx])
-      movie.info = result['data'][movie.haxx] # TODO: Handle if no result for movie
+      movie.info = result['data'][movie.haxx] # TODO: Handle if movie 404
     end
 
     def self.subtitle_languages
@@ -76,38 +73,38 @@ module SubtitleIt
         "#{k} -> #{v}"
       end.join("\n")
     end
-#
-#    def Subdown.opsub_id( language )   # Get the Opensubtitle.org language id from the language string (e.g. 'French' returns 'fra' )
-#      ary = LANGS.find do |sym_lang|
-#        sym_lang if sym_lang[1].downcase == language.downcase
-#      end
-#      OPSUB_LANGS[ ary[0] ]
-#    end
-
-#    def Subdown.subtitle_languages
-#      lang_ary = []
-#      OPSUB_LANGS.each_key do |key|
-#        lang_ary.push( LANGS[key] )
-#      end
-#      lang_ary.sort.inject( "" ) { |str, lang| str << lang + " " }
-#    end
+    #
+    # Get the Opensubtitle.org language id from the language string
+    # (e.g. 'French' returns 'fra' )
+    #    def Subdown.opsub_id( language )
+    #      ary = LANGS.find do |sym_lang|
+    #        sym_lang if sym_lang[1].downcase == language.downcase
+    #      end
+    #      OPSUB_LANGS[ ary[0] ]
+    #    end
+
+    #    def Subdown.subtitle_languages
+    #      lang_ary = []
+    #      OPSUB_LANGS.each_key do |key|
+    #        lang_ary.push( LANGS[key] )
+    #      end
+    #      lang_ary.sort.inject( "" ) { |str, lang| str << lang + " " }
+    #    end
 
     private
 
     def request(method, *args)
-
       unless NO_TOKEN.include? method
-        raise 'Need to be logged in for this.' unless logged_in?
+        fail 'Need to be logged in for this.' unless logged_in?
         args = [@token, *args]
       end
 
-            p method, args
       result = @client.call(method, *args)
-      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'
+        # 'status' of the form 'XXX Message'
+        fail XMLRPC::FaultException.new(result['status'].to_i,
+                                        result['status'][4..-1])
       end
 
       result

data/lib/subtitle_it/subline.rb

@@ -2,24 +2,24 @@
 # Holds a subtitle`s line.
 module SubtitleIt
   class Subline
-    attr_accessor :time_on, :time_off, :text    
+    attr_accessor :time_on, :time_off, :text
     # time_on/off may be:
     # HH:MM:SS,MMM
     # MM:SS
-    # S 
+    # S
     # text lines should be separated by |
-    def initialize(time_on, time_off, text)          
+    def initialize(time_on, time_off, text)
       @time_on, @time_off = filter(time_on, time_off)
       # ugly FIXME: when pseudo uses time => 3 or TT format
       # need to add seconds on time_off to time_on
       @time_off += @time_on if @time_off < @time_on
       @text = text
     end
-    
+
     def filter(*args)
       args.map do |arg|
         Subtime.new(arg)
       end
     end
   end
-end
+end

data/lib/subtitle_it/substyle.rb

@@ -1,11 +1,5 @@
 module SubtitleIt
   class Substyle
-    #TODO
-    
-    
-    
-    
-    
-    
-  end  
-end
+    # TODO
+  end
+end

data/lib/subtitle_it/subtime.rb

@@ -1,11 +1,12 @@
 # SubtitleIt
 # Time class
 module SubtitleIt
+  # A kinda of Time
   class Subtime
     attr_accessor :hrs, :min, :sec, :ms
 
     def initialize(data)
-      raise if data == nil
+      fail if data.nil?
       parse_data(data)
     end
 
@@ -18,28 +19,36 @@ module SubtitleIt
         @hrs, @min = @min.divmod(60)
       when String
         time, float = data.split(/\.|\,/)
-        time = time.split(/:/).map { |s| s.to_i }
-        @ms =  (("0.%d" % float.to_i).to_f * 1000).to_i if float
+        time = time.split(/:/).map(&:to_i)
+        @ms =  (('0.%d' % float.to_i).to_f * 1000).to_i if float
         @sec, @min, @hrs = time.reverse
-      else raise "Format unknown."
+      else fail 'Format unknown.'
       end
-      #FIXME: dunno what to do about this.. nil = problems with to_i
+      # FIXME: dunno what to do about this.. nil = problems with to_i
       @hrs ||= 0; @min ||= 0; @sec ||= 0;  @ms ||= 0
     end
 
     # to_s(separator) => to_s(",") => 00:00:00,000
-    def to_s(sep='.')
+    def to_s(sep = '.')
       "%02d:%02d:%02d#{sep}%03d" % [@hrs, @min, @sec,  @ms]
     end
 
     # return time as a total in ms
     def to_i
-      ( @hrs * 3600 + @min * 60 + @sec ) * 1000 + @ms
+      (@hrs * 3600 + @min * 60 + @sec) * 1000 + @ms
     end
 
-    def +(other);   Subtime.new(self.to_i + other.to_i);    end
-    def -(other);   Subtime.new(self.to_i - other.to_i);    end
-    def <=>(other);      self.to_i <=> other.to_i;    end
+    def +(other)
+      Subtime.new(to_i + other.to_i)
+    end
+
+    def -(other)
+      Subtime.new(to_i - other.to_i)
+    end
+
+    def <=>(other)
+      to_i <=> other.to_i
+    end
     include Comparable
   end
 end

data/lib/subtitle_it/subtitle.rb

@@ -9,21 +9,19 @@ require 'subtitle_it/formats/mpl'
 # http://www.opensubtitles.org/addons/export_languages.php
 
 module SubtitleIt
-  
   MOVIE_EXTS = %w(3g2 3gp 3gp2 3gpp 60d ajp asf asx avchd avi bik bix box cam dat divx dmf dv dvr-ms evo flc fli flic flv flx gvi gvp h264 m1v m2p m2ts m2v m4e m4v mjp mjpeg mjpg mkv moov mov movhd movie movx mp4 mpe mpeg mpg mpv mpv2 mxf nsv nut ogg ogm omf ps qt ram rm rmvb swf ts vfw vid video viv vivo vob vro wm wmv wmx wrap wvx wx x264 xvid)
   SUB_EXTS = %w(srt sub smi txt ssa ass mpl xml yml rsb)
-  
-  
-  class Subtitle    
+
+  class Subtitle
     include Formats
     attr_reader :id, :raw, :format, :lines, :style, :info, :filename, :rating, :language, :user, :release_name,
                 :osdb_id, :download_count, :download_url, :original_filename
-    
+
     def initialize(args = {})
       # Looks like opensubtitle is the only provider around..
       # If a second one comes need big refactor...
       if @info = args[:info]
-        #@osdb_info         = info
+        # @osdb_info         = info
         @osdb_id           = @info['IDSubtitleFile'].to_s
         @original_filename = @info['SubFileName'].to_s
         @format            = @info['SubFormat'].to_s
@@ -35,42 +33,36 @@ module SubtitleIt
         @uploaded_at       = @info['SubAddDate'].to_s # TODO: convert to time object?
         @download_url      = @info['SubDownloadLink'].to_s
       end
-      @fps = args[:fps] || 23.976      
+      @fps = args[:fps] || 23.976
       parse_dump(args[:dump], args[:format]) if args[:dump]
     end
-    
-    def style=(s)
-      @style = s
-    end
-    
-    def fps=(fps)
-      @fps = fps
-    end
-    
+
+    attr_writer :style
+
+    attr_writer :fps
+
     def data=(data)
       @raw = data
     end
-    
+
     def <=>(other)
-      self.rating <=> other.rating
+      rating <=> other.rating
     end
     include Comparable
 
     private
-    
-    def parse_dump(dump,format)
-      raise unless SUB_EXTS.include?(format)
-      @raw = dump.kind_of?(String) ? dump : dump.read
+
+    def parse_dump(dump, format)
+      fail unless SUB_EXTS.include?(format)
+      @raw = dump.is_a?(String) ? dump : dump.read
       @format = format
       parse_lines!
     end
-    
+
     def parse_lines!
-      self.lines = send :"parse_#{@format}"      
+      self.lines = send :"parse_#{@format}"
     end
-    
-    def lines=(lines)
-      @lines = lines
-    end  
+
+    attr_writer :lines
   end
 end

data/lib/subtitle_it/version.rb

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

data/lib/subtitle_it.rb

@@ -1,6 +1,7 @@
-$:.unshift(File.dirname(__FILE__)) unless
-$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-require 'rubygems'
+$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 'subtitle_it/version'
 require 'subtitle_it/languages'
 require 'subtitle_it/subtime'
@@ -17,15 +18,14 @@ end
 
 class Numeric
   def reduce
-    self / ( 10 ** Math::log10(self).to_i)
+    self / 10**Math.log10(self).to_i
   end
 end
 
-if RUBY_PLATFORM >= "1.9"
+if RUBY_PLATFORM >= '1.9'
   class String
     def to_a
-      self.lines.to_a
+      lines.to_a
     end
   end
 end
-

data/spec/fixtures/movie.xml

@@ -10,7 +10,7 @@
   </head>
   <body>
    <div xml:lang="en">
-    <p begin="00:00:00.00" dur="00:00:03.07">I had just joined <span tts:fontFamily="monospaceSansSerif,proportionalSerif,TheOther"tts:fontSize="+2">Macromedia</span> in 1996,</p>
+    <p begin="00:00:00.00" dur="00:00:03.07">I had just joined <span tts:fontFamily="monospaceSansSerif,proportionalSerif,TheOther" tts:fontSize="+2">Macromedia</span> in 1996,</p>
     <p begin="00:00:03.07" dur="00:00:03.35">and we were trying to figure out what to do about the internet.</p>
     <p begin="00:00:06.42" dur="00:00:03.15">And the company was in dire straights at the time.</p>
     <p begin="00:00:09.57" dur="00:00:01.45">We were a CD-ROM authoring company,</p>
@@ -25,4 +25,4 @@
     <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>
+</tt>

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
+require 'colorize'
 require 'rspec'
-require 'rspec_spinner'
+require 'rspec/mocks'
 
-$:.unshift(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 require 'subtitle_it'
 include SubtitleIt
 
@@ -31,7 +32,6 @@ module SubFixtures
   end
 end
 
-
 # ##
 # rSpec Hash additions.
 #
@@ -45,7 +45,7 @@ class Hash
   #   { :a => 1, :b => 2, :c => 3 }.except(:a)
   #   => { :b => 2, :c => 3 }
   def except(*keys)
-    self.reject { |k,v| keys.include?(k || k.to_sym) }
+    reject { |k, _v| keys.include?(k || k.to_sym) }
   end
   ##
   # Override some keys.
@@ -53,7 +53,7 @@ class Hash
   #   { :a => 1, :b => 2, :c => 3 }.with(:a => 4)
   #   => { :a => 4, :b => 2, :c => 3 }
   def with(overrides = {})
-    self.merge overrides
+    merge overrides
   end
   ##
   # Returns a Hash with only the pairs identified by +keys+.
@@ -61,6 +61,6 @@ class Hash
   #   { :a => 1, :b => 2, :c => 3 }.only(:a)
   #   => { :a => 1 }
   def only(*keys)
-    self.reject { |k,v| !keys.include?(k || k.to_sym) }
+    reject { |k, _v| !keys.include?(k || k.to_sym) }
   end
 end