nyaa_anime 0.3.1 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d114871e4368e1d3fbee2e706f31592009178192
-  data.tar.gz: f5716d1fbf597abc7a6de8872672ca53472696aa
+  metadata.gz: 191e2a8c93ed5c404ab58f017d08e192a12f3e9d
+  data.tar.gz: cd648da31060aa478eb1417f41c3f19a20baf597
 SHA512:
-  metadata.gz: d4d325d829bd96a04090c6719e4064f31dbbb59713e9c1e4d6f00bc654ef1cb5d515859b44bb40ee40e291b3518dc28030821b0a4f5d4ced559413b94874c5f3
-  data.tar.gz: 7a1b51b5b736fc67164e523009a59432189ede39f474167f1e7d298664d1188e5d38e98ee7fd7b293c0e0eef7a5a245f92e61172c4381563ca26f97b76014142
+  metadata.gz: ede45cd7c81d8464047177e24da368ce2d2ac73d98bfbf124ba6ae83ce8ba8436612cc223ca1ed359bc8ba2d68b5df29d139f43ca53af58ee0dab143dad2e9da
+  data.tar.gz: 5167320aa3994fa16423dd84845f8ad9b1ac97fe281c93fb0abfbbe35ff5df3775e43000d26043d3060e0969eff3ab1c06f568d907a30e6b6feab1ad237ce884

data/lib/nyaa_anime.rb

@@ -11,68 +11,53 @@ class NyaaAnime
   require 'set'
 
   NYAA_URI = "http://nyaa.se"
-  NYAA_SEARCH = "#{NYAA_URI}/?page=search"
+  NYAA_SEARCH = "#{NYAA_URI}/?page=rss"
   NYAA_SEARCH_DEFAULT = "#{NYAA_SEARCH}&cats=1_37&filter=2&term="
   NYAA_DL_DIR = "#{Dir.home}/Downloads/nyaa/"
-  MAX_PAGE_COUNT = 29
+  MAX_PAGE_COUNT = 30
   TITLE_TOLERANCE_RANGE = (1..4)
   NEW_COLOR = :green
   ALREADY_DOWNLOADED_COLOR = :cyan
+  THREAD_COUNT = 10
+
+  attr_reader :downloads, :new_titles
 
   def search(title, quiet=true)
     puts "Searching for \"#{title}\"..." unless quiet
     @downloads = {}
-    noko_doc = Nokogiri::HTML(open("#{NYAA_SEARCH_DEFAULT}#{CGI.escape(title)}"))
-    results = noko_doc.css('.tlistrow')
-    if results.any?
-      titles = results.css('.tlistname a').map { |a| a.content }
-      dl_urls = results.css('.tlistdownload a').map { |a| a.attr('href') }
-      page_urls = noko_doc.css('.pages').first.css('a').map { |a| a.attr('href') }
-      if page_urls.count == MAX_PAGE_COUNT - 1
-        puts "Truncating at #{MAX_PAGE_COUNT} pages." unless quiet
-      end
-      if page_urls.count > 1
-        page_titles = [nil] * (page_urls.count - 1)
-        page_dl_urls = [nil] * (page_urls.count - 1)
-        Parallel.each_with_index(page_urls, in_threads: 10) do |url, i|
-          r = Nokogiri::HTML(open(url)).css('.tlistrow')
-          page_titles[i] = r.css('.tlistname a').map { |a| a.content }
-          page_dl_urls[i] = r.css('.tlistdownload a').map { |a| a.attr('href') }
-          print "."
-        end
-        print "\n"
-        page_titles.each { |pt| titles.concat pt }
-        page_dl_urls.each { |pd| dl_urls.concat pd }
-      end
-      titles.each_with_index { |t, i| @downloads[t] = dl_urls[i] }
-      @titles = titles.sort!
-    else
-      if title_element = noko_doc.css('.viewtorrentname').first
-        title = title_element.content
-        @titles = [title]
-        @downloads[title] = noko_doc.css('.viewdownloadbutton a').first.attr('href')
-      else
-        return
+    @titles = []
+    url = "#{NYAA_SEARCH_DEFAULT}#{CGI.escape(title)}&offset="
+    titles = [nil] * MAX_PAGE_COUNT
+    dl_urls = [nil] * MAX_PAGE_COUNT
+    Parallel.each((1..THREAD_COUNT), in_threads: THREAD_COUNT) do |offset|
+      while offset <= MAX_PAGE_COUNT && (results = Nokogiri::HTML(open("#{url}#{offset}")).css('item')).any?
+        titles[offset-1] = results.css('title').map { |t| t.content }
+        dl_urls[offset-1] = results.css('link').map { |l| l.next.content }
+        offset += THREAD_COUNT
       end
     end
+    titles = titles.reduce { |a, b| b ? a.concat(b) : a }
+    dl_urls = dl_urls.reduce { |a, b| b ? a.concat(b) : a }
+    return if titles.empty?
+    titles.each_with_index { |t, i| @downloads[t] = dl_urls[i] }
+    @titles = titles.sort!
     categorize_titles
     colorized_titles.each_with_index { |t, i| puts "#{i+1}: #{t}" } unless quiet
     nil
   end
 
   def find_new_titles
-    new_titles = Set.new
-    new_downloads = {}
-    idx = 1
-    stripped_episodeless_downloaded_titles.each do |t|
-      search t
-      new_titles.merge @new_titles
-      @new_titles.each do |ti|
-        new_downloads[ti] = @downloads[ti]
-        puts "#{idx}: #{ti.colorize(NEW_COLOR)}"
-        idx += 1
-      end
+    search_terms = stripped_episodeless_downloaded_titles
+    new_titles = [nil] * search_terms.count
+    new_downloads = [nil] * search_terms.count
+    Parallel.each_with_index(search_terms, in_threads: THREAD_COUNT) do |t, i|
+      n = NyaaAnime.new
+      n.search t
+      new_titles[i] = n.new_titles
+      new_downloads[i] = n.downloads.select { |ti, dl| n.new_titles.include? ti }
     end
+    new_titles = new_titles.reduce { |a, b| b ? a.merge(b) : a }
+    new_downloads = new_downloads.reduce { |a, b| b ? a.merge(b) : a }
     @new_titles = new_titles
     @titles = new_titles.to_a.sort!
     @downloads = new_downloads
@@ -82,6 +67,7 @@ class NyaaAnime
     if download_count > 0
       puts "#{download_count} new episode#{"s" if download_count > 1} found!"
     end
+    @titles.each_with_index { |t, i| puts "#{i+1}: #{t.colorize(NEW_COLOR)}" }
   end
 
   def colorized_titles
@@ -169,11 +155,11 @@ class NyaaAnime
   end
 
   def download_all
-    Parallel.map(@titles, in_threads: 10) { |t| download(t) }
+    Parallel.map(@titles, in_threads: THREAD_COUNT) { |t| download(t) }
   end
 
   def download_all_new
-    Parallel.map(@new_titles, in_threads: 10) { |t| download(t) }
+    Parallel.map(@new_titles, in_threads: THREAD_COUNT) { |t| download(t) }
   end
 
   def download_count

data/lib/nyaa_anime/version.rb

@@ -1,3 +1,3 @@
 class NyaaAnime
-  VERSION = "0.3.1"
+  VERSION = "0.3.4"
 end

data/nyaa_anime.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = NyaaAnime::VERSION
   spec.authors       = ["Joshua Tsubaki Wu"]
   spec.email         = ["wujoshuawu@gmail.com"]
-  spec.summary       = %q{the painless Nyaa Torrents anime command-line tool}
+  spec.summary       = %q{the painless NyaaTorrents anime command-line tool}
   spec.description   = "`nyaa` (short for `nyaa_anime`) is the painless Nyaa Torrents anime " <<
                        "command-line tool. Search for and download anime torrents and open " <<
                        "them automatically. Results are color-coded - green for new episodes of " <<

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nyaa_anime
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.4
 platform: ruby
 authors:
 - Joshua Tsubaki Wu
@@ -180,5 +180,5 @@ rubyforge_project:
 rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
-summary: the painless Nyaa Torrents anime command-line tool
+summary: the painless NyaaTorrents anime command-line tool
 test_files: []