pirate-autonzb 0.2.2 → 0.2.3

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('autonzb', '0.2.2') do |p|
+Echoe.new('autonzb', '0.2.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,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{autonzb}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pirate"]

data/bin/autonzb

@@ -12,10 +12,9 @@ module AutoNZB extend OptiFlagSet
     description "Directories paths (separated by ,) with all your Movie's folders"
   end
   optional_flag 'srt' do
-    description "Subtitle's language wanted (separated by ,), ie 'fr,en'.
-                  Use 'none' if you want download movies without subtitle too. 
+    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"
-    value_in_set ['fr', 'en', 'none']
   end  
   optional_flag 'imdb' do
     description "IMDB score limit, default: 7.0"
@@ -28,9 +27,12 @@ module AutoNZB extend OptiFlagSet
     description "Age limit, in day, of nbz file on newzleech, default: 160"
     value_matches ["age must be a number", /[0-9]+/]
   end
-  optional_flag "page" do
-    description "number of the page on newzleech, default: 1. Think to augment -a when change page number"
-    value_matches ["page must be a number", /[0-9]+/]
+  optional_flag "pages" do
+    description "number page(s) parsed on newzleech, default: 2. Think to augment -a when change number of pages"
+    value_matches ["pages must be a number", /[0-9]+/]
+  end
+  optional_flag "backup" do
+    description "Backup folder path (to save a copy of all downloaded nzb files and prevent an already downloaded nzb to be re-downloaded)"
   end
 
   and_process!
@@ -38,6 +40,7 @@ end
 
 inspector = Inspector.new(ARGV.flags.movies || '', :year => ARGV.flags.year,
                                                    :imdb_score => ARGV.flags.imdb,
-                                                   :srt => ARGV.flags.srt)
+                                                   :srt => ARGV.flags.srt,
+                                                   :backup => ARGV.flags.backup)
 
-nzbmatrix = NZB.new(inspector, ARGV.flags.d, :age => ARGV.flags.age, :page => ARGV.flags.page)
+nzbmatrix = NZB.new(inspector, ARGV.flags.d, :age => ARGV.flags.age, :pages => ARGV.flags.pages)

data/lib/imdb.rb

@@ -34,7 +34,7 @@ private
   
   def set_doc
     if link
-      @doc = Hpricot(open(link))
+      @doc = Hpricot(open(link.gsub(/\/$/,'')))
     else
       query = "#{@name} (#{@year})"
       search_url = "http://www.imdb.com/find?q=#{CGI::escape(query)}"

data/lib/inspector.rb

@@ -1,7 +1,9 @@
 require File.join(File.dirname(__FILE__), 'movie')
 
 class Inspector
-    
+  
+  attr_accessor :backup
+  
   def initialize(paths, options = {})
     @paths = paths.split(',').map { |p| p.gsub!(/\/$/,'') }
     @options = options
@@ -9,10 +11,15 @@ class Inspector
     @options[:imdb_score] = @options[:imdb_score] ? @options[:imdb_score].to_f : 7.0
     @options[:year] = @options[:year] ? @options[:year].to_i : 1950
     
+    if @options[:backup]
+      @backup = @options[:backup].gsub(/\/$/,'')
+      @paths << @backup
+    end
+    
     @movies = []
     initialize_movies
     
-    $stdout.print "Movie criteria: imdb_score >= #{@options[:imdb_score]}, year >= #{@options[:year]} and srt [#{@options[:srt].join(',')}]\n"
+    $stdout.print "Movie criteria: imdb score >= #{@options[:imdb_score]}, year >= #{@options[:year]} and srt [#{@options[:srt].join(',')}]\n"
   end
   
   def need?(movie)
@@ -28,11 +35,19 @@ class Inspector
             $stdout.print "but new movie has better format: #{movie.format}\n"
             true
           elsif format_score(movie) == format_score(m)
-            if sound_score(movie) > sound_score(m)
-              $stdout.print "but new movie has better sound: #{movie.sound}\n"
+            if source_score(movie) > source_score(m)
+              $stdout.print "but new movie has better source: #{movie.source}\n"
               true
+            elsif source_score(movie) == source_score(m)
+              if sound_score(movie) > sound_score(m)
+                $stdout.print "but new movie has better sound: #{movie.sound}\n"
+                true
+              else
+                $stdout.print "with same srt, format, source and sound\n"
+                false
+              end
             else
-              $stdout.print "with same srt, format and sound\n"
+              $stdout.print "with same srt, format and better source: #{m.source}\n"
               false
             end
           else
@@ -62,9 +77,13 @@ private
       base_dir = clean_dir(Dir.new(path))
       base_dir.each do |movie|
         movie_path = "#{path}/#{movie}"
-        @movies << Movie.new(movie) if File.directory?(movie_path)
+        @movies << Movie.new(movie) if File.directory?(movie_path) || File.extname(movie_path) == '.nzb'
+      end
+      if path == @backup
+        $stdout.print "Found #{@movies.size - old_movies_size} backuped nzb(s) in #{path}\n"
+      else
+        $stdout.print "Found #{@movies.size - old_movies_size} movie(s) in #{path}\n"
       end
-      $stdout.print "Inspected #{@movies.size - old_movies_size} movie(s) in #{path}\n"
     end
   end
 
@@ -95,6 +114,16 @@ private
     end
   end
   
+  def source_score(movie)
+    case movie.format
+    when 'BluRay'; 4
+    when 'HDDVD';  3
+    when 'HDTV';   2
+    when 'DVD';    1
+    else;          0
+    end
+  end
+  
   def sound_score(movie)
     movie.format == 'DTS' ? 1 : 0    
   end

data/lib/nfo.rb

@@ -5,7 +5,7 @@ class NFO
   attr_accessor :srt, :imdb_link
   
   def initialize(url)
-    @nfo = open(url).read
+    @nfo = open(url.gsub(/\/$/,'')).read
     @srt = []
     
     parse_nfo

data/lib/nzb.rb

@@ -13,50 +13,57 @@ class NZB
   def initialize(inspector, download_path, options = {})
     @options = options
     @options[:age] ||= 160
-    @options[:page] ||= 1
+    @options[:pages] ||= 2
     
-    @nzb_url = "#{URL}/?group=143&minage=&age=160&min=4000&max=max&q=&m=search&adv=1&offset=#{(@options[:page].to_i - 1) * 60}"
+    @nzb_urls = []
     @movies = []
     
+    (1..(@options[:pages].to_i)).each do |page|
+      @nzb_urls << "#{URL}/?group=143&minage=&age=160&min=4000&max=max&q=&m=search&adv=1&offset=#{(page.to_i - 1) * 60}"
+    end
+    
     parse_newzleech
     movies.each do |movie|
-      $stdout.print "#{movie.dirname}, imdb score: #{movie.score} age: #{movie.age.to_i} day(s)\n"
+      $stdout.print "#{movie.dirname}, imdb score: #{movie.score}, age: #{movie.age.to_i} day(s)\n"
       if inspector.need?(movie)
         $stdout.print  " => DOWNLOAD: #{movie.name} (#{movie.year})\n"
-        download_nzb(download_path, movie)
+        download_nzb(download_path, movie, inspector.backup)
       end
     end
     $stdout.print "No nzb found, maybe change -age or -page setting\n" if @movies.empty?
   end
   
-  def download_nzb(download_path, movie)
+  def download_nzb(download_path, movie, backup_path = nil)
     path = download_path.gsub(/\/$/,'') # removed / at the end
     Tempfile.open("movie.nzb") do |tempfile|
       tempfile.write(open(movie.nzb_link).read) # download the nzb
       tempfile.close
       File.move(tempfile.path, "#{path}/#{movie.dirname}.nzb")
+      File.copy("#{path}/#{movie.dirname}.nzb", "#{backup_path}/#{movie.dirname}.nzb") if backup_path
     end
   end
   
 private
     
   def parse_newzleech
-    $stdout.print "Parsing #{URL} for new x264 HD nzb movies\n"
-    doc = Hpricot(open(@nzb_url))
-    doc.search("table.contentt").each do |table|
-      if (a = table.search("td.subject a[@href^='posts/?p=']").first) && a.inner_html !=~ /^\<img/
-        age = parse_age(table.search("td.age").first.inner_html) # get age of the nzb
-        if age <= @options[:age].to_f
-          raw_name = a.inner_html
-          nfo_link = (nfo = table.search("td.subject a[@href^='nfo.php?id=']").first) && "#{URL}/#{nfo[:href]}"
-          imdb_link = (imdb = table.search("td.subject a[@href^='http://anonym.to/?http://www.imdb.com']").first) && imdb[:href].match(/\?(.*)/)[1]
-          nzb_link = (nzb = table.search("td.get a[@href^='?m=gen&dl=1']").first) && "#{URL}/#{nzb[:href]}"
+    $stdout.print "Parsing #{URL} for new x264 HD nzb movies in last #{@options[:pages]} page(s)\n"
+    @nzb_urls.each do |url|
+      doc = Hpricot(open(url))
+      doc.search("table.contentt").each do |table|
+        if (a = table.search("td.subject a[@href^='posts/?p=']").first) && a.inner_html !=~ /^\<img/
+          age = parse_age(table.search("td.age").first.inner_html) # get age of the nzb
+          if age <= @options[:age].to_f
+            raw_name = a.inner_html
+            nfo_link = (nfo = table.search("td.subject a[@href^='nfo.php?id=']").first) && "#{URL}/#{nfo[:href]}"
+            imdb_link = (imdb = table.search("td.subject a[@href^='http://anonym.to/?http://www.imdb.com']").first) && imdb[:href].match(/\?(.*)/)[1]
+            nzb_link = (nzb = table.search("td.get a[@href^='?m=gen&dl=1']").first) && "#{URL}/#{nzb[:href]}"
           
-          movie = Movie.new(raw_name, :nfo_link => nfo_link, :imdb_link => imdb_link, :nzb_link => nzb_link, :age => age)
-          @movies << movie
+            movie = Movie.new(raw_name, :nfo_link => nfo_link, :imdb_link => imdb_link, :nzb_link => nzb_link, :age => age)
+            @movies << movie
           
-          $stdout.print '.'
-          $stdout.flush
+            $stdout.print '.'
+            $stdout.flush
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pirate-autonzb
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Pirate