nyaa 1.0.2 → 1.0.3

data/README.md

@@ -37,12 +37,6 @@ For a list of categories and filters, see `nyaa -h`.
 
 ![](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
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)

data/bin/nyaa

@@ -19,15 +19,6 @@ def batch_mode
     exit
 end
 
-def browser_mode
-  begin
-    nyaa = Nyaa::Browser.new(@opts, @search)
-  rescue Interrupt
-    puts "\nInterrupt received. Exiting."
-    exit
-  end
-end
-
 def curses_mode
   begin
     yield
@@ -42,35 +33,31 @@ if @opts[:batch]
   batch_mode
 end
 
-if @opts[:classic] # use old interface
-  browser_mode
-else
-  nyaa = Nyaa::UI.new(@opts, @search)
-  cursor = 1
+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
+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
+    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

data/lib/nyaa.rb

@@ -9,8 +9,6 @@ require 'curses'
 begin
   require 'rubygems' # for ruby 1.8 compat
   require 'nokogiri'
-  require 'rest_client'
-  require 'formatador'
 rescue LoadError => e
   puts "LoadError: #{e.message}"
 end
@@ -23,6 +21,5 @@ require 'nyaa/torrent'
 require 'nyaa/search'
 
 # internal tools
-require 'nyaa/browser' # old ui
-require 'nyaa/ui' # new ui
+require 'nyaa/ui'
 require 'nyaa/downloader'

data/lib/nyaa/cli.rb

@@ -28,10 +28,6 @@ module Nyaa
           @config[:batch] = batch
         end
 
-        opt.on('-t', '--classic', 'Use the old interface (deprecated)') do |classic|
-          @config[:classic] = classic
-        end
-
         opt.on('-v', '--version', 'Print version info') do
           puts "nyaa #{Nyaa::VERSION}"
           puts "Copyright (c) 2013 David Palma"

data/lib/nyaa/constants.rb

@@ -2,7 +2,6 @@
 module Nyaa
 
     BASE_URL = 'http://www.nyaa.eu/?page=search'
-    PSIZE = 100
 
     CATS = {
       :all_categories    => {

data/lib/nyaa/downloader.rb

@@ -17,7 +17,7 @@ module Nyaa
     def save
       unless @fail
         File.open("#{self.destination}/#{filename}", 'w') do |f|
-          f.write(self.response.body)
+          f.write(self.response.read)
         end
       end
     end
@@ -30,7 +30,7 @@ module Nyaa
 
     def request
       begin
-        response = RestClient.get(self.target)
+        response = open(self.target)
       rescue StandardError => e
         if retries > 0
           retries -= 1
@@ -46,7 +46,7 @@ module Nyaa
     # Filename from Content Disposition Header Field
     # http://www.ietf.org/rfc/rfc2183.txt
     def name_from_disposition
-      disp = self.response.headers[:content_disposition]
+      disp = self.response.meta['content-disposition']
       disp_filename = disp.split(/;\s+/).select { |v| v =~ /filename\s*=/ }[0]
       re = /([""'])(?:(?=(\\?))\2.)*?\1/
       if re.match(disp_filename)

data/lib/nyaa/search.rb

@@ -34,13 +34,11 @@ module Nyaa
       self.offset += 1
       if self.results.length < self.count
         extract(self.offset)
-      else
-        self.results = []
-        puts "No more results"
       end
         self
     end
 
+    # TODO: Deprecated function
     def cached(page)
       cachefile = "#{self.cachedir}/cache_#{self.runid}_p#{page}"
       p cachefile
@@ -63,6 +61,7 @@ module Nyaa
 
     private
 
+    # TODO: Deprecated function
     def dump(page, results)
       cachefile = "cache_#{self.runid}_p#{page}"
       File.open("#{self.cachedir}/#{cachefile}", 'wb') do |file|
@@ -99,7 +98,7 @@ module Nyaa
       self.count = doc.css('span.notice').text.match(/\d+/).to_s.to_i
       rows = doc.css('div#main div.content table.tlist tr.tlistrow')
       rows.each { |row| self.results << Torrent.new(row) }
-      dump(page, self.results)
+      #dump(page, self.results)
       #dump_json(page, self.results)
     end
 

data/lib/nyaa/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Nyaa
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
 end

data/nyaa.gemspec

@@ -15,7 +15,5 @@ Gem::Specification.new do |s|
   s.executables  = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   s.require_path = ['lib']
 
-  s.add_runtime_dependency 'formatador', '~> 0.2.3'
   s.add_runtime_dependency 'nokogiri', '~> 1.5.5'
-  s.add_runtime_dependency 'rest-client', '~> 1.6.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nyaa
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: formatador
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -43,22 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.5
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.7
 description: Browse and download from NyaaTorrents from the command-line. Supports
   categories and filters.
 email: david@davidpalma.me
@@ -74,7 +42,6 @@ files:
 - Rakefile
 - bin/nyaa
 - lib/nyaa.rb
-- lib/nyaa/browser.rb
 - lib/nyaa/cli.rb
 - lib/nyaa/constants.rb
 - lib/nyaa/downloader.rb
@@ -83,9 +50,6 @@ files:
 - lib/nyaa/ui.rb
 - lib/nyaa/version.rb
 - nyaa.gemspec
-- screenshots/screenshot_1.png
-- screenshots/screenshot_2.png
-- screenshots/screenshot_3.png
 - screenshots/v1.0.0_browse.png
 - screenshots/v1.0.0_help.png
 - screenshots/v1.0.0_search.png

data/lib/nyaa/browser.rb

@@ -1,171 +0,0 @@
-# -*- encoding : utf-8 -*-
-module Nyaa
-  class Browser
-    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 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
-      @marker = start
-      size = PSIZE if size > PSIZE
-      part = ary[start, size]
-      part = [] if part.nil?
-      part
-    end
-
-    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
-
-      @format.display_line("\n\t[yellow]Displaying results "\
-                     "#{start_count} through #{end_count} of #{PSIZE} "\
-                     "(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
-
-      footer_info
-      prompt(page_results, screen_items)
-    end
-
-    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.")
-      @format.display("[bold]>[/] ")
-
-      choice = STDIN.gets
-      if choice.nil?
-        choice = ' '
-      else
-        choice.strip
-      end
-
-      case
-      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 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
-
-    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
-
-    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
-end