nyaa 0.3.0 → 1.0.2

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 coverage
+Gemfile.lock
 InstalledFiles
 lib/bundler/man
 pkg
@@ -16,3 +17,5 @@ tmp
 .yardoc
 _yardoc
 doc/
+
+TODO

data/Gemfile

@@ -1,2 +1,3 @@
-source 'http://rubygems.org'
+source :rubygems
+
 gemspec

data/README.md

@@ -1,29 +1,49 @@
 # Nyaa
 
-Nyaa is a CLI to NyaaTorrents. You can browse, search, and download. Nifty.
+Nyaa is a CLI to Nyaa.eu. You can browse, search, and download. Nifty.
+
+## Features
+
+* Ncurses interface
+* Search by category, filter, page, and query
+* Browsing with pagination
+* Download it or open a browser window from the interface
+* Nyaa status aware: (aplus, trusted, remake, etc.)
+* Batch mode for scripts (first page only atm)
+* Supports unicode characters (requires `libncursesw5-dev` and `ruby1.9`)
 
 ## Installation
 
+Stable release:
+
     gem install nyaa
 
-## Usage
+Development release:
 
-To start browsing immediately, simply run `nyaa`. The default category is english anime.
+    git clone git://github.com/mistofvongola/nyaa.git
 
-![](https://github.com/mistofvongola/nyaa/raw/master/screenshots/screenshot_1.png)
+## Browser Usage
+
+To browse, simply run `nyaa`. The default category is english anime.
 
-Nyaa supports all the aspects of search of the main site. You can search by category and/or filters. Nyaa also shows a summary of seeders, leechers, total filesize, and number of downloads. To download an item, simply enter the number of the result.
+![](https://github.com/mistofvongola/nyaa/raw/master/screenshots/v1.0.0_browse.png)
 
-    nyaa -c anime_english -f trusted_only 'guilty crown'
+Nyaa supports all the aspects of search of the main site. You can search by category and/or filters. To download an item, highlight it, and type `g`. To open the description page in a browser, type `i`. A sample query:
 
-![](https://github.com/mistofvongola/nyaa/raw/master/screenshots/screenshot_2.png)
+    nyaa -f trusted_only psycho pass
+![](https://github.com/mistofvongola/nyaa/raw/master/screenshots/v1.0.0_search.png)
 
 For a list of categories and filters, see `nyaa -h`.
 
-![](https://github.com/mistofvongola/nyaa/raw/master/screenshots/screenshot_3.png)
+![](https://github.com/mistofvongola/nyaa/raw/master/screenshots/v1.0.0_help.png)
+
+## The old interface
+
+The old nyaa interface is deprecated, but is still included. You can use the old interface using the `--classic` option.
+
+![](https://github.com/mistofvongola/nyaa/raw/master/screenshots/screenshot_1.png)
 
 ## Contributing
-0. See HACKING file for style guidelines
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Added some feature'`)
@@ -32,8 +52,8 @@ For a list of categories and filters, see `nyaa -h`.
 
 ## License
 
-See LICENSE file.
+MIT License. See LICENSE file for details.
 
 ## Authors
 
-See AUTHORS file.
+David Palma

data/Rakefile

@@ -6,7 +6,7 @@ task :default => :test
 
 Rake::TestTask.new do |t|
   t.libs << 'lib/nyaa'
-  t.test_files = FileList['test/lib/nyaa/*_test.rb']
+  t.test_files = FileList['spec/lib/nyaa/*_spec.rb']
   t.verbose = true
 end
 
@@ -17,19 +17,22 @@ task :gemspec do
   gemspec.validate
 end
 
-desc "Build gem locally"
 task :build => :gemspec do
   system "gem build #{gemspec.name}.gemspec"
   FileUtils.mkdir_p "pkg"
   FileUtils.mv "#{gemspec.name}-#{gemspec.version}.gem", "pkg"
 end
 
-desc "Install gem locally"
 task :install => :build do
   system "gem install pkg/#{gemspec.name}-#{gemspec.version}"
 end
 
-desc "Clean automatically generated files"
+desc "Purge the pkg directory"
 task :clean do
   FileUtils.rm_rf "pkg"
 end
+
+desc "Publish gem to rubygems.org"
+task :publish do
+  system "gem push pkg/#{gemspec.name}-#{gemspec.version}.gem"
+end

data/bin/nyaa

@@ -1,49 +1,78 @@
 #!/usr/bin/env ruby
 
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+
 require 'nyaa'
-require 'trollop'
-
-opts = Trollop::options do
-  version "nyaa v#{Nyaa::VERSION} (c) 2012 David Palma http://github.com/mistofvongola"
-  banner <<-EOM
-The nyaa gem is a simple CLI browser for NyaaTorrents.
-Usage:
-    nyaa [options] "my search"
-
-Categories:
-  anime_all, anime_raw, anime_english, anime_nonenglish, anime_music_video
-  books_all, books_raw, books_english, books_nonenglish
-  audio_all, audio_lossless, audio_lossy
-  pictures_all, pictures_photos, pictures_graphics,
-  live_all, live_raw, live_english, live_nonenglish, live_promo
-  software_all, software_apps, software_games
-
-Filters:
-  show_all, filter_remakes, trusted_only, aplus_only
-
-Options:
-  EOM
-  opt :category, "Select a category to search in. See below for valid options.", :default => 'anime_english'
-  opt :filter, "Select a filter for your search. See below for valid options.", :default => 'show_all'
-  opt :outdir, "Select the download directory.", :default => File.expand_path('~/Downloads')
-  opt :size, "Show <i> results at a time. Must be between 1 and 100.", :type => :int, :default => 4
-  opt :page, "Start by showing the <i>th result page.", :type => :int, :default => 1
-  opt :version, "Print the version and exit."
-  opt :help, "Show this information and exit."
+include Curses
+
+
+@opts = Nyaa::CLI.parse(ARGV)
+@search = Nyaa::Search.new(@opts[:query], @opts[:category], @opts[:filter])
+
+def batch_mode
+    results = @search.more.get_results
+    results.each do |r|
+      puts "o #{r.name}"
+      puts "#{r.link}"
+      puts
+    end
+    exit
 end
 
-unless Nyaa::Browser::CATS.has_key?(opts[:category])
-  Trollop::die :category, "is not a valid category"
+def browser_mode
+  begin
+    nyaa = Nyaa::Browser.new(@opts, @search)
+  rescue Interrupt
+    puts "\nInterrupt received. Exiting."
+    exit
+  end
 end
-unless Nyaa::Browser::FILS.has_key?(opts[:filter])
-  Trollop::die :filter, "is not a valid filter"
+
+def curses_mode
+  begin
+    yield
+  ensure
+    nocbreak
+    close_screen
+  end
 end
-query = ARGV.join(' ')
-
-begin
-  n = Nyaa::Browser.new query, opts
-  n.search
-rescue Interrupt
-  puts "\nInterrupt received. Exiting."
-  exit
+
+# Batch mode
+if @opts[:batch]
+  batch_mode
 end
+
+if @opts[:classic] # use old interface
+  browser_mode
+else
+  nyaa = Nyaa::UI.new(@opts, @search)
+  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   then cursor = nyaa.move(cursor, -1)
+      when Key::DOWN then cursor = nyaa.move(cursor, 1)
+      when 'k' then cursor = nyaa.move(cursor, -1)
+      when 'j' then cursor = nyaa.move(cursor, 1)
+      when '?' then nyaa.status('help not implemented!', :failure)
+      when 'g' then nyaa.get(cursor)
+      when 'i' then nyaa.open(cursor)
+      when 'n' then nyaa.next_page
+      when 'p' then nyaa.prev_page
+      when 'q' then @search.purge && break
+      #when Key::RESIZE then nyaa.status("Window size changed!", :failure)
+      end
+    end
+  end
+end
+
+exit

data/lib/nyaa.rb

@@ -1,5 +1,28 @@
-require 'nyaa/version'
+# -*- encoding : utf-8 -*-
+$:.unshift File.dirname(__FILE__) # For use/testing when no gem is installed
+# stdlib
+require 'optparse'
+require 'open-uri'
+require 'curses'
 
-module Nyaa
-  autoload :Browser,  'nyaa/browser'
+# third party
+begin
+  require 'rubygems' # for ruby 1.8 compat
+  require 'nokogiri'
+  require 'rest_client'
+  require 'formatador'
+rescue LoadError => e
+  puts "LoadError: #{e.message}"
 end
+
+# internal api
+require 'nyaa/version'
+require 'nyaa/cli'
+require 'nyaa/constants'
+require 'nyaa/torrent'
+require 'nyaa/search'
+
+# internal tools
+require 'nyaa/browser' # old ui
+require 'nyaa/ui' # new ui
+require 'nyaa/downloader'

data/lib/nyaa/browser.rb

@@ -1,161 +1,98 @@
-require 'nokogiri'
-require 'rest_client'
-require 'formatador'
-require 'uri'
-
+# -*- encoding : utf-8 -*-
 module Nyaa
   class Browser
-    BASE_URL = 'http://www.nyaa.eu/?page=torrents'
-    PSIZE = 100
-    CATS = {
-      'anime_all'         => '1_0',
-      'anime_raw'         => '1_11',
-      'anime_english'     => '1_37',
-      'anime_nonenglish'  => '1_38',
-      'anime_music_video' => '1_32',
-      'books_all'         => '2_0',
-      'books_raw'         => '2_13',
-      'books_english'     => '2_12',
-      'books_nonenglish'  => '2_39',
-      'audio_all'         => '3_0',
-      'audio_lossless'    => '3_14',
-      'audio_lossy'       => '3_15',
-      'pictures_all'      => '4_0',
-      'pictures_photos'   => '4_17',
-      'pictures_graphics' => '4_18',
-      'live_all'          => '5_0',
-      'live_raw'          => '5_20',
-      'live_english'      => '5_19',
-      'live_nonenglish'   => '5_21',
-      'live_promo'        => '5_22',
-      'software_all'      => '6_0',
-      'software_apps'     => '6_23',
-      'software_games'    => '6_24',
-    }
-    FILS = {
-      'show_all'       => '0',
-      'filter_remakes' => '1',
-      'trusted_only'   => '2',
-      'aplus_only'     => '3',
-    }
-
-    def initialize(query, opts)
-      @query       = URI.escape(query)
+    def initialize(opts, search)
       @opts        = opts
+      @opts[:size] = 4 if opts[:size].nil?
       @opts[:size] = PSIZE if opts[:size] > PSIZE
       @opts[:size] = 1 if opts[:size] <= 1
       @marker      = 0
+      @format      = Formatador.new
+      @page        = 0 # Current browser page
+      @search      = search
+      start
     end
 
-    def search
-      data = harvest(@query, @opts[:page])
-      part = partition(data, 0, @opts[:size])
-      display(data, part)
-    end
-
-    def harvest(query, page)
-      url = "#{BASE_URL}"
-      url << "&cats=#{CATS[@opts[:category]]}" if @opts[:category]
-      url << "&filter=#{FILS[@opts[:filter]]}" if @opts[:filter]
-      url << "&offset=#{page}" if @opts[:page]
-      url << "&term=#{query}" unless @query.empty?
-      doc = Nokogiri::HTML(RestClient.get(url))
-      items = []
-      rows = doc.css('div#main div.content table.tlist tr.tlistrow')
-      #puts "DEBUG: Row: #{rows[0].to_s}"
-      rows.each do |row|
-        items << {
-          :cat    => row.css('td.tlisticon').at('a')['title'],
-          :name   => row.css('td.tlistname').at('a').text.strip,
-          :dl     => row.css('td.tlistdownload').at('a')['href'],
-          :size   => row.css('td.tlistsize').text,
-          :se     => row.css('td.tlistsn').text,
-          :le     => row.css('td.tlistln').text,
-          :dls    => row.css('td.tlistdn').text,
-          :msg    => row.css('td.tlistmn').text,
-          # TODO: The status hashkey is broken
-          :status =>
-          if row.at('tr.trusted')
-            'trusted'
-          elsif row.at('tr.remake')
-            'remake'
-          elsif row.at('tr.aplus')
-            'aplus'
-          else
-            'normal'
-          end
-        }
-      end
-      items
+    def start
+      #@search = Search.new(@opts[:query], @opts[:category], @opts[:filter])
+      page_results = @search.more.get_results
+      @page += 1
+      part = partition(page_results, 0, @opts[:size])
+      screen(page_results, part)
     end
 
     def partition(ary, start, size)
       start = 0 if start < 0
-      # update marker
       @marker = start
       size = PSIZE if size > PSIZE
-
       part = ary[start, size]
+      part = [] if part.nil?
       part
     end
 
-    def display(data, results)
-      f = Formatador.new
-      f.display_line( "\t[yellow]NyaaTorrents >> "\
-                     "Browse | Anime, manga, and music[/]\n" )
-
-      if data[0].nil? || results[0].nil?
-        f.display_line( "[normal]No matches found. "\
-                       "Try another category. See --help.[/]\n")
-        f.display_line("\t[yellow]Exiting.[/]")
-        exit
-      end
-      f.display_line( "[bold]#{data[0][:cat]}\n[/]" )
-
-      results.each do |item|
-        case item[:status]
-        when 'aplus'
-          flag = 'blue'
-        when 'trusted'
-          flag = 'green'
-        when 'remake'
-          flag = 'red'
-        else
-          flag = 'normal'
-        end
-        f.display_line( "[#{flag}]#{data.index(item)+1}. #{item[:name]}[/]")
-
-        f.indent {
-          f.display_line( "[bold]Size: [purple]#{item[:size]}[/] "\
-                         "[bold]SE: [green]#{item[:se]}[/] "\
-                         "[bold]LE: [red]#{item[:le]}[/] "\
-                         "[bold]DLs: [yellow]#{item[:dls]}[/] "\
-                         "[bold]Msg: [blue]#{item[:msg]}[/]" )
-          f.display_line( "[green]#{item[:dl]}[/]" )
-        }
+    def torrent_info(page_results, torrent)
+      case torrent.status
+      when 'A+'      then flag = 'blue'
+      when 'Trusted' then flag = 'green'
+      when 'Remake'  then flag = 'red'
+      else                flag = 'yellow'
       end
 
+      @format.display_line("#{page_results.index(torrent)+1}. "\
+                          "#{torrent.name[0..70]}[/]")
+      @format.indent {
+        @format.display_line(
+                       "[bold]Size: [purple]#{torrent.filesize}[/] "\
+                       "[bold]SE: [green]#{torrent.seeders}[/] "\
+                       "[bold]LE: [red]#{torrent.leechers}[/] "\
+                       "[bold]DLs: [yellow]#{torrent.downloads}[/] "\
+                       "[bold]Msg: [blue]#{torrent.comments}[/]")
+        @format.display_line("[bold]DL:[/] [#{flag}]#{torrent.link}[/]")
+      }
+    end
+
+    def header_info
+      @format.display_line( "\t[yellow]NyaaTorrents >> "\
+                     "Browse | Anime, manga, and music[/]\n" )
+      @format.display_line(
+        "[bold]#{CATS[@opts[:category].to_sym][:title]}\n[/]" )
+    end
+
+    def footer_info
       start_count = @marker + 1
       start_count = PSIZE if start_count > PSIZE
       end_count = @marker + @opts[:size]
       end_count = PSIZE if end_count > PSIZE
 
-      f.display_line("\n\t[yellow]Displaying results "\
+      @format.display_line("\n\t[yellow]Displaying results "\
                      "#{start_count} through #{end_count} of #{PSIZE} "\
-                     "#(Page #{@opts[:page]})\n")
+                     "(Page ##{@page})\n")
+    end
+
+    def screen(page_results, screen_items)
+      header_info
+
+      if screen_items.empty?
+        @format.display_line( "[normal]End of results.")
+        @format.display_line("For more search options, see --help.[/]\n")
+        exit
+      end
+
+      screen_items.each do |torrent|
+        torrent_info(page_results, torrent)
+      end
 
-      prompt(data, results)
+      footer_info
+      prompt(page_results, screen_items)
     end
 
-    def prompt(data, results)
-      f = Formatador.new
-      f.display_line("[yellow]Help: q to quit, "\
+    def prompt(page_results, screen_items)
+      @format.display_line("[yellow]Help: q to quit, "\
+                     "h for display help, "\
                      "n/p for pagination, "\
                      "or a number to download that choice.")
-      # prompt
-      f.display("[bold]>[/] ")
+      @format.display("[bold]>[/] ")
 
-      # handle input
       choice = STDIN.gets
       if choice.nil?
         choice = ' '
@@ -164,48 +101,70 @@ module Nyaa
       end
 
       case
-      when choice[0] == 'q'
-        exit
-      when choice[0] == 'n'
-        if @marker + @opts[:size] == 100
-          @opts[:page] += 1
-          f.indent { f.display_line("[purple][blink_fast]! "\
-                                    "Loading more results...[/]") }
-          data = harvest(@query, @opts[:page])
-          part = partition(data, 0, @opts[:size])
-        else
-          part = partition(data, @marker + @opts[:size], @opts[:size])
-        end
-        display(data, part)
-      when choice[0] == 'p'
-        if @marker < 1
-          f.indent { f.display_line("[purple]! Already at page one.[/]") }
-          input(data, results)
-        else
-          part = partition(data, @marker - @opts[:size], @opts[:size])
-          display(data, part)
-        end
-      when choice[0].match(/\d/)
-        /(\d+)(\s*\|(.*))*/.match(choice) do |str|
-          num = str[1].to_i - 1
-          download(data[num][:dl], @opts[:outdir])
-        end
+      when choice[0] == 'q' then @search.purge && exit
+      when choice[0] == 'n' then paginate(page_results)
+      when choice[0] == 'p' then reverse_paginate(page_results, screen_items)
+      when choice[0].match(/\d/) then retrieve(choice, page_results, screen_items)
+      when choice[0] == 'h'
+        @format.display_line("[normal]The color of an entry's DL link "\
+                             "represents its status:[/]")
+        @format.display_line("[blue]A+[/], [green]Trusted[/], "\
+                             "[yellow]Normal[/], or [red]Remake[/]")
+        prompt(page_results, screen_items)
+      else
+        @format.display_line("[red]Unrecognized option.[/]")
+        prompt(page_results, screen_items)
       end
     end
 
-    def download(url, output_path)
-      resp = RestClient.get(url)
+    def paginate(page_results)
+      if @marker + @opts[:size] == 100
+        @format.display_line("[yellow]Loading more results...[/]")
+        if @page == @search.offset
+          page_results = @search.more.get_results
+        else # @page < @search.offset
+          page_results = @search.cached(@page + 1)
+        end
+        @page += 1
+        part = partition(page_results, 0, @opts[:size])
+      else
+        part = partition(page_results, @marker + @opts[:size], @opts[:size])
+      end
+      screen(page_results, part)
+    end
 
-      # Get filename from Content-Disposition header
-      disp_fname = resp.headers[:content_disposition].
-        split(/;\s+/).
-        select { |v| v =~ /filename\s*=/ }[0]
-      local_fname = /([""'])(?:(?=(\\?))\2.)*?\1/.
-        match(disp_fname).
-        to_s.gsub(/\A['"]+|['"]+\Z/, "")
+    def reverse_paginate(page_results, screen_items)
+      if @marker < 1
+        if @page == 1
+          @format.display_line("[red]Already at page one.[/]")
+          prompt(page_results, screen_items)
+        else # @page > 1
+          @format.display_line("[yellow]Loading results...[/]")
+          # TODO Bug: This fails with --size 100
+          # TODO Bug: reverse paginate sometimes only returns p1 cache
+          page_results = @search.cached(@page - 1)
+          @page -= 1
+          part = partition(page_results, PSIZE - @opts[:size], @opts[:size])
+          screen(page_results, part)
+        end
+      else
+        part = partition(page_results, @marker - @opts[:size], @opts[:size])
+        screen(page_results, part)
+      end
+    end
 
-      File.open("#{output_path}/#{local_fname}", 'w') do
-        |f| f.write(resp.body)
+    def retrieve(choice, page_results, screen_items)
+      /(\d+)(\s*\|(.*))*/.match(choice) do |str|
+        num = str[1].to_i - 1
+        download = Downloader.new(page_results[num].link, @opts[:outdir])
+        download.save
+        unless download.failed?
+          @format.display_line(
+            "[green]Downloaded '#{download.filename}' successfully.[/]")
+        else
+          @format.display_line("[red]Download failed (3 attempts).[/]")
+        end
+        prompt(page_results, screen_items)
       end
     end
   end