nyaa_anime 0.9.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c4c190239b5baf100c07ba7b8dc5336f63b3dc4
-  data.tar.gz: d518e8d14fc44ce129bdd6aa979a088f098059ad
+  metadata.gz: 9ed33589583c32700b94c52b0947779ce5f5499c
+  data.tar.gz: c7dad8d8e516cc827c830b0407e655189d3a3772
 SHA512:
-  metadata.gz: b77ba04c27f78adf3e3d82afa411c8034bec2807d875ef14aebf650a6a5297825a197ccbee94565e6ce37705dbd9ed9e100298e6a413e76066bdb58d9634fe42
-  data.tar.gz: 012745fb00c81368242a35217c49cbb13ef940eb71db6a2777407cf33508b1529b6b8ddc8ae593f6588630fcd703307a130e5c9763cd2cbfd2308d4bb6f3b61f
+  metadata.gz: 046ed9451c7a4003adf2fcd3fafab964eb26f911d7c6df7d5959548dcead92d8ab09f5aa081995eaeac492247d6181caf3fcb56484c60c49a7701524e2992623
+  data.tar.gz: e9a2f98e294e0b8c995d380a72244e8a4c7d71a3be03aa6f9e4d6152b9d7ba26d7f951647224dd3daeb63e99d4506e1d4488e5ca48f56c1967fd3685fca98dee

data/lib/nyaa_anime.rb

@@ -14,6 +14,7 @@ class NyaaAnime
   NYAA_URI = "http://nyaa.se"
   NYAA_SEARCH = "#{NYAA_URI}/?page=rss"
   NYAA_SEARCH_DEFAULT = "#{NYAA_SEARCH}&cats=1_37&filter=2&term="
+  NYAA_SEARCH_BACKUP = "#{NYAA_SEARCH}&cats=1_37&filter=0&term="
   NYAA_DL_DIR = "#{Dir.home}/Downloads/nyaa/"
   NYAA_ENTRIES_PER_PAGE = 100
   MAX_PAGES = 20
@@ -24,9 +25,10 @@ class NyaaAnime
 
   FileUtils.mkdir_p NYAA_DL_DIR
 
-  def self.search(title)
+  def self.search(title, filter=true)
+    base_url = filter ? NYAA_SEARCH_DEFAULT : NYAA_SEARCH_BACKUP
     entries = []
-    url = "#{NYAA_SEARCH_DEFAULT}#{CGI.escape(title)}&offset="
+    url = "#{base_url}#{CGI.escape(title)}&offset="
     offset = 1
     loop do
       begin

data/lib/nyaa_anime/entry.rb

@@ -7,7 +7,10 @@ class Entry
   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/)
+    match = @title.scan(/\A(\[[^\[\]]+\])?[_\s]*(.+?)[_\s]*-?[_\s]*(\d+(\.\d+)?(v\d+)?|\d+-\d+)[_\s]+((?!-).+?)[_\s]*(\[\w{8,}\])?[_\s]*(\.\w+)*\z/)
+    if match[0].nil?
+      match[0] = ['undefined', 'undefined', 'undefined', nil, nil, 'undefined']
+    end
     @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

data/lib/nyaa_anime/remove.rb

@@ -30,8 +30,8 @@ end
 
 require 'nyaa_anime'
 
-TORRENTS_BY_DISTRO = NyaaAnime.downloaded_torrents_by_distro
-distros = TORRENTS_BY_DISTRO.keys.sort!
+ENTRIES_BY_DISTRO = NyaaAnime.downloaded_entries_by_distro
+distros = ENTRIES_BY_DISTRO.keys.sort!
 
 if distros.size == 0
   puts "No files in #{NyaaAnime::NYAA_DL_DIR}."
@@ -40,7 +40,7 @@ end
 require 'highline/import'
 
 if options[:remove_all]
-  ts = NyaaAnime.downloaded_torrents.map { |t| "#{NyaaAnime::NYAA_DL_DIR}#{t}" }
+  ts = NyaaAnime.downloaded_entries.map { |entry| "#{NyaaAnime::NYAA_DL_DIR}#{entry.title}" }
   if agree "Delete all #{ts.size} torrent files? (y/n) "
     File.delete(*ts)
   end
@@ -48,7 +48,7 @@ if options[:remove_all]
 end
 
 def delete_distro(distro)
-  ts = TORRENTS_BY_DISTRO[distro].map { |t| "#{NyaaAnime::NYAA_DL_DIR}#{t}" }
+  ts = ENTRIES_BY_DISTRO[distro].map { |entry| "#{NyaaAnime::NYAA_DL_DIR}#{entry.title}" }
   if agree "Delete all #{ts.size} torrent files for #{distro}? (y/n) "
     File.delete(*ts)
   end
@@ -66,7 +66,7 @@ if options[:number]
 end
 
 term = ARGV[1..-1].join " "
-distros = TORRENTS_BY_DISTRO.keys.select { |distro| !!distro[/#{term}/i] }
+distros = ENTRIES_BY_DISTRO.keys.select { |distro| !!distro[/#{term}/i] }
 if distros.count == 0
   warn "Error: No torrent files matching \"#{term}\"."
   exit 1

data/lib/nyaa_anime/search.rb

@@ -24,6 +24,9 @@ option_parser = OptionParser.new do |opts|
   opts.on("-i", "--individual", "List all results individually") do
     options[:list_individually] = true
   end
+  opts.on("-F", "--no-filter", "Do not filter") do
+    options[:no_filter] = true
+  end
 
   opts.on("-n", "--new", "Find all new episodes of",
           "previously downloaded anime") do
@@ -100,7 +103,8 @@ else
     exit 1
   end
   puts "Searching for \"#{search_term}\"..." unless options[:quiet]
-  colorized_entries = NyaaAnime.colorized_entries NyaaAnime.search(search_term).sort!
+  entries = options[:no_filter] ? NyaaAnime.search(search_term, false) : NyaaAnime.search(search_term)
+  colorized_entries = NyaaAnime.colorized_entries entries.sort!
   new_entries = colorized_entries[:new]
   entries = colorized_entries.values.flatten!
   if options[:list_individually]

data/lib/nyaa_anime/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyaa_anime
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.4
 platform: ruby
 authors:
 - Joshua Tsubaki Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel