nyaa_anime 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cf4a5f4fd7c88e19d9ee161ea0e6184909e71f0
-  data.tar.gz: bde9b108e3bc7cd07c80c5d387c8459f11dfdcdd
+  metadata.gz: db19508ca23a44049cc98752b23f2e8440c52c56
+  data.tar.gz: ce9b81cd34a5e276ee9a86fe8e9828d55362e049
 SHA512:
-  metadata.gz: 49bc891e22b69b273004482ee14f569578105e0886e9129147edbacd9d57463c27fb716b4be57fb43d0ecbee8710e20cee9417741cc1907cd0eeac5ba767b2bb
-  data.tar.gz: a4cd398f26d9e87c0d165b9f81dad675fc270160f2e0013c50d3b0895bda6ccc3ddf1ef8d17a8026afdf1b885b5c16b528612ee03cb79c2dd56190a7163757a4
+  metadata.gz: 2e77e9d2d0e58bd96b3a3cec04db5f0417e434ee62e9c8ecc18d81799efc141d6c82cb27d33a7c718c7a5ac8300d1bf1ad33ee260f03f1092dd941f1928914e3
+  data.tar.gz: b3ab356a57a519d08d1e2444957304b40e5fb790702b8f5ce0d989addec3cb05826b18b392ea142d9f6e43eb3241f61e553eaf8250cd4dce41bc43fb5e70f16a

data/lib/nyaa_anime.rb

@@ -2,7 +2,6 @@ require "nyaa_anime/version"
 
 class NyaaAnime
 
-  require 'parallel'
   require 'open-uri'
   require 'nokogiri'
   require 'cgi'
@@ -14,31 +13,30 @@ class NyaaAnime
   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 = 30
+  NYAA_ENTRIES_PER_PAGE = 100
   TITLE_TOLERANCE_RANGE = (1..4)
   NEW_COLOR = :green
   ALREADY_DOWNLOADED_COLOR = :cyan
-  THREAD_COUNT = 5
 
   attr_reader :downloads, :new_titles
 
   def search(title, quiet=true)
-    puts "Searching for \"#{title}\"..." unless quiet
+    print "Searching for \"#{title}\"..." unless quiet
     @downloads = {}
     @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
+    titles = []
+    dl_urls = []
+    offset = 1
+    while true
+      print "."
+      results = Nokogiri::HTML(open("#{url}#{offset}")).css('item')
+      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 += 1
     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?
+    print "\n" unless quiet
     titles.each_with_index { |t, i| @downloads[t] = dl_urls[i] }
     @titles = titles.sort!
     categorize_titles
@@ -48,16 +46,16 @@ class NyaaAnime
 
   def find_new_titles
     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 }
+    new_titles = Set.new
+    new_downloads = {}
+    search_terms.each do |t|
+      search t
+      new_titles.merge @new_titles
+      @new_titles.each { |ti| new_downloads[ti] = @downloads[ti] }
+      if @new_titles.any?
+        puts "#{@new_titles.count} new episode#{"s" if @new_titles.count > 1}!".colorize(:green)
+      end
     end
-    new_titles = new_titles.reduce(Set.new) { |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
@@ -155,11 +153,11 @@ class NyaaAnime
   end
 
   def download_all
-    Parallel.map(@titles, in_threads: THREAD_COUNT) { |t| download(t) }
+    @titles.map { |t| download(t) }
   end
 
   def download_all_new
-    Parallel.map(@new_titles, in_threads: THREAD_COUNT) { |t| download(t) }
+    @new_titles.map { |t| download(t) }
   end
 
   def download_count

data/lib/nyaa_anime/version.rb

@@ -1,3 +1,3 @@
 class NyaaAnime
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

data/nyaa_anime.gemspec

@@ -23,7 +23,6 @@ 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 'nokogiri', '~> 1.6', '>= 1.6.2.1'
   spec.add_runtime_dependency 'colorize', '~> 0.7', '>= 0.7.3'
   spec.add_runtime_dependency 'levenshtein-ffi', '~> 1.1'

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: nyaa_anime
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Joshua Tsubaki Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-17 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: nokogiri
   requirement: !ruby/object:Gem::Requirement