hail_hydra 0.2.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6f53bbe774e5705064031d66a2983d112fcf4454
-  data.tar.gz: c044b92d1548395ec1c85d5a2108d7ef647ed0f8
+SHA256:
+  metadata.gz: 04c83ffc08ca929f1f599298dab744399f0f3944394a2d5c9d4abb491d270acb
+  data.tar.gz: ae11202df9131ed6fb05af82a729f94e3c2c812e4c7969390aee58ef9000f98d
 SHA512:
-  metadata.gz: 83fd9f953c286c5c3302b32adae8ef693f0a068d544554007e56291d572ea87cad9a341a9638da4473ac9fd5819463a7692ec3987b8b5e7f1f7f6706eb335c4f
-  data.tar.gz: b8d0510056974d9f8d35165e41ad9cd44a4760ba399a5ba614b780fa25955f43dc5cf9d5273fadc0e2c5774a2c23deda140189b39e2f077687b6949ebdacc644
+  metadata.gz: 810794625e6ca4ca08f16406b840eebec75f2fc7ecdb217809509fbc85d48a2d7d4ae265086fdb21f3631d87523026105fd48cff17ec21e2c0861bf181cb8eb2
+  data.tar.gz: 9bd784f01de609a744d04bdc7e6ecb0e514c112f00aebd599394924dd71318b1ef2abb9793d12fc916018cfce39c44f9bd46194c5e8b37f32759de560afe9a38

data/Gemfile.lock

@@ -1,50 +1,48 @@
-PATH
-  remote: .
-  specs:
-    hail_hydra (0.2.2)
-      httparty
-      nokogiri (>= 1.10.8)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.3)
-    httparty (0.17.1)
-      mime-types (~> 3.0)
-      multi_xml (>= 0.5.2)
-    mime-types (3.2.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
-    mini_portile2 (2.4.0)
-    multi_xml (0.6.0)
-    nokogiri (1.10.8)
-      mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.8-x64-mingw32)
-      mini_portile2 (~> 2.4.0)
-    rake (13.0.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-
-PLATFORMS
-  ruby
-  x64-mingw32
-
-DEPENDENCIES
-  bundler (~> 1.16)
-  hail_hydra!
-  rake (~> 13.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.16.1
+PATH
+  remote: .
+  specs:
+    hail_hydra (0.2.3)
+      addressable
+      httparty
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    diff-lcs (1.4.4)
+    httparty (0.18.0)
+      mime-types (~> 3.0)
+      multi_xml (>= 0.5.2)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2020.0425)
+    multi_xml (0.6.0)
+    public_suffix (4.0.5)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+
+PLATFORMS
+  ruby
+  x64-mingw32
+
+DEPENDENCIES
+  bundler (~> 2.1)
+  hail_hydra!
+  rake (~> 13.0)
+  rspec (~> 3.9)
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -29,21 +29,15 @@ $ thepiratebay totallynotillegal
 
 From code
 ```ruby
-s = HailHydra::TPB.new("https://thepiratebay.org")
+s = HailHydra::TPB.new("https://apibay.org")
 
 res = s.search('totallynotillegal')
 res.each do |torrent|
-    puts torrent.name + " " + torrent.url
+    puts torrent.name + " " + torrent.size
 end
 
 ```
 
-## Future releases
-1. Scrape more info about the torrents
-2. Add functionality to allow uploading torrents
-3. Add user auth?
-4. Add ability to comment
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/Gr3atWh173/hail_hydra. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
@@ -57,4 +51,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 Everyone interacting in the HailHydra project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/Gr3atWh173/hail_hydra/blob/master/CODE_OF_CONDUCT.md).
 
 ## DISCLAIMER
-Neither this project or its author are related to ThePirateBay in any way.
+Neither this project nor its author are related to ThePirateBay in any way.

data/bin/thepiratebay.rb

@@ -2,14 +2,13 @@
 
 require 'hail_hydra'
 
-domain = "https://thepiratebay.org"
+domain = "https://apibay.org"
 search = ARGV[0]
-pages = 1
 
-HailHydra::TPB.new(domain).search(search, pages).each do |result|
+HailHydra::TPB.new(domain).search(search).each do |result|
   puts ""
   puts "NAME: " + result.name
-  puts "URL: " + result.url
+  puts "SIZE: " + result.size
   puts "SEEDERS: " + result.seeders
   puts "LEECHERS: " + result.leechers
   puts "MAGNET: " + result.magnet_link

data/hail_hydra.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec", "~> 3.9"
 
-  spec.add_dependency "nokogiri", ">= 1.10.8"
+  spec.add_dependency "addressable"
   spec.add_dependency "httparty"
 end

data/lib/client.rb

@@ -1,77 +1,74 @@
 require "httparty"
-require "nokogiri"
+require "json"
+require "addressable/uri"
+require "cgi"
 require_relative "torrent.rb"
 
 module HailHydra
   # The TPB class provides the main client to connect to and scrape the 
-  # results. This may be broken into a 'client' and 'parser' in the future.
+  # results.
   class TPB
     # remember the domain name and get the cookie to use from the TPB server
-    def initialize(domain_name)
-      @domain = domain_name
-      @headers = get_query_headers
+    def initialize domain="https://apibay.org"
+      @domain = domain
     end
 
     # search torrents
-    def search(query, pages=1, orderby=99)
-      get = make_search_request(query, pages, orderby)
+    def search query
+      get = make_search_request query
       raise "Invalid response: #{get.response.code}" unless get.response.code == "200"
-      return parse_search_results(get.response.body)
+      return parse_search_results JSON.parse(get.response.body) 
     end
 
     private
 
-    def parse_search_results(html_text)
-      nodes = Nokogiri::HTML(html_text)
-      cells = []
-      table = nodes.search('table')
-      
-      table.search('tr').each do |tr|
-        cells.push(tr.search('th, td'))
-      end
-
+    def parse_search_results json_results
       torrents = []
-      descriptions = nodes.css('font.detDesc') 
-      1.upto cells.length-1 do |i|
-        torrent = HailHydra::Torrent.new()
-
-        torrent.name        = cells[i][1].children[1].children[1].children[0].content
-        torrent.url         = @domain +  cells[i][1].children[1].children[1].attributes["href"].value
-        torrent.magnet_link = cells[i][1].children[3].attributes["href"].value
-        torrent.seeders     = cells[i][2].children[0].content
-        torrent.leechers    = cells[i][3].children[0].content
-
-        # extracting the uploaded by, at and size is a bit trickier
-        info_line = descriptions[i-1].text.gsub("\u00A0", "---").split(",").map(&:strip)
-        
-        torrent.uploaded_at = info_line[0].split(" ")[1].gsub("---", " ")
-        torrent.size        = info_line[1].split(" ")[1].gsub("---", " ")
-        torrent.uploaded_by = info_line[2].split(" ")[2]
-        
+      json_results.each do |result|
+        torrent = HailHydra::Torrent.new
+        torrent.name        = result["name"]
+        torrent.seeders     = result["seeders"]
+        torrent.leechers    = result["leechers"]
+        torrent.uploaded_by = result["username"]        
+        torrent.uploaded_at = Time.at(result["added"].to_i).to_s
+        torrent.size        = make_size(result["size"].to_i)
+        torrent.magnet_link = make_magnet_link(result["info_hash"], result["name"])
         torrents.push torrent
       end
       return torrents
     end
 
-    def make_search_request(query, pages, orderby)
-      query = {
-        "q" => query,
-        "page" => 0.to_s,
-        "orderby" => orderby.to_s
-      }
+    private
+
+    def make_magnet_link info_hash, name
+      # used CGI.escape because URI.encode now throws a warning and Addressable doesn't seem to 
+      # support not-URL strings
+      return "magnet:?xt=urn:btih:#{info_hash}&dn=#{CGI.escape(name)}#{trackers}"
+    end
+
+    def trackers
+      tr = '&tr=' + Addressable::URI.encode('udp://tracker.coppersurfer.tk:6969/announce')
+      tr += '&tr=' + Addressable::URI.encode('udp://9.rarbg.to:2920/announce')
+      tr += '&tr=' + Addressable::URI.encode('udp://tracker.opentrackr.org:1337')
+      tr += '&tr=' + Addressable::URI.encode('udp://tracker.internetwarriors.net:1337/announce')
+      tr += '&tr=' + Addressable::URI.encode('udp://tracker.leechers-paradise.org:6969/announce')
+      tr += '&tr=' + Addressable::URI.encode('udp://tracker.coppersurfer.tk:6969/announce')
+      tr += '&tr=' + Addressable::URI.encode('udp://tracker.pirateparty.gr:6969/announce')
+      tr += '&tr=' + Addressable::URI.encode('udp://tracker.cyberia.is:6969/announce')
+      return tr
+    end
 
-      # not sure why HTTParty doesn't do this already
-      encoded_uri = URI.encode(@domain+"/search/" + query["q"] + "/0/" + query["orderby"] + "/0")
-      HTTParty.get(encoded_uri, headers: @headers)
+    def make_size size
+      return ((size / 1125899906842624).round(3)).to_s + "PiB" if size >= 1125899906842624
+      return ((size / 1099511627776).round(3)).to_s + "TiB" if size >= 1099511627776
+      return ((size / 1073741824).round(3)).to_s + "GiB" if size >= 1073741824
+      return ((size / 1048576).round(3)).to_s + "MiB" if size >= 1048576
+      return ((size / 1024).round(3)).to_s + "KiB" if size >= 1024
     end
 
-    def get_query_headers()
-      cookie = HTTParty.get(@domain).response['set-cookie']
-      return {
-        'User-Agent' => 'Mozilla/5.0 (Windows 10; WOW64; rv:10.0) Gecko/20100101 Firefox/10.0',
-        'Referer' => @domain,
-        'Cookie' => cookie
-      }
+    def make_search_request query 
+      encoded_uri = Addressable::URI.encode(@domain + "/q.php?q=" + query)
+      HTTParty.get encoded_uri
     end
   end
 end

data/lib/hail_hydra/version.rb

@@ -1,3 +1,3 @@
 module HailHydra
-  VERSION = "0.2.3"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hail_hydra
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Gr3atWh173
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-01 00:00:00.000000000 Z
+date: 2020-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -124,8 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Unofficial pseudo-API for ThePirateBay