nyaa 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9622770089db1b59e44caa99baf401ac01f26886
-  data.tar.gz: 564720b84300fbbbc007f342cc36ed836aed5e81
+  metadata.gz: 5e8be02357f08ca16b78d260bb837ac144cd5dd7
+  data.tar.gz: 8e719e1005e106da3bba3c5f43935e324ffdb0d1
 SHA512:
-  metadata.gz: 2b3559c0302529a8d6c5f071fa36991bc3e960e07bec51c903b4f2b79a013981c51da6edcf0c3079dfd60fb50339c2838ec4f55aaee753ad90c8c4d36ac7e7d9
-  data.tar.gz: db3cc7c7e3c56a443737142ee6133fae27b1fe3cd0d2887959fb3f37230cf86e823e7ffde5c5a5b83008d75f141a978bb91170fd8f08703a5e7d0a7635e96001
+  metadata.gz: b41ad8e42fabeeea30d142cf60e0d0f8d90efa6d0fa4baedd11d6a724570df7f44cf654f7001e45fe99ca0d64482aea3338c397ca5695935e1f543c0c11de371
+  data.tar.gz: 7310f6fc15806f6f37dc54e2e8f9e2edb1fc470c4efe7e1a90df0732d81e066d0f9c2e9cfeedd102a587fd2fa7e7bfcd4ec895b588ad43de6b271ad31024e65d

data/bin/nyaa

@@ -5,16 +5,13 @@ $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 require 'nyaa'
 include Curses
 
-
 @opts = Nyaa::CLI.parse(ARGV)
-@search = Nyaa::Search.new(@opts[:query], @opts[:category], @opts[:filter])
+@search = Nyaa::Search.new(@opts[:query], @opts[:category], @opts[:filter], @opts[:sort], @opts[:order])
 
 def batch_mode
     results = @search.more.get_results
     results.each do |r|
-      puts "o #{r.name}"
-      puts "#{r.link}"
-      puts
+      puts "#{r.link}\t#{r.name}"
     end
     exit
 end
@@ -33,31 +30,34 @@ if @opts[:batch]
   batch_mode
 end
 
-nyaa = Nyaa::UI.new(@opts, @search)
-cursor = 1
+nyaa = Nyaa::UI.new(@opts, @search);
+Curses::timeout = 1000;
+cursor = 1;
 
 curses_mode do
   #TODO: Gracefully handle window resizing
   #Signal.trap('SIGWINCH', nyaa.status("Window size changed!", :failure))
-  loop do
-    nyaa.header
-    nyaa.status
-    nyaa.footer
-    nyaa.menu(cursor)
-    refresh
-
-    case getch
-    when *[Key::UP,'k']    then cursor = nyaa.move(cursor, -1)
-    when *[Key::DOWN,'j']  then cursor = nyaa.move(cursor, 1)
-    when *[Key::NPAGE,'n'] then nyaa.next_page
-    when *[Key::PPAGE,'p'] then nyaa.prev_page
-    when *[Key::ENTER,'g'] then nyaa.get(cursor)
-    when 'i' then nyaa.open(cursor)
-    when '?' then nyaa.help
-    when 'q' then @search.purge && break
-    #when Key::RESIZE then nyaa.status("Window size changed!", :failure)
+  begin
+    loop do
+      nyaa.header
+      nyaa.status
+      nyaa.footer
+      nyaa.menu(cursor)
+      refresh
+
+      case getch
+      when *[Key::UP,'k']    then cursor = nyaa.move(cursor, -1)
+      when *[Key::DOWN,'j']  then cursor = nyaa.move(cursor, 1)
+      when *[Key::NPAGE,'n'] then nyaa.next_page
+      when *[Key::PPAGE,'p'] then nyaa.prev_page
+      when *[Key::ENTER,'g'] then nyaa.get(cursor)
+      when 's' then nyaa.start(cursor);
+      when 'i' then nyaa.open(cursor)
+      when '?' then nyaa.help
+      when 'q' then @search.purge && break
+      #when Key::RESIZE then nyaa.status("Window size changed!", :failure)
+      end
     end
-  end
+  rescue Interrupt then end
 end
-
 exit

data/lib/nyaa/HELP

@@ -1,50 +1,35 @@
-= NYAA
-
-Nyaa is a command line interface to the nyaa.eu website.
-
-= COMMANDS
-
-↑ or k
-    Scroll up through the list of torrents
-
-↓ or j
-    Scroll down through the list of torrents
-
-p or PageUp
-    Skip back a page through the list of torrents
-
-n or PageDown
-    Skip forward a page through the list of torrents
-
-i
-    Opens the torrent description page in the default web browser.
-
-g or ENTER
-    Downloads the torrent into the output directory. This defaults
-    to the current directory, but can be changed. See `nyaa --help`.
-
-q
-    Quits
-
-?
-    Opens this help document
-
-= VIEW
-
-The header shows the current category you're browsing (e.g.
-"Anime >> English-translated Anime") in addition to:
-
- * "Size" refers to size of the files in the torrent 
- * "SE" is the number of seeders
- * "LE" is the number of leechers
-
-In the footer, "view" shows which results are currently being displayed,
-and the total results for your search. "recv" shows the number results
-currently loaded/fetched. If you page through results too fast, you
-might have to wait a second for more results to be fetched. "page" shows
-how many pages of results there are.
-
-You probably also noticed that some torrents are different colors. The 
-colors correspond to the filters on nyaa.eu. For example, trusted torrents
-are green and A+ torrents are blue. These colors depend on your terminal
-color settings, so they might different in your terminal.
+NYAA HELP
+=========
+
+  Keys - Navigation
+-----------------------------------------
+    ↑ or k          : Move cursor up
+    ↓ or j          : Move cursor down
+    p or Page Up    : Page up
+    n or Page Down  : Page down
+
+  Keys - Actions
+-----------------------------------------
+    i               : Opens the torrent page in a web browser.
+    g or ENTER      : Download the torrent to the output directory.
+    s               : (g)ets the torrent and tries to start it with the installed torrent client.
+    q               : Quit
+    ?               : Help screen
+
+  Interface - View
+-----------------------------------------
+    Header
+        Size        : Torrent size
+        SE          : Number of seeders
+        LE          : Number of leechers
+
+   Torrents
+        Blue        : A+ status
+        Green       : Trusted status
+        Red         : Remake status
+        White       : Normal status
+
+    Footer
+        view        : [displayed results] / total results
+        recv        : Number fetched (cached) results
+        page        : Number of pages of results

data/lib/nyaa/cli.rb

@@ -19,6 +19,12 @@ module Nyaa
           @config[:filter] = filter
         end
 
+        opt.on('-s', '--sort=SORT', 'Sort type for listing') do |sort|
+          split = sort.split('_');
+          @config[:sort] = Nyaa::SORT.has_key?(split.first.to_sym) ? split.first : 'date'
+          @config[:order] = Nyaa::ORDER.has_key?(split.last.to_sym) ? split.last : 'desc'
+        end
+
         @config[:output] = Dir.pwd
         opt.on('-o', '--output-path=PATH', 'Output directory for downloads') do |output|
           @config[:output] = output
@@ -48,7 +54,14 @@ Categories:
   all_categories
 
 Filters:
-  show_all, filter_remakes, trusted_only, aplus_only}
+  show_all, filter_remakes, trusted_only, aplus_only
+
+Sort:
+  date, seed, leech, download, size, name
+
+Sort Order:
+  asc, desc
+  Add one of these to the end of Sort as; -s date_asc, -s seed_desc etc.}
           exit
         end
       end

data/lib/nyaa/constants.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 module Nyaa
 
-    BASE_URL = 'http://www.nyaa.se/?page=search'
+    BASE_URL = 'http://www.nyaa.se/?page=rss'
 
     CATS = {
       :all_categories    => {
@@ -120,4 +120,18 @@ module Nyaa
         :title => 'A+ only'
       },
     }
+
+    SORT = {
+      :date     => '1',
+      :seed     => '2',
+      :leech    => '3',
+      :download => '4',
+      :size     => '5',
+      :name     => '6'
+    }
+
+    ORDER = {
+      :desc => '1',
+      :asc => '2'
+    }
 end

data/lib/nyaa/downloader.rb

@@ -16,10 +16,13 @@ module Nyaa
 
     def save
       unless @fail
+        path = self.destination + '/' + filename;
         File.open("#{self.destination}/#{filename}", 'w') do |f|
           f.write(self.response.read)
         end
+        return path;
       end
+      return nil;
     end
 
     def failed?

data/lib/nyaa/search.rb

@@ -1,14 +1,18 @@
 # -*- encoding : utf-8 -*-
 module Nyaa
   class Search
-    attr_accessor :query, :category, :filter
+    attr_accessor :query, :category, :filter, :sort, :order
     attr_accessor :offset, :count, :results
     attr_accessor :runid, :cachedir
 
-    def initialize(query, cat = nil, fil = nil)
+    def initialize(query, cat = nil, fil = nil, sort = nil, order = nil)
       self.query    = URI.escape(query)
+
       self.category = cat ? CATS[cat.to_sym][:id] : '0_0'
       self.filter   = fil ? FILS[fil.to_sym][:id] : '0'
+      self.sort = sort ? SORT[sort.to_sym] : nil
+      self.order = order ? ORDER[order.to_sym] : '2'
+
       self.offset   = 0
       self.results  = []
       self.count    = 1.0/0.0
@@ -32,10 +36,8 @@ module Nyaa
 
     def more
       self.offset += 1
-      if self.results.length < self.count
-        extract(self.offset)
-      end
-        self
+      extract(self.offset)
+      return self
     end
 
     # TODO: Deprecated function
@@ -94,17 +96,17 @@ module Nyaa
 
     def extract(page)
       raw = fetch(page)
-      doc = Nokogiri::HTML(raw)
-      self.count = doc.css('span.notice').text.match(/\d+/).to_s.to_i
-      rows = doc.css('div#main div.content table.tlist tr.tlistrow')
+      doc = Nokogiri::XML(raw)
+      rows = doc.xpath("//item");
       rows.each { |row| self.results << Torrent.new(row) }
+      self.count = self.results.count;
       #dump(page, self.results)
       #dump_json(page, self.results)
     end
 
     def fetch(page)
       url = "#{BASE_URL}&offset=#{page}"
-      url << "&cats=#{self.category}&filter=#{self.filter}"
+      url << "&cats=#{self.category}&filter=#{self.filter}" + ( self.sort != nil ?  "&sort=#{self.sort}&order=#{self.order}" : "");
       url << "&term=#{self.query}" unless self.query.empty?
       open(url).read
     end

data/lib/nyaa/torrent.rb

@@ -1,25 +1,30 @@
 # -*- encoding : utf-8 -*-
+require 'time'
 module Nyaa
 
   class Torrent
     attr_accessor :tid, :name, :info, :link
     attr_accessor :filesize, :seeders, :leechers
-    attr_accessor :category, :status, :downloads, :comments
+    attr_accessor :category, :status, :downloads, :date
     attr_accessor :health, :bytes
 
     def initialize (row = nil)
-      self.tid      = row.css('td.tlistname').at('a')['href'][/tid=\d+/].gsub(/\D/,'')
-      self.name     = row.css('td.tlistname').at('a').text.strip
-      self.info     = row.css('td.tlistname').at('a')['href']
-      self.link     = row.css('td.tlistdownload').at('a')['href']
-      self.filesize = row.css('td.tlistsize').text
-      self.seeders  = row.css('td.tlistsn').text.to_i
-      self.leechers = row.css('td.tlistln').text.to_i
+      self.tid      = row.at_css("link").text[/tid=\d+/].gsub(/\D/,'')
+      self.name     = row.at_css("title").text;
+      self.info     = row.at_css("guid").text;
+      self.link     = row.at_css("link").text;
 
-      self.status    = state(row.values[0])
-      self.category  = row.css('td.tlisticon').at('a')['title']
-      self.downloads = row.css('td.tlistdn').text
-      self.comments  = row.css('td.tlistmn').text
+      row.at_css("description").text.match(/(\d+)[^\d]+(\d+)[^\d]+(\d+)[^\d]+([^-]+)-?([^-]+)?/){
+        self.seeders = $1.to_i;
+        self.leechers = $2.to_i;
+        self.downloads = $3.to_i;
+        self.filesize = $4.strip;
+        filter = $5.nil? ? '' : $5.strip.downcase
+        self.status = state(filter)
+      }
+
+      self.category  = row.at_css("category").text;
+      self.date = Time.parse(row.at_css("pubDate")).localtime;
     end
 
 
@@ -44,10 +49,10 @@ module Nyaa
 
     def state(value)
       case value
-      when 'trusted tlistrow' then status = 'Trusted'
-      when 'remake tlistrow'  then status = 'Remake'
-      when 'aplus tlistrow'   then status = 'A+'
-      when 'tlistrow'         then status = 'Normal'
+      when 'trusted' then status = 'Trusted'
+      when 'remake'  then status = 'Remake'
+      when 'a+'      then status = 'A+'
+      when ''        then status = 'Normal'
       else status = 'Normal'
       end
       status

data/lib/nyaa/ui.rb

@@ -21,6 +21,7 @@ module Nyaa
       @commands = {
         '?' => 'help',
         'g' => 'get',
+        's' => 'start',
         'i' => 'info',
         'n' => 'next',
         'p' => 'prev',
@@ -30,6 +31,7 @@ module Nyaa
       @search = search
       @torrents = @search.more.results
       @num_torrents = @torrents.size
+      @loading = @torrents.size % 100 == 0 ? true : false;
       harvester # start bg harvester
       
       @menusize = lines - 4 # lines - header + footer + status
@@ -63,8 +65,8 @@ module Nyaa
 
       search_summary = sprintf " %-14s %-14s %-14s",
         "view: [#{@offset+1}-#{@offset+@menusize}]/#{@search.count}",
-        "recv: #{@num_torrents}/#{@search.count}",
-        "page: #{@page}/#{@num_pages}"
+        "recv: #{@num_torrents}/#{@loading ? "unk" : @search.count}",
+        "page: #{@page}/#{@loading ? "unk" : @num_pages}"
       attrset(color_pair(2))
       setpos(lines - 2, 0)
       addstr(sprintf "%-#{cols}s", search_summary)
@@ -93,10 +95,8 @@ module Nyaa
       setpos(xpos, 0)
 
       (0..@menusize-1).each do |i|
+
         if i < @search.count - @offset
-          if @torrents[@offset + i].nil?
-            status("Fetching more results, try again.", :failure)
-          else
             line_text = sprintf("% -#{@name_column_width}s %9s %9s %9s",
               truncate("#{@torrents[@offset + i].name}", @name_column_width),
               @torrents[@offset + i].filesize,
@@ -114,7 +114,6 @@ module Nyaa
               addstr(line_text)
             end
             xpos += 1
-          end
         else
           # blank lines if there's < @menusize of results
           line_text = " "*cols
@@ -122,6 +121,8 @@ module Nyaa
           xpos += 1
         end 
       end
+
+      status("Fetching more results, try again.", :failure) if @loading && @torrents[@offset + 1].nil?;
     end
 
     def help
@@ -154,17 +155,25 @@ module Nyaa
     def get(choice)
       torrent = @torrents[@offset + choice - 1]
       download = Downloader.new(torrent.link, @config[:output])
-      download.save
+      path = download.save
+
       unless download.failed?
         status("Downloaded successful: #{torrent.tid}", :success)
       else
         status("Download failed (3 attempts): #{torrent.tid}", :failure)
+        return nil;
       end
+
+      return path;
+    end
+
+    def start(choice)
+      path = self.get(choice);
+      self.open(path) if path != nil;
     end
 
     def open(choice)
-      torrent = @torrents[@offset + choice - 1]
-      link = "#{torrent.info}"
+      link = choice.class == Fixnum ? @torrents[@offset + choice - 1].info.to_s : choice;
       if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/ then
           system("start #{link}")
       elsif RbConfig::CONFIG['host_os'] =~ /darwin/ then
@@ -177,23 +186,17 @@ module Nyaa
 
     def next_page
       status("Ready.")
-      unless @page + 1 > @num_pages
+      unless @page + 1 > @num_pages && @loading == false
         @page += 1
       end
-
-      unless @offset + @menusize > @num_torrents
-        @offset += @menusize
-      end
+      @offset = (page - 1) * @menusize;
     end
 
     def prev_page
       unless @page - 1 < 1
         @page += -1
       end
-
-      unless @offset == 0
-        @offset -= @menusize
-      end
+      @offset = (@page - 1) * @menusize;
     end
 
     def resize_handler(cursor)
@@ -204,10 +207,21 @@ module Nyaa
 
     def harvester
       Thread.new do
-        until @num_torrents == @search.count
+        last = @torrents.size;
+        loop do
           @torrents = @search.more.results
           @num_torrents = @torrents.size
-          sleep 2
+
+          if last == @torrents.size then
+            @loading = false;
+            @num_pages = (@torrents.size / @menusize.to_f).ceil;
+            @page = @page > @num_pages ? @num_pages : @page;
+            @offset = (@page - 1) * @menusize;
+            break;
+          end
+
+          last = @torrents.size;
+          sleep(2);
         end
         Thread.kill
       end

data/lib/nyaa/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 module Nyaa
   NAME = 'nyaa'
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: nyaa
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - David Palma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.5
 description: Browse and download from NyaaTorrents from the command-line. Supports
@@ -32,7 +32,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE
 - README.md
@@ -58,12 +58,12 @@ require_paths:
 - - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []