pirate-autonzb 0.3.5 → 0.4

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('autonzb', '0.3.5') do |p|
+Echoe.new('autonzb', '0.4') 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,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{autonzb}
-  s.version = "0.3.5"
+  s.version = "0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pirate"]
-  s.date = %q{2009-01-02}
+  s.date = %q{2009-02-07}
   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}
@@ -30,19 +30,16 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<optiflag>, [">= 0"])
       s.add_runtime_dependency(%q<rubyzip>, [">= 0"])
       s.add_runtime_dependency(%q<htmlentities>, [">= 0"])
-      s.add_development_dependency(%q<echoe>, [">= 0"])
     else
       s.add_dependency(%q<hpricot>, [">= 0"])
       s.add_dependency(%q<optiflag>, [">= 0"])
       s.add_dependency(%q<rubyzip>, [">= 0"])
       s.add_dependency(%q<htmlentities>, [">= 0"])
-      s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
     s.add_dependency(%q<hpricot>, [">= 0"])
     s.add_dependency(%q<optiflag>, [">= 0"])
     s.add_dependency(%q<rubyzip>, [">= 0"])
     s.add_dependency(%q<htmlentities>, [">= 0"])
-    s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/lib/imdb.rb

@@ -5,12 +5,13 @@ require 'htmlentities'
 
 class IMDB
   
-  attr_accessor :link
+  attr_accessor :link, :doc, :id
   
   def initialize(name, year = nil, link = nil)
     @name, @year, @link = name, year, link
     @coder = HTMLEntities.new
     set_doc
+    set_id
   end
 
   def score
@@ -29,32 +30,36 @@ class IMDB
     $KCODE = 'utf-8'
     @doc ? @coder.decode(@doc.search("title").inner_html.match(/(.*)\s\(/u)[1]) : @name
   end
-  
+    
 private
   
   def set_doc
-    if link
-      @doc = Hpricot(open(link.gsub(/\/\s*$/,'')))
+    if @link
+      @doc = Hpricot(open(@link.gsub(/\/\s*$/,'')))
     else
       query = "#{@name} (#{@year})"
       search_url = "http://www.imdb.com/find?q=#{CGI::escape(query)}"
       doc = Hpricot(open(search_url))
       case doc.search("title").inner_html
-      when "IMDb Title Search" # search result page
+      when "IMDb Title Search", "IMDb Search" # search result page
         if !doc.search("b[text()*='Media from'] a").empty?        
           imdb_id = doc.search("b[text()*='Media from'] a").first[:href]
           movie_url = "http://www.imdb.com#{imdb_id}"
         elsif !doc.search("td[@valign='top'] a[@href^='/title/tt']").empty?
           imdb_id = doc.search("td[@valign='top'] a[@href^='/title/tt']").first[:href]
           movie_url = "http://www.imdb.com#{imdb_id}"
+        else
+          movie_url = nil
         end
-        @doc = Hpricot(open(movie_url))
-      when "IMDb Search"
-        @doc = nil
+        @doc = Hpricot(open(movie_url)) if movie_url
       else # direct in movie page
         @doc = doc
       end
     end
   end
+  
+  def set_id
+    @id = doc.search("a[@href*='/title/tt']").first[:href].match(/tt[0-9]+/)[0] if doc
+  end
     
 end

data/lib/movie.rb

@@ -5,15 +5,15 @@ class Movie
   include Comparable
   
   attr_accessor :path, :name, :format, :source, :sound, :encoding, :year, :srt, :lang, :score, :tags, :age,
-                :imdb_link, :nfo_link, :nzb_link
+                :imdb_link, :imdb_id, :nzb_link, :nfo
   
   def initialize(raw_name, attributes = {})
     @raw_name = raw_name.gsub(/\.|\_/,' ')
-    attributes.each { |k,v| send("#{k}=", v) }
+    attributes.each { |k,v| self.send("#{k}=", v) }
     @srt, @tags = [], []
     
-    set_imdb_link
     set_name
+    set_year
     set_format
     set_source
     set_sound
@@ -21,7 +21,8 @@ class Movie
     set_lang
     set_encoding
     set_tags
-    set_year
+    set_imdb_id
+    set_data_from_imdb unless path    
   end
     
   def score
@@ -29,11 +30,15 @@ class Movie
   end
 
   def dirname
-    "#{name} (#{year}) #{tags.join(' ')} #{format} #{source} #{sound} #{encoding} #{lang} [#{srt.join(',')}]".gsub(/\s+/,' ')
+    "#{name} (#{year}) #{tags.join(' ')} #{format} #{source} #{sound} #{encoding} #{lang} {#{imdb_id}} [#{srt.join(',')}]".gsub(/\s+/,' ')
   end
 
   def <=>(other_movie)
-    "#{name} #{year}".downcase <=> "#{other_movie.name} #{other_movie.year}".downcase
+    if imdb_id && other_movie.imdb_id
+      imdb_id <=> other_movie.imdb_id
+    else
+      "#{name} #{year}".downcase <=> "#{other_movie.name} #{other_movie.year}".downcase
+    end
   end
       
 private
@@ -41,13 +46,21 @@ private
   def imdb
     @imdb ||= IMDB.new(name, year, imdb_link)
   end
-  
-  def nfo
-    @nfo ||= NFO.new(nfo_link)
+    
+  def imdb_link
+    @imdb_link || (imdb_id && "http://imdb.com/title/#{imdb_id}")
   end
   
-  def set_imdb_link
-    @imdb_link = nfo.imdb_link if imdb_link.nil? && nfo_link
+  def set_imdb_id
+    if imdb_link
+      @imdb_id = imdb_link.match(/tt[0-9]+/)[0]
+    elsif matched = @raw_name.match(/\{(.*)\}/)
+      @imdb_id = matched[1]
+    elsif path
+      add_imdb_id_to_file
+    else
+      nil
+    end
   end
   
   def set_name
@@ -65,12 +78,10 @@ private
       @name.gsub!(/REPACK|LIMITED|UNRATED|PROPER|REPOST|Directors\sCut/iu,'')
       @name.gsub!(/^\s+|\s+$/u,'')
     end
-    @name = imdb.name unless path
   end
   
   def set_year
-    @year = imdb.year unless path
-    if (year.nil? || year == 0) && matched = @raw_name.match(/19[0-9]{2}|20[0-9]{2}/)
+    if matched = @raw_name.match(/19[0-9]{2}|20[0-9]{2}/)
       @year = matched[0].to_i
     end
   end
@@ -122,7 +133,7 @@ private
   end
   
   def set_srt
-    if nfo_link
+    if nfo
       @srt = nfo.srt
     elsif matched = @raw_name.match(/\[(.*)\]/)
       matched[1].split(',').each { |srt| @srt << srt }
@@ -131,10 +142,14 @@ private
   
   def set_lang
     @lang = case @raw_name
-    when /FRENCH/
+    when /FRENCH/i
       'FRENCH'
-    when /GERMAN/
+    when /GERMAN/i
       'GERMAN'
+    when /DANISH/i
+      'DANISH'
+    when /NORDIC/i
+      'NORDIC'
     end
   end
   
@@ -148,4 +163,28 @@ private
     @tags << 'Directors Cut' if @raw_name =~ /Directors\sCut|DirCut/i
   end
   
+  def set_data_from_imdb
+    @name = imdb.name
+    imdb_year = imdb.year
+    if !imdb_year.nil? && imdb_year != 0
+      @year = imdb_year
+    end
+  end
+  
+  def add_imdb_id_to_file_if_not_present
+    @imdb_id = imdb.id
+    dir_name = File.dirname(path)
+    ext_name = File.extname(path)
+    base_name = File.basename(path, ext_name)
+    if matched = base_name.match(/^(.*)\s(\[{1}.*\]{1})$/)
+      base_name_without_srts = matched[1]
+      srts = matched[2]
+      new_base_name = "#{base_name_without_srts} {#{imdb_id}} #{srts}#{ext_name}"
+    else
+      new_base_name = "#{base_name} {#{imdb_id}}#{ext_name}"
+    end
+    File.rename(path, "#{dir_name}/#{new_base_name}")
+    $stdout.print "Added {#{imdb_id}} (imdb id) => #{dir_name}/#{new_base_name}\n"
+  end
+  
 end

data/lib/nzb.rb

@@ -20,7 +20,7 @@ class NZB
     @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}"
+      @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
@@ -31,23 +31,27 @@ class NZB
 private
     
   def parse_newzleech
-    $stdout.print "Parsing #{URL} for new x264 HD nzb movies in last #{@options[:pages]} page(s)\n"
+    $stdout.print "Parsing #{URL} for new x264 HD nzb movies, with age <= #{@options[:age]}, 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/
+        raw_name = raw_name(table)
+        if nfo_link = nfo_link(table)
+          nfo = NFO.new(nfo_link)
+          imdb_link = nfo.imdb_link
+        else
+          imdb_link = imdb_link(table)
+        end
+        if raw_name && (imdb_link || (raw_name = find_clean_nzb_name(raw_name))) && raw_name.include?('x264')
           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)
+            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
-          
-            $stdout.print '.'
-            $stdout.flush
+            
+            $stdout.print "#{movie.dirname}, imdb score: #{movie.score}, age: #{movie.age.to_i} day(s)\n"
+            # $stdout.print '.'
+            # $stdout.flush
           end
         end
       end
@@ -55,6 +59,32 @@ private
     $stdout.print "\n"
   end
   
+  def clean_raw_name(raw_name)
+    (find_clean_nzb_name(raw_name) || raw_name).strip
+  end
+  
+  def find_clean_nzb_name(raw_name)
+    if matched = raw_name.match(/^\[[0-9]*\]-\[.*\]-\[(.*)\]-/)
+      matched[1]
+    end
+  end
+  
+  def raw_name(table)
+    (a = table.search("td.subject a[@href^='?p=']").first) && a.inner_html
+  end
+  
+  def nfo_link(table)
+    (nfo = table.search("td.subject a[@href^='nfo.php?id=']").first) && "#{URL}/#{nfo[:href]}"
+  end
+  
+  def imdb_link(table)
+    (imdb = table.search("td.subject a[@href^='http://anonym.to/?http://www.imdb.com']").first) && imdb[:href].match(/\?(.*)/)[1]
+  end
+  
+  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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pirate-autonzb
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: "0.4"
 platform: ruby
 authors: 
 - Pirate
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-02 00:00:00 -08:00
+date: 2009-02-07 00:00:00 -08:00
 default_executable: autonzb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,15 +48,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: Ruby tool to automatically download x264 HD nzb movies files from newzleech.com
 email: pirate.2061@gmail.com
 executables: