pirate-autonzb 0.5.1 → 0.5.2

data/Rakefile

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

data/autonzb.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{autonzb}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pirate"]
-  s.date = %q{2009-04-05}
+  s.date = %q{2009-04-15}
   s.default_executable = %q{autonzb}
   s.description = %q{Ruby tool to automatically download x264 HD nzb movies files from newzleech.com & nzbs.org}
   s.email = %q{pirate.2061@gmail.com}

data/bin/autonzb

@@ -54,6 +54,7 @@ begin
                                           :movie_paths => ARGV.flags.movies,
                                           :login => ARGV.flags.login,
                                           :pass => ARGV.flags.pass)
+  inspector.search_and_download
 rescue => e
   p e.to_s
   Inspector.growl("AutoNZB Error!", 'look into the console log')

data/lib/inspector.rb

@@ -4,9 +4,10 @@ require File.join(File.dirname(__FILE__), 'sites', 'nzbs', 'nzb')
 
 class Inspector
   
-  attr_accessor :backup_path, :movies, :nzbs
+  attr_accessor :download_path, :backup_path, :movies, :nzbs
   
   def initialize(download_path, options = {})
+    @download_path = download_path.gsub(/\/$/,'')
     @paths = options[:movie_paths] ? options[:movie_paths].split(',').map { |p| p.gsub(/\/$/,'') } : []
     @options = options
     @options[:srt] = @options[:srt] ? (@options[:srt].split(',') - ["unknown"] + ['unknown']).uniq : nil
@@ -24,14 +25,41 @@ class Inspector
     end
     
     $stdout.print "Movie criteria: imdb score >= #{@options[:imdb_score]}, year >= #{@options[:year]}#{" and srt [#{@options[:srt].join(',')}]" if @options[:srt]}\n"
+  end
+  
+  def search_and_download
+    if @options[:login] && @options[:pass]
+      site = Nzbs::NZB.new(@options)
+      parse_nzbs(site)
+    end
+    site = Newzleech::NZB.new(@options)
+    parse_nzbs(site)
     
-    Nzbs::NZB.new(self, download_path, @options) if @options[:login] && @options[:pass]
-    Newzleech::NZB.new(self, download_path, @options)
-    
-    keep_only_best_nzb if @backup_path
+    keep_only_best_nzbs if backup_path
+  end
+
+  def parse_nzbs(site)
+    site.nzbs.each do |movie|
+      $stdout.print "#{movie.dirname}, imdb score: #{movie.score}, age: #{movie.age} day(s)\n"
+      if need?(movie)
+        $stdout.print " => DOWNLOAD: #{movie.name} (#{movie.year})\n"
+        download(site, movie)
+      end
+    end
+    $stdout.print "No nzb found, maybe change -age or -page setting\n" if site.nzbs.empty?
+  end
+
+  def download(site, movie)
+    Tempfile.open("movie.nzb") do |tempfile|
+      tempfile.write(site.download(movie)) # download nzb
+      tempfile.close
+      File.copy(tempfile.path, "#{backup_path}/#{movie.dirname}.nzb") if backup_path
+      File.move(tempfile.path, "#{download_path}/#{movie.dirname}.nzb")
+    end
+    @movies << movie
   end
   
-  def need?(movie, not_validate = false, movies = @movies, log = true)
+  def need?(movie, movies = @movies, not_validate = false, log = true)
     if not_validate || valid?(movie)
       $stdout.print " => movie has required criteria " if log
       if m = movies.detect { |m| m == movie }
@@ -151,11 +179,11 @@ private
     movie.format == 'DTS' ? 1 : 0    
   end
   
-  def keep_only_best_nzb
+  def keep_only_best_nzbs
     size = 0
     @nzbs.each do |nzb|
       nzbs = @nzbs.select { |item| item.path != nzb.path }
-      unless need?(nzb, true, nzbs, false)
+      unless need?(nzb, nzbs, true, false)
         File.delete(nzb.path)
         size += 1
       end

data/lib/movie.rb

@@ -35,7 +35,7 @@ class Movie
   end
   
   def dirname
-    "#{name} (#{year}) #{tags.join(' ')} #{format} #{source} #{sound} #{encoding} #{lang} {#{imdb_id}} [#{srt.join(',')}]".gsub(/\s+/,' ')
+    "#{name} (#{year}) #{tags.join(' ')} #{format} #{source} #{sound} #{encoding} #{lang} {#{imdb_id}} [#{srt.join(',')}]".gsub(/\s+|\//,' ')
   end
 
   def <=>(other_movie)

data/lib/sites/newzleech/nzb.rb

@@ -8,24 +8,26 @@ module Newzleech
   class NZB
   
     URL = 'http://www.newzleech.com'
-  
-    attr_accessor :movies, :agent
-  
-    def initialize(inspector, download_path, options = {})
-      @inspector, @download_path = inspector, download_path.gsub(/\/$/,'')
+    
+    attr_accessor :nzbs
+    
+    def initialize(options = {})
       @options = options
       @options[:age] ||= 160
       @options[:pages] ||= 2
     
       @nzb_urls = []
-      @movies = []
+      @nzbs = []
     
       (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
-      parse_movies
+    end
+    
+    def download(movie)
+      open(movie.nzb_link).read
     end
   
   private
@@ -47,7 +49,7 @@ module Newzleech
             if age <= @options[:age].to_f
               raw_name = clean_raw_name(raw_name)
               movie = Movie.new(raw_name, :nfo => nfo, :imdb_link => imdb_link, :nzb_link => nzb_link(table), :age => age)
-              @movies << movie
+              @nzbs << movie
             
               $stdout.print '.'
               $stdout.flush
@@ -83,32 +85,11 @@ module Newzleech
     def nzb_link(table)
       (nzb = table.search("td.get a[@href^='?m=gen&dl=1']").first) && "#{URL}/#{nzb[:href]}"
     end
-  
-    def parse_movies
-      movies.each do |movie|
-        $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(movie, @inspector.backup_path)
-        end
-        @inspector.movies << movie
-      end
-      $stdout.print "No nzb found, maybe change -age or -page setting\n" if @movies.empty?
-    end
-  
-    def download_nzb(movie, backup_path = nil)
-      Tempfile.open("movie.nzb") do |tempfile|
-        tempfile.write(open(movie.nzb_link).read) # download the nzb
-        tempfile.close
-        File.copy(tempfile.path, "#{backup_path}/#{movie.dirname}.nzb") if backup_path
-        File.move(tempfile.path, "#{@download_path}/#{movie.dirname}.nzb")
-      end
-    end
-  
+          
     def parse_age(string)
       case string
       when /h/i
-        string.to_f / 24
+        ((string.to_f / 24) * 10).to_i / 10.0
       when /d/i
         string.to_f
       end

data/lib/sites/nzbs/nzb.rb

@@ -12,16 +12,15 @@ module Nzbs
   
     URL = 'http://www.nzbs.org'
   
-    attr_accessor :movies, :agent
+    attr_accessor :nzbs, :agent
   
-    def initialize(inspector, download_path, options = {})
-      @inspector, @download_path = inspector, download_path.gsub(/\/$/,'')
+    def initialize(options = {})
       @options = options
       @options[:age] ||= 160
       @options[:pages] ||= 2
     
       @nzb_urls = []
-      @movies = []
+      @nzbs = []
     
       (1..(@options[:pages].to_i)).each do |page|
         @nzb_urls << "#{URL}/index.php?action=browse&catid=4&page=#{(page)}"
@@ -29,9 +28,12 @@ module Nzbs
       
       login
       parse_nzbs
-      parse_movies
     end
-  
+    
+    def download(movie)
+      @agent.get_file(movie.nzb_link)
+    end
+    
   private
   
     def login
@@ -64,7 +66,7 @@ module Nzbs
                                           :nzb_link => nzb_link(tr, page),
                                           :age => age,
                                           :nfo => @nfo)
-              @movies << movie
+              @nzbs << movie
             
               $stdout.print '.'
               $stdout.flush
@@ -111,27 +113,6 @@ module Nzbs
     def nzb_link(tr, page)
       (a = tr.search("a.dlnzb").first) && "#{URL}/#{a[:href]}"
     end
-  
-    def parse_movies
-      movies.each do |movie|
-        $stdout.print "#{movie.dirname}, imdb score: #{movie.score}, age: #{movie.age} day(s)\n"
-        if @inspector.need?(movie)
-          $stdout.print " => DOWNLOAD: #{movie.name} (#{movie.year})\n"
-          download_nzb(movie, @inspector.backup_path)
-        end
-        @inspector.movies << movie
-      end
-      $stdout.print "No nzb found, maybe change -age or -page setting\n" if movies.empty?
-    end
-  
-    def download_nzb(movie, backup_path = nil)
-      Tempfile.open("movie.nzb") do |tempfile|
-        tempfile.write(@agent.get_file(movie.nzb_link)) # download the nzb
-        tempfile.close
-        File.copy(tempfile.path, "#{backup_path}/#{movie.dirname}.nzb") if backup_path
-        File.move(tempfile.path, "#{@download_path}/#{movie.dirname}.nzb")
-      end
-    end
     
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pirate-autonzb
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Pirate
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-05 00:00:00 -07:00
+date: 2009-04-15 00:00:00 -07:00
 default_executable: autonzb
 dependencies: 
 - !ruby/object:Gem::Dependency