kat 2.0.1 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a787a58459b2ef07e56e8ea0dcbd2303b88d1a2e
-  data.tar.gz: 8044118ce50282384b57378d82c117b633a1f372
+  metadata.gz: 04b05fa2b57136f63c50ead52700b2ee2fe04fbf
+  data.tar.gz: d803a95f59ec6ad55f641522bb29c0de1a54bc9c
 SHA512:
-  metadata.gz: 47b3095fe9256337fe71d7248d0f36d3cee42f78794d66da09bedea20bb8120efe9bed80bfa24f45469b7bf25361ee236155f4d36bab343b8b4691640aec14ce
-  data.tar.gz: 5bfe7bd174afabe76d089625bc35054da1be957781061932db125c1e6fa74fc84be2fc22b7e3323cc8570d6f1d9f3fd99496b6e8855d99f203834bea89820e47
+  metadata.gz: 93af094dda2fbffe8742accaa2b63f7dd3a63e814241d1bf930ef0bb4c94e46b78253bd36bd84035d20c8b3aadf9bbc16a261713a9c63dea8b522043047ba318
+  data.tar.gz: fcfdc9e820d7009422441cb824ebfaa72db696db5db563898732c3a018e60be4bce4ebb05ae77d227063637fd89a7a56acb0eabb40618861bdb73a7f577b98aa

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.DS_Store
 Gemfile.lock
 Guardfile
 InstalledFiles

data/lib/kat/app.rb

@@ -195,6 +195,7 @@ module Kat
     #
     def format_results
       main_width = @window_width - (!hide_info? || @show_info ? 42 : 4)
+      buf = []
 
       if @kat.error
         return ["\rConnection failed".red]
@@ -202,8 +203,10 @@ module Kat
         return ["\rNo results    ".red]
       end
 
-      buf = ["\r%-#{ main_width + 5 }s#{ '      Size     Age      Seeds Leeches' if !hide_info? || @show_info }" %
-        "Page #{ page + 1 } of #{ @kat.pages }", nil].yellow!
+      buf << "\r#{ @kat.message[:message] }\n".red if @kat.message
+
+      buf << ("\r%-#{ main_width + 5 }s#{ '      Size     Age      Seeds Leeches' if !hide_info? || @show_info }" %
+        ["Page #{ page + 1 } of #{ @kat.pages }", nil]).yellow
 
       @kat.results[@page].each_with_index { |t, i|
         age = t[:age].split "\xC2\xA0"
@@ -243,6 +246,10 @@ module Kat
         q.responses[:not_valid] = 'Invalid option.'
         q.validate = validation_regex
       }
+    rescue RegexpError => e
+      puts (@kat.pages > 0 ? "Error reading the page\n" : "Could not connect to the site\n").red
+
+      return 'q'
     end
 
     #

data/lib/kat/search.rb

@@ -30,6 +30,8 @@ module Kat
     # Any error in searching is stored here
     attr_reader :error
 
+    attr_reader :message
+
     @@doc = nil
 
     class << self
@@ -122,6 +124,7 @@ module Kat
       @search_term = []
       @options = {}
       @error = nil
+      @message = nil
 
       self.query = search_term
       self.options = opts
@@ -181,6 +184,10 @@ module Kat
       build_query
     end
 
+    def sort?
+      sorts.any? { |k, v| @options[:sort] && k == @options[:sort].intern }
+    end
+
     #
     # Perform the search, supplying an optional page number to search on. Returns
     # a result set limited to the 25 results Kickass Torrents returns itself. Will
@@ -188,18 +195,25 @@ module Kat
     #
     def search(page = 0)
       @error = nil
+      @message = nil
 
       search_proc = -> page {
         begin
           uri = URI(URI::encode(to_s page))
-          res = Net::HTTP.start(uri.host) { |http| http.get uri }
+          res = Net::HTTP.get_response(uri)
+          if res.code == '301'
+            path = Net::HTTP::Get.new(res.header['location'])
+            res = Net::HTTP.start(uri.host) { |http| http.request path }
+            @message = { message: 'Sort is not functioning' } if sort?
+          end
+
           @pages = 0 and return if res.code == '404'
 
           doc = Nokogiri::HTML(res.body)
 
-          @results[page] = doc.css('td.torrentnameCell').map { |node|
-            { path:     node.css('a.normalgrey').first.andand.attr('href'),
-              title:    node.css('a.normalgrey').text,
+          @results[page] = doc.xpath('//table[@class="data"]/tr[position()>1]/td[1]').map { |node|
+            { path:     node.css('a.torType').first.andand.attr('href'),
+              title:    node.css('a.cellMainLink').text,
               magnet:   node.css('a.imagnet').first.andand.attr('href'),
               download: node.css('a.idownload').last.andand.attr('href'),
               size:     (node = node.next_element).text,
@@ -224,10 +238,11 @@ module Kat
       # Make sure we do a query for the first page of results before getting
       # subsequent pages in order to correctly figure out the total number of
       # pages of results.
-      search_proc.call 0 if @pages == -1
-      search_proc.call page
+      pages = (Range === page ? page.to_a : [page])
+      pages.unshift(0) if @pages == -1 && !pages.include?(0)
+      pages.each { |i| search_proc.call i }
 
-      results[page]
+      results[Range === page ? page.max : page]
     end
 
     #

data/lib/kat/version.rb

@@ -1,6 +1,6 @@
 module Kat
   NAME = 'Kickass Torrents Search'
-  VERSION = '2.0.1'
+  VERSION = '2.0.4'
   MALEVOLENT_DICTATOR_FOR_LIFE = 'Fission Xuiptz'
   AUTHOR = MALEVOLENT_DICTATOR_FOR_LIFE
   VERSION_STR = "#{NAME} #{VERSION} (c) 2013 #{MALEVOLENT_DICTATOR_FOR_LIFE}"

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: kat
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.4
 platform: ruby
 authors:
 - Fission Xuiptz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: andand
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 description: A Ruby interface to Kickass Torrents
@@ -73,8 +73,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -102,17 +102,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Kickass Torrents Interface