addic7ed 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ebc7f9074008da1133b498fd7298f73bbcbe831
-  data.tar.gz: 4bb383de643b01367f692df1c95ae9279ea9a724
+  metadata.gz: 31b2fe4ded0361b2b026b14726c480224ab5244a
+  data.tar.gz: aa80369c98fa0c5d69bf69ce6aa9ea6946f76a49
 SHA512:
-  metadata.gz: 17d850861b9c8d358614b8d1f3f9d010c5affa2064a10a1bc61af1df54dd7089eb987d022d1b24ec0de2be92c5f6bc4350d4784c086eee5863530684ea7f606a
-  data.tar.gz: e8f3d3595de26c98da217eb685a8c4bed7cfd7dd038178b25fccd706964d6d063222ab9139f4af80a018ac39a1c95463eede23b22eeec5c0c303a7a7617a693a
+  metadata.gz: a1b988d4a1177cfda71df10c16a0948aab0119f59a68a1033cc4abe1bdb8ad30d21822593a57488546e507e49a07b6fc5f91b116f27424d2a3be70eade8ba8b9
+  data.tar.gz: 17f09e0086fa85b5a7fb7973ecc0d3df0d2af9dc1a11fd1b706d55e51579a84ac08ee6e7dc8c218ed82be02cc1c49cb32698b74dfd128c87997632f1990ed835

data/bin/addic7ed

@@ -21,6 +21,10 @@ OptionParser.new do |opts|
     options[:language] = l
   end
 
+  opts.on("--no-hi", "Only download subtitles without Hearing Impaired lines") do |hi|
+    options[:no_hi] = !hi
+  end
+
   opts.on("-a", "--all-subtitles", "Display all available subtitles") do |a|
     options[:all] = a
   end
@@ -96,13 +100,13 @@ options[:filenames].each do |filename|
       end
       next if options[:all]
     end
-    ep.best_subtitle(options[:language])
+    ep.best_subtitle(options[:language], options[:no_hi])
     if options[:verbose]
       puts '  Best subtitle:'
       puts "    #{ep.best_subtitle(options[:language])}"
     end
     unless options[:nodownload]
-      ep.download_best_subtitle!(options[:language])
+      ep.download_best_subtitle!(options[:language], options[:no_hi])
       puts "New subtitle downloaded for #{filename}.\nEnjoy your show :-)".gsub(/^/, options[:verbose] ? '  ' : '') unless options[:quiet]
     end
   rescue Addic7ed::InvalidFilename

data/lib/addic7ed/episode.rb

@@ -23,18 +23,18 @@ module Addic7ed
       return @subtitles[lang]
     end
 
-    def best_subtitle(lang = 'fr')
+    def best_subtitle(lang = 'fr', no_hi = false)
       check_language_availability(lang)
-      find_best_subtitle(lang) unless @best_subtitle and @best_subtitle[lang]
+      find_best_subtitle(lang, no_hi) unless @best_subtitle and @best_subtitle[lang]
       return @best_subtitle[lang]
     end
 
-    def download_best_subtitle!(lang, http_redirect_limit = 8)
+    def download_best_subtitle!(lang, no_hi = false, http_redirect_limit = 8)
       raise HTTPError.new('Too many HTTP redirects') unless http_redirect_limit > 0
-      uri = URI(best_subtitle(lang).url)
+      uri = URI(best_subtitle(lang, no_hi).url)
       response = get_http_response(uri, url(lang))
       if response.kind_of?(Net::HTTPRedirection)
-        follow_redirection(lang, response['location'], http_redirect_limit)
+        follow_redirection(lang, no_hi, response['location'], http_redirect_limit)
       else
         save_subtitle(response.body, lang)
       end
@@ -48,10 +48,10 @@ module Addic7ed
       @subtitles[lang] = parser.extract_subtitles
     end
 
-    def find_best_subtitle(lang)
+    def find_best_subtitle(lang, no_hi = false)
       @best_subtitle ||= {}
       subtitles(lang).each do |sub|
-        @best_subtitle[lang] = sub if sub.works_for? video_file.group and sub.can_replace? @best_subtitle[lang]
+        @best_subtitle[lang] = sub if sub.works_for?(video_file.group, no_hi) and sub.can_replace? @best_subtitle[lang]
       end
       raise NoSubtitleFound unless @best_subtitle[lang]
     end
@@ -77,11 +77,11 @@ module Addic7ed
       raise DownloadError
     end
 
-    def follow_redirection(lang, new_uri, http_redirect_limit)
+    def follow_redirection(lang, no_hi, new_uri, http_redirect_limit)
       # Addic7ed is serving redirection URL not-encoded, but Ruby does not support it (see http://bugs.ruby-lang.org/issues/7396)
       best_subtitle(lang).url = URI.escape(new_uri)
       raise DownloadLimitReached if /^\/downloadexceeded.php/.match best_subtitle(lang).url
-      download_best_subtitle!(lang, http_redirect_limit - 1)
+      download_best_subtitle!(lang, no_hi, http_redirect_limit - 1)
     end
 
     def save_subtitle(content, lang)

data/lib/addic7ed/parser.rb

@@ -44,6 +44,7 @@ module Addic7ed
         status:    extract_status(sub_node),
         url:       extract_url(sub_node),
         source:    extract_source(sub_node),
+        hi:        extract_hi(sub_node),
         downloads: extract_downloads(sub_node),
         comment:   extract_comment(sub_node)
       )
@@ -78,6 +79,12 @@ module Addic7ed
       source_node['href'] if source_node
     end
 
+    def extract_hi(sub_node)
+      hi_node = sub_node.css('tr:nth-child(4) td.newsDate').children[1]
+      raise Addic7ed::ParsingError unless hi_node
+      !hi_node.attribute("title").nil?
+    end
+
     def extract_downloads(sub_node)
       downloads_node = sub_node.css('tr:nth-child(4) td.newsDate').first
       raise Addic7ed::ParsingError unless downloads_node

data/lib/addic7ed/subtitle.rb

@@ -10,6 +10,7 @@ module Addic7ed
       @status    = options[:status]
       @url       = options[:url]
       @via       = options[:via]
+      @hi        = options[:hi]
       @downloads = options[:downloads].to_i || 0
       @comment   = normalize_comment(options[:comment])
     end
@@ -18,8 +19,9 @@ module Addic7ed
       "#{url}\t->\t#{version} (#{language}, #{status}) [#{downloads} downloads]#{" (via #{via})" if via}"
     end
 
-    def works_for?(version = '')
-      is_completed? and is_compatible_with? version
+    def works_for?(version = '', no_hi = false)
+      hi_works = !@hi || !no_hi
+      is_completed? and is_compatible_with? version and hi_works
     end
 
     def can_replace?(other_subtitle)
@@ -60,6 +62,8 @@ module Addic7ed
     end
 
     def commented_as_compatible_with?(other_version)
+      return false if /(won't|doesn't|not) +work/i.match comment
+      return false if /resync +(from|of)/i.match comment
       res   = comment.include? other_version.downcase
       res ||= comment.include? COMPATIBILITY_720P[other_version].downcase if COMPATIBILITY_720P[other_version]
       res ||= comment.include? COMPATIBILITY_720P[version].downcase       if COMPATIBILITY_720P[version]

data/lib/addic7ed/version.rb

@@ -1,3 +1,3 @@
 module Addic7ed
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/lib/addic7ed/video_file.rb

@@ -1,18 +1,19 @@
 module Addic7ed
   class VideoFile
 
-    TVSHOW_REGEX = /\A(?<showname>.*\w)[\[\. ]+S?(?<season>\d{1,2})[-\. ]?[EX]?(?<episode>\d{2})([-\. ]?[EX]?\d{2})*[\]\. ]+(?<tags>.*)-(?<group>\w*)(\.\w{3})?\z/i
+    TVSHOW_REGEX = /\A(?<showname>.*\w)[\[\. ]+S?(?<season>\d{1,2})[-\. ]?[EX]?(?<episode>\d{2})([-\. ]?[EX]?\d{2})*[\]\. ]+(?<tags>.*)-(?<group>\w*)\[?(?<distribution>\w*)\]?(\.\w{3})?\z/i
 
-    attr_reader :filename, :showname, :season, :episode, :tags, :group
+    attr_reader :filename, :showname, :season, :episode, :tags, :group, :distribution
 
     def initialize(filename)
       @filename = filename
       if match = TVSHOW_REGEX.match(basename)
-        @showname = match[:showname].gsub('.', ' ')
-        @season   = match[:season].to_i
-        @episode  = match[:episode].to_i
-        @tags     = match[:tags].upcase.split(/[\. ]/)
-        @group    = match[:group].upcase
+        @showname     = match[:showname].gsub('.', ' ')
+        @season       = match[:season].to_i
+        @episode      = match[:episode].to_i
+        @tags         = match[:tags].upcase.split(/[\. ]/)
+        @group        = match[:group].upcase
+        @distribution = match[:distribution].upcase
       else
         raise InvalidFilename
       end
@@ -49,11 +50,12 @@ module Addic7ed
 
     def inspect
 "Guesses for #{@filename}:
-  show:    #{@showname}
-  season:  #{@season}
-  episode: #{@episode}
-  tags:    #{@tags}
-  group:   #{@group}"
+  show:         #{@showname}
+  season:       #{@season}
+  episode:      #{@episode}
+  tags:         #{@tags}
+  group:        #{@group}
+  distribution: #{@distribution}"
     end
 
   end

data/spec/lib/addic7ed/episode_spec.rb

@@ -7,6 +7,7 @@ describe Addic7ed::Episode do
     @filename_show_not_found = 'Show.Not.Found.S03E02.720p.HDTV.x264-EVOLVE.mkv'
     @filename_episode_not_found = 'The.Walking.Dead.S03E42.720p.HDTV.x264-EVOLVE.mkv'
     @filename_compatible_group = 'The.Walking.Dead.S03E04.HDTV.XviD-ASAP.mkv'
+    @filename_no_hi = 'The.Walking.Dead.S03E02.720p.HDTV.x264-KILLERS.mkv'
     @episode = Addic7ed::Episode.new(@filename)
   end
 
@@ -78,6 +79,13 @@ describe Addic7ed::Episode do
       expect(compatible_episode.best_subtitle('fr').url).to eq 'http://www.addic7ed.com/updated/8/68508/3'
     end
 
+    it 'finds the subtitle with status completed, same group name and not hearing impaired' do
+      stub_request(:get, 'http://www.addic7ed.com/serie/The_Walking_Dead/3/2/1')
+        .to_return File.new('spec/responses/walking-dead-3-2-1.http')
+      episode = Addic7ed::Episode.new(@filename_no_hi)
+      expect(episode.best_subtitle('en', true).url).to eq 'http://www.addic7ed.com/updated/1/68018/0'
+    end
+
     it 'uses French as default language' do
       expect(@episode.best_subtitle).to eq @episode.best_subtitle('fr')
     end

data/spec/lib/addic7ed/subtitle_spec.rb

@@ -65,7 +65,7 @@ describe Addic7ed::Subtitle, "#to_s" do
 end
 
 describe Addic7ed::Subtitle, "#works_for?" do
-  let(:subtitle) { Addic7ed::Subtitle.new(version: "DIMENSION", comment: "Works with IMMERSE") }
+  let(:subtitle) { Addic7ed::Subtitle.new(version: "DIMENSION") }
 
   context "when it is incomplete" do
     before { allow(subtitle).to receive(:is_completed?).and_return(false) }
@@ -90,16 +90,36 @@ describe Addic7ed::Subtitle, "#works_for?" do
       expect(subtitle.works_for? "EVOLVE").to be false
     end
 
-    it "returns true given the same version as comment" do
-      expect(subtitle.works_for? "IMMERSE").to be true
+    context "when is has a compatibility comment" do
+      let(:subtitle) { Addic7ed::Subtitle.new(version: "DIMENSION", comment: "Works with IMMERSE") }
+
+      it "returns true given the same version as comment" do
+        expect(subtitle.works_for? "IMMERSE").to be true
+      end
+
+      it "returns true given a compatible version as comment" do
+        expect(subtitle.works_for? "ASAP").to be true
+      end
+
+      it "returns false given an incompatible version as comment" do
+        expect(subtitle.works_for? "KILLERS").to be false
+      end
     end
 
-    it "returns true given a compatible version as comment" do
-      expect(subtitle.works_for? "ASAP").to be true
+    context "when is has an incompatibility comment" do
+      let(:subtitle) { Addic7ed::Subtitle.new(version: "DIMENSION", comment: "Doesn't work with IMMERSE") }
+
+      it "returns false" do
+        expect(subtitle.works_for? "IMMERSE").to be false
+      end
     end
 
-    it "returns false given an incompatible version as comment" do
-      expect(subtitle.works_for? "KILLERS").to be false
+    context "when is has an ambiguous comment" do
+      let(:subtitle) { Addic7ed::Subtitle.new(version: "DIMENSION", comment: "Resync from IMMERSE") }
+
+      it "returns false" do
+        expect(subtitle.works_for? "IMMERSE").to be false
+      end
     end
   end
 end

data/spec/lib/addic7ed/video_file_spec.rb

@@ -8,11 +8,12 @@ describe Addic7ed::VideoFile do
     let(:filename) { filename }
 
     it "it detects successfully" do
-      expect(file.showname).to eq (expected_show_name || 'Showname')
-      expect(file.season  ).to eq 2
-      expect(file.episode ).to eq 1
-      expect(file.tags    ).to eq ['720P', 'HDTV', 'X264']
-      expect(file.group   ).to eq 'GROUP'
+      expect(file.showname    ).to eq (expected_show_name || 'Showname')
+      expect(file.season      ).to eq 2
+      expect(file.episode     ).to eq 1
+      expect(file.tags        ).to eq ['720P', 'HDTV', 'X264']
+      expect(file.group       ).to eq 'GROUP'
+      expect(file.distribution).to satisfy { |d| ['', 'DISTRIBUTION'].include?(d) }
     end
   end
 
@@ -77,6 +78,10 @@ describe Addic7ed::VideoFile do
       it_behaves_like "a media file", "Showname.2014.S02E01.720p.HDTV.x264-GROUP.mkv", "Showname 2014"
     end
 
+    context "with an optional distribution group name" do
+      it_behaves_like "a media file", "Showname.2014.S02E01.720p.HDTV.x264-GROUP[DISTRIBUTION].mkv", "Showname 2014"
+    end
+
     context "with a full path" do
       it_behaves_like "a media file", "/full/path/to/Showname.S02E01.720p.HDTV.x264-GROUP.mkv"
     end
@@ -120,6 +125,11 @@ describe Addic7ed::VideoFile do
     context "with no group" do
       it_behaves_like "an unknown file", "Showname.S02E01.720p.HDTV.x264.mkv"
     end
+
+    context "with no distribution" do
+      it_behaves_like "a media file", "Showname.S02E01.720p.HDTV.x264-GROUP.mkv"
+    end
+
   end
 
   describe '#encoded_filename' do
@@ -177,13 +187,14 @@ describe Addic7ed::VideoFile do
 
   describe '#inspect' do
     it 'prints a human-readable detailed version' do
-      expect(Addic7ed::VideoFile.new("Showname.S02E01.720p.HDTV.x264-GROUP.mkv").inspect).to eq(
-'Guesses for Showname.S02E01.720p.HDTV.x264-GROUP.mkv:
-  show:    Showname
-  season:  2
-  episode: 1
-  tags:    ["720P", "HDTV", "X264"]
-  group:   GROUP')
+      expect(Addic7ed::VideoFile.new("Showname.S02E01.720p.HDTV.x264-GROUP[DISTRIBUTION].mkv").inspect).to eq(
+'Guesses for Showname.S02E01.720p.HDTV.x264-GROUP[DISTRIBUTION].mkv:
+  show:         Showname
+  season:       2
+  episode:      1
+  tags:         ["720P", "HDTV", "X264"]
+  group:        GROUP
+  distribution: DISTRIBUTION')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: addic7ed
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Michael Baudino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -70,16 +70,30 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.7.2
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.7
 description: Ruby script (cli) to fetch subtitles on Addic7ed
 email: michael.baudino@alpine-lab.com
 executables: