pirate-autonzb 0.4.2 → 0.4.3

data/Manifest

@@ -8,5 +8,4 @@ lib/nfo.rb
 lib/nzb.rb
 Manifest
 Rakefile
-README.markdown
-tasks/test.rake
+README.markdown

data/README.markdown

@@ -17,7 +17,7 @@ Will download new x264 HD movies nzb from newzleech.com, with imdb score >= 7.0,
 
     autonzb -d /path/of/download/nzb/directory -movies /path/with/already/downloaded/movies -age 1 -imdb 7.5 -year 1980 -srt fr,en
     
-Will download only new nzb of the day with imdb score >= 7.5, year >= 1980 and subtitles french or english.
+Will download only new nzb of the day with imdb score >= 7.5, year >= 1980 and subtitles french or english (and unknown srt).
 The -movies setting prevents already owned movies to be re-downloaded (only if the owned movie is 'better' than the new release)
 
 more details with:
@@ -28,13 +28,13 @@ more details with:
 
 AutoNZB use (and needs) specific folders name for your movies:
 
-    name of the movie (year) tag(s) format source sound encoding lang [srt(s)]
+    name of the movie (year) tag(s) format source sound encoding lang {imdb_id} [srt(s)]
     
-    Burn After Reading (2008) PROPER 1080p BluRay DTS x264 [fr,en]
-    Le Fabuleux Destin d'Amelie Poulain (2001) 720p BluRay x264 FRENCH [en]
+    Burn After Reading (2008) PROPER 1080p BluRay DTS x264 {tt0887883} [fr,en]
+    Le Fabuleux Destin d'Amelie Poulain (2001) 720p BluRay x264 FRENCH {tt0211915} [en]
     ...
     
-## License
+## MIT License
 
 Copyright (c) 2008 Pirate
  

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('autonzb', '0.4.2') do |p|
+Echoe.new('autonzb', '0.4.3') do |p|
   p.description    = "Ruby tool to automatically download x264 HD nzb movies files from newzleech.com"
   p.url            = "http://github.com/pirate/autonzb"
   p.author         = "Pirate"

data/autonzb.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{autonzb}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pirate"]
-  s.date = %q{2009-02-08}
+  s.date = %q{2009-02-09}
   s.default_executable = %q{autonzb}
   s.description = %q{Ruby tool to automatically download x264 HD nzb movies files from newzleech.com}
   s.email = %q{pirate.2061@gmail.com}
   s.executables = ["autonzb"]
-  s.extra_rdoc_files = ["bin/autonzb", "lib/imdb.rb", "lib/inspector.rb", "lib/movie.rb", "lib/nfo.rb", "lib/nzb.rb", "README.markdown", "tasks/test.rake"]
-  s.files = ["asset/failure.png", "autonzb.gemspec", "bin/autonzb", "lib/imdb.rb", "lib/inspector.rb", "lib/movie.rb", "lib/nfo.rb", "lib/nzb.rb", "Manifest", "Rakefile", "README.markdown", "tasks/test.rake"]
+  s.extra_rdoc_files = ["bin/autonzb", "lib/imdb.rb", "lib/inspector.rb", "lib/movie.rb", "lib/nfo.rb", "lib/nzb.rb", "README.markdown"]
+  s.files = ["asset/failure.png", "autonzb.gemspec", "bin/autonzb", "lib/imdb.rb", "lib/inspector.rb", "lib/movie.rb", "lib/nfo.rb", "lib/nzb.rb", "Manifest", "Rakefile", "README.markdown"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/pirate/autonzb}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Autonzb", "--main", "README.markdown"]

data/bin/autonzb

@@ -13,8 +13,9 @@ module AutoNZB extend OptiFlagSet
   end
   optional_flag 'srt' do
     description "Subtitle languages desired (separated by ,), ie 'fr,en'.
-                  Add 'none' at the end if you want to download movies without subtitles too. 
-                  (Order is important to define if a nzb is needed), default: none"
+                  Add 'none' at the end if you want to download movies without subtitles too.
+                  'unknown' is always added at the end, and nzb with unknown srt are always downloaded.
+                  (Order is important to define if a nzb is needed) default: nil"
   end  
   optional_flag 'imdb' do
     description "IMDB score limit, default: 7.0"

data/lib/inspector.rb

@@ -7,7 +7,9 @@ class Inspector
   def initialize(paths, options = {})
     @paths = paths.split(',').map { |p| p.gsub(/\/$/,'') }
     @options = options
-    @options[:srt] = @options[:srt] ? @options[:srt].split(',') : ['none']
+    p @options[:srt]
+    @options[:srt] = @options[:srt] ? (@options[:srt].split(',') - ["unknown"] + ['unknown']).uniq : nil
+    p @options[:srt]
     @options[:imdb_score] = @options[:imdb_score] ? @options[:imdb_score].to_f : 7.0
     @options[:year] = @options[:year] ? @options[:year].to_i : 1950
     
@@ -102,9 +104,9 @@ private
   end
   
   def valid?(movie)
-    srt_size = @options[:srt].size
-    (((@options[:srt] - movie.srt).size < srt_size) || @options[:srt].include?('none')) &&
-    movie.year >= @options[:year] && movie.score >= @options[:imdb_score]
+    (@options[:srt].nil? || (((@options[:srt] - movie.srt).size < @options[:srt].size)) || movie.lang == 'FRENCH') &&
+    movie.year >= @options[:year] &&
+    movie.score >= @options[:imdb_score]
   end
   
   def srt_score(movie)

data/lib/movie.rb

@@ -137,9 +137,14 @@ private
     if nfo
       @srt = nfo.srt
     elsif matched = @raw_name.match(/\[(.*)\]/)
-      matched[1].split(',').each { |srt| @srt << srt }
+      srts = matched[1].split(',')
+      if srts.empty?
+        @srt << 'none'
+      else
+        srts.each { |srt| @srt << srt }
+      end
     else
-      @srt << 'no nfo'
+      @srt << 'unknown'
     end
   end
   

data/lib/nfo.rb

@@ -25,7 +25,7 @@ private
         @imdb_link = (matched = line.match(/imdb.com\/title\/(tt[0-9]+)/)) && "http://imdb.com/title/#{matched[1]}"
       end
     end
-    @srt << 'nfo but ?' if @srt.empty?
+    @srt << 'unknown' if @srt.empty?
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pirate-autonzb
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Pirate
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-08 00:00:00 -08:00
+date: 2009-02-09 00:00:00 -08:00
 default_executable: autonzb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,7 +62,6 @@ extra_rdoc_files:
 - lib/nfo.rb
 - lib/nzb.rb
 - README.markdown
-- tasks/test.rake
 files: 
 - asset/failure.png
 - autonzb.gemspec
@@ -75,7 +74,6 @@ files:
 - Manifest
 - Rakefile
 - README.markdown
-- tasks/test.rake
 has_rdoc: true
 homepage: http://github.com/pirate/autonzb
 post_install_message: