nyaa_anime 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 721bcf93f8c04147dcbedef8a0293e0af7f295ec
-  data.tar.gz: f537048e7e23959fc25afe59f3fe1a9b201fb145
+  metadata.gz: e624f06033c4f20b98887562663b271fbd3342d5
+  data.tar.gz: 4912a5bb4e60dca9463ae3682a9d4ced3ab30b7d
 SHA512:
-  metadata.gz: e61f73f40b2aa9618818ea9780ce3012b9144bd5ca59ad28da737b55d093369fdfd6c4a4abbef585b210fd6a90f4ce442988ad72e833b14bb733b935453489a5
-  data.tar.gz: 261ea3c57b28c8098556f06d0c9d25db8790bdd7c7499f88e50e5877002d1f92ce3efdd9245cafe69b3c60d8252548ffcfd3f5a6bb99fe52d0f23310713a0ed0
+  metadata.gz: 45b2ca6bd017059bfece00d1bbc130e4e3273b2f403c26281bdc091a38243a5a08c52b2ef512c737cb332bac678ffddf8fb75bfc19a6928c4a91b440f385785e
+  data.tar.gz: c3fd3e63b529b7d5c7c936d7333caf08bfc86ee38720bcfbb38c471e12715c35dd8d6fd6ba7bc7a3e21227c1f5c0ca2c9f334546a014bb368151148b59ab3ad2

data/bin/nyaa_anime

@@ -1,14 +1,21 @@
 #!/usr/bin/env ruby
 
-if ARGV[0] == "search"
-  require 'nyaa_anime/search' 
-elsif ARGV[0] == "get"
-  ARGV[1] = "-na"
-  require 'nyaa_anime/search' 
-elsif ARGV[0] == "list"
-  require 'nyaa_anime/list'
-elsif ARGV[0] == "remove"
-  require 'nyaa_anime/remove'
+scripts = ["search", "list", "remove"]
+
+if ARGV[0] == "get"
+  ARGV[0], ARGV[1] = "search", "-naq"
+elsif ARGV[0] == "help" && ARGV[1]
+  if scripts.include? ARGV[1]
+    ARGV[0], ARGV[1] = ARGV[1], "--help"
+  else
+    puts "Error: No such command \"#{ARGV[1]}\"."
+    exit
+  end
+end
+
+script = ARGV[0]
+if scripts.include? script
+  require "nyaa_anime/#{script}"
 else
   puts "Usage: nyaa <command> [<args>]\n" <<
        "       nyaa_anime <command> [<args>]\n\n" <<
@@ -16,7 +23,8 @@ else
        "       to wujoshuawu@gmail.com to keep the developer afloat.\n\n" <<
        "Commands:\n" <<
        "       search    Search for and download anime\n" <<
-       "       get       Equivalent to `nyaa search -na`\n" <<
+       "       get       Equivalent to `nyaa search -naq`\n" <<
        "       list      List downloaded torrent files\n" <<
-       "       remove    Delete download torrent files from a series\n"
+       "       remove    Delete download torrent files from a series\n" <<
+       "       help      Get help about a command (`nyaa help <command>`)\n"
 end

data/lib/nyaa_anime.rb

@@ -9,6 +9,7 @@ class NyaaAnime
   require 'levenshtein'
   require 'set'
   require 'fileutils'
+  require 'parallel'
 
   NYAA_URI = "http://nyaa.se"
   NYAA_SEARCH = "#{NYAA_URI}/?page=rss"
@@ -19,12 +20,14 @@ class NyaaAnime
   TITLE_TOLERANCE_RANGE = (1..4)
   NEW_COLOR = :green
   ALREADY_DOWNLOADED_COLOR = :cyan
+  CL_WIDTH = 70
+  THREAD_COUNT = 20
 
   attr_reader :downloads, :new_titles
 
   FileUtils.mkdir_p NYAA_DL_DIR
 
-  def search(title, quiet=true)
+  def search(title, quiet=false)
     puts "Searching for \"#{title}\"..." unless quiet
     @downloads = {}
     @titles = []
@@ -33,7 +36,12 @@ class NyaaAnime
     dl_urls = []
     offset = 1
     while true
-      results = Nokogiri::HTML(open("#{url}#{offset}")).css('item')
+      begin
+        results = Nokogiri::HTML(open("#{url}#{offset}")).css('item')
+      rescue SocketError
+        puts "Error: Could not connect to NyaaTorrents."
+        exit
+      end
       titles.concat results.css('title').map { |t| t.content }
       dl_urls.concat results.css('link').map { |l| l.next.content }
       break if results.count < NYAA_ENTRIES_PER_PAGE || offset >= MAX_PAGES
@@ -46,21 +54,29 @@ class NyaaAnime
     nil
   end
 
-  def find_new_titles
+  def find_new_titles(quiet=false)
     search_terms = NyaaAnime.series_of_downloaded_titles
     new_titles = Set.new
     new_downloads = {}
-    max_title_size = search_terms.map { |t| t.size }.max
-    search_terms.each_with_index do |t, idx|
-      print "[#{(idx+1).to_s.rjust(search_terms.count.to_s.size, "0")}/#{search_terms.count}] #{t}..."
-      search t
-      new_titles.merge @new_titles
-      @new_titles.each { |ti| new_downloads[ti] = @downloads[ti] }
-      print "." * (max_title_size - t.size)
-      if @new_titles.any?
-        puts "#{@new_titles.count.to_s.colorize(:green)} found!"
-      else
-        puts "none found."
+    count_s_size = "[/] ".size + search_terms.count.to_s.size * 2
+    line_end_size = "...none found.".size
+    max_entry_size = [search_terms.map { |t| t.size }.max + count_s_size +
+                      line_end_size, CL_WIDTH].min - line_end_size
+    index = 1
+    lock = Mutex.new
+    Parallel.each(search_terms, in_threads: THREAD_COUNT) do |t|
+      n = NyaaAnime.new
+      n.search t, true
+      lock.synchronize do
+        new_titles.merge n.new_titles
+        n.new_titles.each { |ti| new_downloads[ti] = n.downloads[ti] }
+        if !quiet
+          msg = "/#{search_terms.count}] #{t[0...max_entry_size-count_s_size]}..." <<
+                ("." * [max_entry_size - (count_s_size + t.size), 0].max) <<
+                (n.new_titles.any? ? "#{n.new_titles.count} found!".colorize(:green) : "none found.")
+          puts "[#{index.to_s.rjust(search_terms.count.to_s.size, "0")}#{msg}"
+          index += 1
+        end
       end
     end
     @new_titles = new_titles
@@ -69,8 +85,8 @@ class NyaaAnime
     @already_downloaded_titles = Set.new
     @version_differing_titles = Set.new
     @other_titles = Set.new
-    if download_count > 0
-      puts "#{download_count} new episode#{"s" if download_count > 1} found!".colorize(:green)
+    if downloads.count > 0
+      puts "#{downloads.count} new episode#{"s" if downloads.count > 1} found!".colorize(:green)
     end
     @titles.each_with_index { |t, i| puts "#{i+1}: #{t.colorize(NEW_COLOR)}" }
   end
@@ -167,24 +183,19 @@ class NyaaAnime
     torrent = open @downloads[title]
     filename = torrent.meta["content-disposition"][/filename="(.+\.torrent)"/, 1]
     open("#{NYAA_DL_DIR}#{filename}", "w") { |f| f.write torrent.read }
-    puts "#{title}.torrent downloaded."
     "#{NYAA_DL_DIR}\"#{title}.torrent\""
   end
 
-  def download_all
-    @titles.map { |t| download(t) }
+  def download_batch(titles)
+    Parallel.map(titles) { |t| download(t) }.sort!
   end
 
-  def download_all_new
-    @new_titles.map { |t| download(t) }
-  end
-
-  def download_count
-    @downloads.count
+  def download_all
+    download_batch @titles
   end
 
-  def new_count
-    @new_titles.count
+  def download_all_new
+    download_batch @new_titles
   end
 
 end

data/lib/nyaa_anime/list.rb

@@ -6,7 +6,7 @@ OptionParser.new do |opts|
                 "       If you like this tool, please donate via PayPal\n" <<
                 "       to wujoshuawu@gmail.com to keep the developer afloat.\n\n"
 
-  opts.on("-a", "--all", "List all individual files as well") do
+  opts.on("-a", "--all", "List all individual files") do
     options[:list_all] = true
   end
 end.parse!

data/lib/nyaa_anime/remove.rb

@@ -14,7 +14,8 @@ OptionParser.new do |opts|
     options[:remove_all] = true
   end
 
-  opts.on("-n", "--number [N]", "Remove torrents of series as numbered by `nyaa list`") do |n|
+  opts.on("-n", "--number [N]", "Remove torrents of series as",
+          "numbered by `nyaa list`") do |n|
     options[:number] = n.to_i
   end
 end.parse!

data/lib/nyaa_anime/search.rb

@@ -15,7 +15,7 @@ ARGV[1] ||= "--help"
 options = {}
 OptionParser.new do |opts|
   opts.banner = "Usage: nyaa search [options] <anime>\n" <<
-                "       nyaa get (equivalent to `nyaa search -na`)\n\n" <<
+                "       nyaa get (equivalent to `nyaa search -naq`)\n\n" <<
                 "       If you like this tool, please donate via PayPal\n" <<
                 "       to wujoshuawu@gmail.com to keep the developer afloat.\n\n"
 
@@ -24,9 +24,12 @@ OptionParser.new do |opts|
     options[:find_new] = true
   end
 
-  opts.on("-a", "--all", "Download all results without asking") do
+  opts.on("-a", "--all", "Download all without asking") do
     options[:download_all] = true
   end
+  opts.on("-q", "--quiet", "Be quiet (only with -a)") do
+    options[:quiet] = true
+  end
 
   opts.on("-s", "--small-res", "Add '#{SMALL_RESOLUTION}' to the search term") do
     options[:resolution] = SMALL_RESOLUTION
@@ -39,8 +42,9 @@ OptionParser.new do |opts|
   end
 
   opts.on("-f", "--fansubber [FANSUBBER]",
-          "Specify [FANSUBBER] to be added to the search",
-          "term. [FANSUBBER] can be abbreviated by",
+          "Specify [FANSUBBER] to be added",
+          "to the search term. [FANSUBBER]",
+          "can be abbreviated by",
           *FANSUBBERS.map {|o, f| "#{o} - #{f}"}) do |f|
     if FANSUBBERS[f]
       options[:subber] = FANSUBBERS[f]
@@ -52,16 +56,21 @@ OptionParser.new do |opts|
     end
   end
 
-  opts.on("-S", "--speedsubs", "Equivalent to `--fansubber=#{SPEEDSUBBER}`") do
+  opts.on("-S", "--speedsubs", "Equivalent to",
+          "`--fansubber=#{SPEEDSUBBER}`") do
     options[:subber] = SPEEDSUBBER
   end
 end.parse!
 
+if !options[:download_all]
+  options[:quiet] = false
+end
+
 require 'nyaa_anime'
 nyaa = NyaaAnime.new
 
 if options[:find_new]
-  nyaa.find_new_titles
+  nyaa.find_new_titles !!options[:quiet]
 else
   if ARGV.size == 2
     search_term = ARGV[1]
@@ -74,10 +83,14 @@ else
   if res = options[:resolution]
     search_term += " #{res}"
   end
-  nyaa.search search_term, false
+  if search_term == ""
+    puts "Error: No search term provided."
+    exit
+  end
+  nyaa.search search_term, !!options[:quiet]
 end
 
-if nyaa.download_count == 0
+if nyaa.downloads.count == 0
   puts "No downloads found."
   exit
 end
@@ -86,6 +99,11 @@ require 'os'
 require 'highline/import'
 
 def prompt_to_open(torrents)
+  if torrents.count == 1
+    puts "Downloaded #{File.basename torrents[0]}."
+  else
+    puts "Downloaded #{torrents.count} torrent files."
+  end
   if agree "Open downloaded torrent#{"s" if torrents.count > 1}? (y/n): "
     if OS.mac?
       `open #{torrents.join " "}`
@@ -102,9 +120,9 @@ if options[:download_all]
   exit
 end
 
-if nyaa.download_count > 1
-  prompt = "Download (1-#{nyaa.download_count}, 'a(ll)'" 
-  prompt << ", 'n(ew)'" if nyaa.new_count > 0 && !options[:find_new]
+if nyaa.downloads.count > 1
+  prompt = "Download (1-#{nyaa.downloads.count}, 'a(ll)'" 
+  prompt << ", 'n(ew)'" if nyaa.new_titles.count > 0 && !options[:find_new]
   prompt << ", or [ENTER] to cancel): "
 else
   if agree "Download? (y/n): "
@@ -120,7 +138,7 @@ while true
     if index == ""
       exit
     end
-    if "new".match(/\A#{index}/) && nyaa.new_count > 0 && !options[:find_new]
+    if "new".match(/\A#{index}/) && nyaa.new_titles.count > 0 && !options[:find_new]
       prompt_to_open nyaa.download_all_new
       exit
     end
@@ -128,7 +146,7 @@ while true
       prompt_to_open nyaa.download_all
       exit
     end
-    if (1..nyaa.download_count).include?(index.to_i)
+    if (1..nyaa.downloads.count).include?(index.to_i)
       prompt_to_open [nyaa.download_index(index.to_i-1)]
       exit
     end

data/lib/nyaa_anime/version.rb

@@ -1,3 +1,3 @@
 class NyaaAnime
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/nyaa_anime.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency 'parallel', '~> 1.2', '>= 1.2.4'
   spec.add_runtime_dependency 'highline', '~> 1.6', '>= 1.6.21'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6', '>= 1.6.2.1'
   spec.add_runtime_dependency 'colorize', '~> 0.7', '>= 0.7.3'

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: nyaa_anime
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Joshua Tsubaki Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.4
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement