nyaa_anime 0.8.2 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ba7aa90f66024323a49d1989fdf783419e8bfd3
-  data.tar.gz: d6e20d46a46a18ef7545e153b38c34ee27884db6
+  metadata.gz: 0c4c190239b5baf100c07ba7b8dc5336f63b3dc4
+  data.tar.gz: d518e8d14fc44ce129bdd6aa979a088f098059ad
 SHA512:
-  metadata.gz: 5771be98e39ffeb8ebf1f2de2a28f6090bff8428fbc7e992195e301193e6870d42cd105e0f230d299d1e6a577cfb9b91de342f142c3372a64d433798a86fff55
-  data.tar.gz: 97927ef0ff0c716e27d8ae14cf9b99f9814c66d92e0dd602d01961ed8617934d122850893f94e7f441243133878187f6ae15a8418d5b77c9ca117a45d231c72b
+  metadata.gz: b77ba04c27f78adf3e3d82afa411c8034bec2807d875ef14aebf650a6a5297825a197ccbee94565e6ce37705dbd9ed9e100298e6a413e76066bdb58d9634fe42
+  data.tar.gz: 012745fb00c81368242a35217c49cbb13ef940eb71db6a2777407cf33508b1529b6b8ddc8ae593f6588630fcd703307a130e5c9763cd2cbfd2308d4bb6f3b61f

data/README.md

@@ -1,48 +1,48 @@
-# NyaaAnime
-
-`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 previously downloaded torrents, cyan (blue) for previously downloaded torrents.
-Automatically find and downloaded new episodes of previously downloaded anime with `$ nyaa get`!
-List downloaded torrent files with `$ nyaa list [-a]`.
-Delete torrents for a series with `$ nyaa remove ...`.
-
-## Installation
-
-    $ gem install nyaa_anime
-
-That's all!
-
-## Usage (a bit outdated)
-
-Run `$ nyaa` to see the usage text:
-
-![Screenshot 2014-10-16 06.39.22.png](https://bitbucket.org/repo/yn7dbo/images/3610502476-Screenshot%202014-10-16%2006.39.22.png)
-
-For example, try `$ nyaa -m -f ch no game no life`:
-
-![Screenshot 2014-10-16 06.44.21.png](https://bitbucket.org/repo/yn7dbo/images/2797464601-Screenshot%202014-10-16%2006.44.21.png)
-
-Downloads are saved to `~/Downloads/nyaa/`. Future queries will check the files there and automatically color-code the search results. Green is for new episodes of previously downloaded torrents, while cyan (blue) is for previously downloaded torrents:
-
-![Screenshot 2014-10-16 06.46.11.png](https://bitbucket.org/repo/yn7dbo/images/157798882-Screenshot%202014-10-16%2006.46.11.png)
-
-The `-n` (`--new`) option makes `nyaa` find new episodes of previously downloaded anime (the torrents in `~/Downloads/nyaa/`):
-
-![Screenshot 2014-10-16 06.47.55.png](https://bitbucket.org/repo/yn7dbo/images/2090162283-Screenshot%202014-10-16%2006.47.55.png)
-
-You can also run `$ nyaa get` which is equivalent to `$ nyaa -na`:
-
-![Screenshot 2014-10-16 06.48.33.png](https://bitbucket.org/repo/yn7dbo/images/3719415092-Screenshot%202014-10-16%2006.48.33.png)
-
-## Donations
-
-If you like `nyaa`, please donate via PayPal to wujoshuawu@gmail.com to keep me afloat. Thank you!
-
-## Contributing
-
-1. Fork it ( https://bitbucket.org/tsubaki/nyaa_anime/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+# NyaaAnime
+
+`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 previously downloaded torrents, cyan (blue) for previously downloaded torrents.
+Automatically find and downloaded new episodes of previously downloaded anime with `$ nyaa get`!
+List downloaded torrent files with `$ nyaa list [-a]`.
+Delete torrents for a series with `$ nyaa remove ...`.
+
+## Installation
+
+    $ gem install nyaa_anime
+
+That's all!
+
+## Usage (very outdated)
+
+Run `$ nyaa` to see the usage text:
+
+![Screenshot 2014-10-16 06.39.22.png](https://bitbucket.org/repo/yn7dbo/images/3610502476-Screenshot%202014-10-16%2006.39.22.png)
+
+For example, try `$ nyaa -m -f ch no game no life`:
+
+![Screenshot 2014-10-16 06.44.21.png](https://bitbucket.org/repo/yn7dbo/images/2797464601-Screenshot%202014-10-16%2006.44.21.png)
+
+Downloads are saved to `~/Downloads/nyaa/`. Future queries will check the files there and automatically color-code the search results. Green is for new episodes of previously downloaded torrents, while cyan (blue) is for previously downloaded torrents:
+
+![Screenshot 2014-10-16 06.46.11.png](https://bitbucket.org/repo/yn7dbo/images/157798882-Screenshot%202014-10-16%2006.46.11.png)
+
+The `-n` (`--new`) option makes `nyaa` find new episodes of previously downloaded anime (the torrents in `~/Downloads/nyaa/`):
+
+![Screenshot 2014-10-16 06.47.55.png](https://bitbucket.org/repo/yn7dbo/images/2090162283-Screenshot%202014-10-16%2006.47.55.png)
+
+You can also run `$ nyaa get` which is equivalent to `$ nyaa -na`:
+
+![Screenshot 2014-10-16 06.48.33.png](https://bitbucket.org/repo/yn7dbo/images/3719415092-Screenshot%202014-10-16%2006.48.33.png)
+
+## Donations
+
+If you like `nyaa`, please donate via PayPal to wujoshuawu@gmail.com to keep me afloat. Thank you!
+
+## Contributing
+
+1. Fork it ( https://bitbucket.org/tsubaki/nyaa_anime/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/bin/nyaa-get

@@ -1,6 +1,3 @@
 #!/usr/bin/env ruby
 
-puts "DEPRECATED: Please use `nyaa get` instead. `nyaa-get` will be removed from future releases."
-
-ARGV[0] = "get"
-load "#{File.dirname(__FILE__)}/nyaa_anime"
+puts "DEPRECATED: Please use `nyaa get` instead."

data/lib/nyaa_anime/entry.rb

@@ -0,0 +1,40 @@
+class Entry
+
+  require 'nyaa_anime'
+
+  attr_reader :title, :link, :hashless, :distro_episode, :distro_meta, :subber, :series, :episode, :last_ep, :meta
+
+  def initialize(title, link=nil)
+    @title = title
+    @link = link
+    match = @title.scan(/\A(\[[^\[\]]+\])?[_\s]*(.+?)[_\s]*-?[_\s]*(\d+(\.\d+)?(v\d+)?|\d+-\d+)[_\s]*(.+?)[_\s]*(\[\w{8,}\])?[_\s]*(\.\w+)*\z/)
+    @subber, @series, @episode, @meta = match[0].values_at(0, 1, 2, 5)
+    @episode, @last_ep = @episode.split("-").map { |ep| ep.to_i }
+    @last_ep ||= @episode
+    @distro_episode = "#{@subber} #{@series} #{@episode}"
+    @distro_meta = "#{@subber} #{@series} #{@meta}"
+    @hashless = "#{@subber} #{@series} #{@episode} #{@meta}"
+  end
+
+  def ==(other)
+    @title == other.title &&
+      @link == other.link
+  end
+
+  def <=>(other)
+    if @title == other.title
+      @link <=> other.link
+    else
+      @title <=> other.title
+    end
+  end
+
+  def to_s
+    @hashless
+  end
+
+  def first_ep
+    @episode
+  end
+
+end

data/lib/nyaa_anime/list.rb

@@ -21,11 +21,11 @@ end
 
 require 'nyaa_anime'
 
-dt_ds = NyaaAnime.downloaded_torrents_by_distro
-ds = dt_ds.keys.sort!
-ds.each_with_index do |distro, idx|
+de_ds = NyaaAnime.downloaded_entries_by_distro
+de_ds.each_with_index do |distro_entries, idx|
+  distro, entries = distro_entries
   puts "#{idx+1}: #{distro}"
   if options[:list_all]
-    dt_ds[distro].each { |torrent| puts "    #{torrent}" }
+    entries.each { |entry| puts "    #{e.title}" }
   end
 end

data/lib/nyaa_anime/remove.rb

@@ -31,9 +31,9 @@ end
 require 'nyaa_anime'
 
 TORRENTS_BY_DISTRO = NyaaAnime.downloaded_torrents_by_distro
-ds = TORRENTS_BY_DISTRO.keys.sort!
+distros = TORRENTS_BY_DISTRO.keys.sort!
 
-if ds.size == 0
+if distros.size == 0
   puts "No files in #{NyaaAnime::NYAA_DL_DIR}."
 end
 
@@ -56,19 +56,19 @@ end
 
 if options[:number]
   num = options[:number]
-  if (1..ds.size).include? num
-    delete_distro ds[num-1]
+  if (1..distros.size).include? num
+    delete_distro distros[num-1]
   else
-    warn "Error: Number (#{num}) out of range 1-#{ds.size}."
+    warn "Error: Number (#{num}) out of range 1-#{distros.size}."
     exit 1
   end
   exit
 end
 
 term = ARGV[1..-1].join " "
-ds = TORRENTS_BY_DISTRO.keys.select { |distro| !!distro[/#{term}/i] }
-if ds.count == 0
+distros = TORRENTS_BY_DISTRO.keys.select { |distro| !!distro[/#{term}/i] }
+if distros.count == 0
   warn "Error: No torrent files matching \"#{term}\"."
   exit 1
 end
-ds.each { |distro| delete_distro distro }
+distros.each { |distro| delete_distro distro }

data/lib/nyaa_anime/search.rb

@@ -16,6 +16,7 @@ options = {}
 option_parser = OptionParser.new do |opts|
   opts.banner = "Usage: nyaa search [options] <anime>\n" <<
                 "       nyaa s [options] <anime>\n" <<
+                "       nyaa search -n [-a [-q]]\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"
@@ -80,16 +81,15 @@ end
 
 require 'nyaa_anime'
 require 'colorize'
-nyaa = NyaaAnime.new
 
 if options[:find_new]
-  titles = nyaa.find_new_titles !!options[:quiet]
-  if nyaa.downloads.count == 0
+  entries = NyaaAnime.find_new_titles(!!options[:quiet]).sort!
+  if entries.count == 0
     puts "No new episodes found."
     exit
   else
-    puts "#{nyaa.downloads.count} new episode#{"s" if nyaa.downloads.count > 1} found!".colorize(NyaaAnime::NEW_COLOR)
-    titles.each_with_index { |t, i| puts "#{i+1}: #{t.colorize(NyaaAnime::NEW_COLOR)}" }
+    puts "#{entries.count} new episode#{"s" if entries.count > 1} found!".colorize(NyaaAnime::NEW_COLOR)
+    entries.each_with_index { |entry, i| puts "#{i+1}: #{entry.to_s.colorize(NyaaAnime::NEW_COLOR)}" }
   end
 else
   search_term = ARGV[1..-1].join " "
@@ -100,33 +100,29 @@ else
     exit 1
   end
   puts "Searching for \"#{search_term}\"..." unless options[:quiet]
-  results = nyaa.search search_term
+  colorized_entries = NyaaAnime.colorized_entries NyaaAnime.search(search_term).sort!
+  new_entries = colorized_entries[:new]
+  entries = colorized_entries.values.flatten!
   if options[:list_individually]
-    results.each_with_index { |t, i| puts "#{i+1}: #{NyaaAnime.hashless_title t}" } unless options[:quiet]
+    entries.each_with_index { |entry, i| puts "#{i+1}: #{entry}" } unless options[:quiet]
   else
-    results = NyaaAnime.torrents_by_distro results
+    entries = NyaaAnime.entries_by_distro(entries).to_a
     unless options[:quiet]
-      results.keys.sort!.each_with_index do |ds, i|
-        if results[ds].count == 1
-          puts "#{i+1}: #{NyaaAnime.hashless_title ds}"
+      entries.each_with_index do |d_e, i|
+        distro, ents = d_e
+        if ents.count == 1
+          puts "#{i+1}: #{ents.first}"
           next
         end
-        first_ep = NyaaAnime.episode_of_title(results[ds].first)
-        last_ep = NyaaAnime.episode_of_title(results[ds].last)
-        if first_ep && last_ep
-          ep_tag = "(#{first_ep.first}~#{last_ep.last})"
-        else
-          ep_tag = "(#{results[ds].count} torrent#{"s" if results[ds].count > 1})"
-        end
-        puts "#{i+1}: #{ep_tag.bold} #{ds}"
+        puts "#{i+1}: #{"([#{ents.count}] #{ents.first.first_ep}~#{ents.last.last_ep})".bold} #{distro}"
       end
     end
   end
-  if nyaa.downloads.count == 0
+  if entries.count == 0
     puts "No results for \"#{search_term}\"."
     exit
   else
-    puts "#{nyaa.downloads.count} result#{"s" if nyaa.downloads.count > 1}, #{nyaa.new_titles.count} new."
+    puts "#{entries.count} result#{"s" if entries.count > 1}, #{new_entries.count} new."
   end
 end
 
@@ -152,37 +148,35 @@ def prompt_to_open(torrents)
 end
 
 if options[:download_all]
-  prompt_to_open nyaa.download_all
+  prompt_to_open NyaaAnime.download entries
   exit
 end
 
-if results.count > 1
-  prompt = "Download (1-#{results.count}, 'a(ll)'" <<
-           "#{", 'n(ew)'" if nyaa.new_titles.count > 0 && !options[:find_new]}" <<
+if entries.count > 1
+  prompt = "Download (1-#{entries.count}, 'a(ll)'" <<
+           "#{", 'n(ew)'" if new_entries.count > 0 && !options[:find_new]}" <<
            ", or [ENTER] to cancel): "
   choice = ask(prompt) do |q|
     q.validate = Proc.new do |input|
       input == "" ||
-      ("new"[/\A#{input}/i] && nyaa.new_titles.count > 0 && !options[:find_new]) ||
+      ("new"[/\A#{input}/i] && new_entries.count > 0 && !options[:find_new]) ||
       "all"[/\A#{input}/i] ||
-      (1..results.count).include?(input.to_i)
+      (1..entries.count).include?(input.to_i)
     end
     q.responses[:not_valid] = ""
   end
 
   if choice == ""
   elsif choice[/\An/i]
-    prompt_to_open nyaa.download_all_new
+    prompt_to_open NyaaAnime.download new_entries
   elsif choice[/\Aa/i]
-    prompt_to_open nyaa.download_all
+    prompt_to_open NyaaAnime.download entries
   else
-    torrent = results.is_a?(Array) ? results[choice.to_i-1] : results[results.keys.sort![choice.to_i-1]]
-    prompt_to_open nyaa.download(torrent)
+    prompt_to_open NyaaAnime.download(entries.first.is_a?(Array) ? entries[choice.to_i-1][1] : entries[choice.to_i-1])
   end
 
 else
   if agree "Download? (y/n): "
-    torrent = results.is_a?(Array) ? results.first : results.values.first
-    prompt_to_open nyaa.download(torrent)
+    prompt_to_open NyaaAnime.download(entries.first.is_a?(Array) ? entries.first[1].first : entries.first)
   end
 end

data/lib/nyaa_anime/version.rb

@@ -1,3 +1,3 @@
 class NyaaAnime
-  VERSION = "0.8.2"
+  VERSION = "0.9.2"
 end

data/lib/nyaa_anime.rb

@@ -2,6 +2,7 @@ require "nyaa_anime/version"
 
 class NyaaAnime
 
+  require 'nyaa_anime/entry'
   require 'open-uri'
   require 'nokogiri'
   require 'cgi'
@@ -21,16 +22,11 @@ class NyaaAnime
   CL_WIDTH = 70
   THREAD_COUNT = 20
 
-  attr_reader :downloads, :new_titles
-
   FileUtils.mkdir_p NYAA_DL_DIR
 
-  def search(title)
-    @downloads = {}
-    @titles = []
+  def self.search(title)
+    entries = []
     url = "#{NYAA_SEARCH_DEFAULT}#{CGI.escape(title)}&offset="
-    titles = []
-    dl_urls = []
     offset = 1
     loop do
       begin
@@ -39,158 +35,100 @@ class NyaaAnime
         $stderr.print "Error: Could not connect to NyaaTorrents.\n"
         exit 1
       end
-      titles.concat results.css('title').map { |t| t.content }
-      dl_urls.concat results.css('link').map { |l| l.next.content }
+      entries.concat results.map { |r| Entry.new r.css('title')[0].content, r.css('link')[0].next.content }
       break if results.count < NYAA_ENTRIES_PER_PAGE || offset >= MAX_PAGES
       offset += 1
     end
-    titles.each_with_index { |t, i| @downloads[t] = dl_urls[i] }
-    @titles = titles.sort!
-    categorize_titles!
-    colorized_titles
+    entries
   end
 
-  def find_new_titles(quiet=false)
-    search_terms = NyaaAnime.distros_of_downloaded_titles
-    new_titles = Set.new
-    new_downloads = {}
+  def self.find_new_titles(quiet=false)
+    search_terms = NyaaAnime.downloaded_entries.map { |e| e.distro_meta }
+    search_terms.uniq!
     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
+    all_results = []
     Parallel.each(search_terms, in_threads: THREAD_COUNT) do |t|
-      n = NyaaAnime.new
-      n.search t
+      results = NyaaAnime.categorize_entries(NyaaAnime.search t)[:new]
       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(NEW_COLOR) : "none found.")
+                (results.any? ? "#{results.count} found!".colorize(NEW_COLOR) : "none found.")
           puts "[#{index.to_s.rjust(search_terms.count.to_s.size, "0")}#{msg}"
           index += 1
         end
       end
+      all_results.concat results
     end
-    @new_titles = new_titles
-    @downloads = new_downloads
-    @already_downloaded_titles = Set.new
-    @version_differing_titles = Set.new
-    @other_titles = Set.new
-    @titles = new_titles.to_a.sort!
-  end
-
-  def colorized_titles
-    @titles.map do |t|
-      if @already_downloaded_titles.include? t
-        t.colorize ALREADY_DOWNLOADED_COLOR
-      elsif @new_titles.include? t
-        t.colorize NEW_COLOR
-      else
-        t
-      end
-    end
-  end
-
-  def categorize_titles!
-    @already_downloaded_titles = Set.new
-    @new_titles = Set.new
-    @other_titles = Set.new
-    @version_differing_titles = Set.new
-    dls = NyaaAnime.downloaded_torrents
-    downloaded_distros = NyaaAnime.distros_of_downloaded_titles
-    stripped_dls = NyaaAnime.stripped_downloaded_titles
-    @titles.each do |t|
-      if dls.include? "#{t}.torrent"
-        @already_downloaded_titles.add t
-      elsif stripped_dls.include? NyaaAnime.stripped_title(t)
-        @version_differing_titles.add t
-      elsif downloaded_distros.include? NyaaAnime.distro_of_title(t)
-        @new_titles.add t
+    all_results.uniq!
+    all_results.sort!
+  end
+
+  def self.colorized_entries(entries)
+    c = self.categorize_entries entries
+    c[:downloaded] = c[:downloaded].map { |e| Entry.new e.title.colorize(ALREADY_DOWNLOADED_COLOR), e.link }
+    c[:new] = c[:new].map { |e| Entry.new e.title.colorize(NEW_COLOR), e.link }
+    c
+  end
+
+  def self.categorize_entries(entries)
+    result = { downloaded: [], new: [], version: [], other: [] }
+    dls = NyaaAnime.downloaded_entries
+    downloaded_titles = dls.map { |e| e.title }
+    downloaded_distro_metas = dls.map { |e| e.distro_meta }
+    downloaded_distro_metas.uniq!
+    downloaded_distro_episodes = dls.map { |e| e.distro_episode }
+    downloaded_distro_episodes.uniq!
+    entries.each do |e|
+      if downloaded_titles.include? "#{e.title}.torrent"
+        result[:downloaded].push e
+      elsif downloaded_distro_episodes.include? e.distro_episode
+        result[:version].push e
+      elsif downloaded_distro_metas.include? e.distro_meta
+        result[:new].push e
       else
-        @other_titles.add t
+        result[:other].push e
       end
     end
-    nil
+    result
   end
 
-  def self.stripped_title(torrent)
-    torrent.gsub("_", " ").sub(/(\s*\[\w*\])*(\.\w+)*\z/, "")
+  def self.downloaded_entries
+    Dir["#{NYAA_DL_DIR}*"].select { |f| File.file? f }.map { |f| Entry.new File.basename(f) }
   end
 
-  def self.hashless_title(torrent)
-    torrent.gsub("_", " ").sub(/(\s*\[\w{8,}\])?(\.\w+)*\z/, "")
-  end
-
-  def self.episode_of_title(torrent)
-    ep = NyaaAnime.hashless_title(torrent)[/\s+-\s+(\d+(\.\d+)?(v\d+)?-?)+\s*/, 1]
-    if ep.nil?
-      ep = NyaaAnime.hashless_title(torrent)[/\s+(\d+(\.\d+)?(v\d+)?-?)+\s*/, 1]
-    end
-    unless ep.nil?
-      ep.split("-").map { |e| e[/0*(\d+)/, 1] }
-    end
-  end
-
-  def self.distro_of_title(torrent)
-    distro = NyaaAnime.hashless_title(torrent).sub!(/\s+-\s+(\d+(\.\d+)?(v\d+)?-?)+\s*/, " ")
-    if distro
-      distro
-    else
-      NyaaAnime.hashless_title(torrent).sub(/\s+(\d+(\.\d+)?(v\d+)?-?)+\s*/, " ")
-    end
-  end
-
-  def self.downloaded_torrents
-    Dir["#{NYAA_DL_DIR}*"].select { |f| File.file? f }.map { |f| File.basename f }
-  end
-
-  def self.stripped_downloaded_titles
-    dls = Set.new
-    NyaaAnime.downloaded_torrents.each { |t| dls.add NyaaAnime.stripped_title(t) }
-    dls
-  end
-
-  def self.distros_of_downloaded_titles
-    dls = Set.new
-    NyaaAnime.downloaded_torrents.each { |t| dls.add NyaaAnime.distro_of_title(t) }
-    dls
-  end
-
-  def self.torrents_by_distro(torrents)
+  def self.entries_by_distro(entries)
     dls = {}
-    torrents.each { |t| (dls[NyaaAnime.distro_of_title(t)] ||= []) << t }
+    entries.each { |e| (dls[e.distro_meta] ||= []) << e }
     dls
   end
 
-  def self.downloaded_torrents_by_distro
-    NyaaAnime.torrents_by_distro NyaaAnime.downloaded_torrents
+  def self.downloaded_entries_by_distro
+    NyaaAnime.entries_by_distro NyaaAnime.downloaded_entries
   end
 
-  def download_single(title)
-    torrent = open @downloads[title]
-    filename = torrent.meta["content-disposition"][/filename="(.+\.torrent)"/, 1]
+  def self.download_single(entry)
+    torrent = open entry.link
+    if redir = torrent.meta["refresh"]
+      torrent = open redir[/url=(.+)\z/, 1]
+    end
+    filename = "#{entry.title.uncolorize}.torrent"
+    #filename = torrent.meta["content-disposition"][/filename="(.+\.torrent)"/, 1]
     open("#{NYAA_DL_DIR}#{filename}", "w") { |f| f.write torrent.read }
-    "#{NYAA_DL_DIR}\"#{title}.torrent\""
+    "#{NYAA_DL_DIR}\"#{filename}\""
   end
 
-  def download(titles)
-    if titles.is_a? Array
-      Parallel.map(titles) { |t| download_single(t) }.sort!
+  def self.download(entries)
+    if entries.is_a? Array
+      Parallel.map(entries) { |e| self.download_single e }.sort!
     else
-      download_single titles
+      self.download_single entries
     end
   end
 
-  def download_all
-    download @titles
-  end
-
-  def download_all_new
-    download @new_titles
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyaa_anime
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.2
 platform: ruby
 authors:
 - Joshua Tsubaki Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -162,6 +162,7 @@ files:
 - bin/nyaa-get
 - bin/nyaa_anime
 - lib/nyaa_anime.rb
+- lib/nyaa_anime/entry.rb
 - lib/nyaa_anime/list.rb
 - lib/nyaa_anime/main.rb
 - lib/nyaa_anime/remove.rb
@@ -188,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: the painless NyaaTorrents anime command-line tool