opentracker-ws 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/bin/opentracker-ws

@@ -3,10 +3,19 @@
 require File.dirname(__FILE__) + '/../lib/opentracker-ws'
 require 'thin'
 
-rackup_file = "#{File.dirname(__FILE__)}/../config.ru"
+begin
+  config_file = File.read(ENV['HOME'] + '/.opentracker-ws.yml')
+  YAML.load(config_file)
 
-argv = ARGV
-argv << ['-R', rackup_file] unless ARGV.include?('-R')
-argv << ['-p', '2323'] unless ARGV.include?('-p')
-Thin::Runner.new(argv.flatten).run!
+  rackup_file = "#{File.dirname(__FILE__)}/../config.ru"
+
+  argv = ARGV
+  argv << ['-R', rackup_file] unless ARGV.include?('-R')
+  argv << ['-p', '2323'] unless ARGV.include?('-p')
+  argv << ['-e', 'production'] unless ARGV.include?('-e')
+  Thin::Runner.new(argv.flatten).run!
+
+rescue Errno::ENOENT => e
+  puts e.message
+end
 

data/config.ru

@@ -1,3 +1,3 @@
 require File.dirname(__FILE__) + '/lib/opentracker-ws'
-OpenTrackerWs.run! :port => 2323
+OpenTrackerWs.run! :port => 2323, :environment => 'production'
 

data/lib/helpers.rb

@@ -6,9 +6,21 @@ require 'yaml'
 
 
 module OpenTrackerWsHelpers
+
+  def stats_for_torrent(hash)
+    response = {}
+    if data = prepare_data(hash)
+      response['seeders'] = get_seeders(data)
+      response['leechers'] = get_leechers(data)
+      response['downloaded'] = get_downloaded(data)
+    end
+    
+    return response
+  end
+  
+  private
   
-  def get_seeders(hash)
-    data = prepare_data(hash)
+  def get_seeders(data)
     if !data['files'].empty?
       data['files'].values.first['complete']
     else
@@ -16,37 +28,44 @@ module OpenTrackerWsHelpers
     end
   end
 
-  def get_leechers(hash)
-    data = prepare_data(hash)
+  def get_leechers(data)
     if !data['files'].empty?
       data['files'].values.first['incomplete']
     else
       "N/A"
     end
   end
-
-
-  private
+  
+  def get_downloaded(data)
+    if !data['files'].empty?
+      data['files'].values.first['downloaded']
+    else
+      "N/A"
+    end
+  end
 
   def prepare_data(hash)
-    data = connect_to_tracker(hash)
-    BEncode.load(data)
+    if data = connect_to_tracker(hash)
+      BEncode.load(data)
+    else
+      return nil
+    end
   end
 
   def connect_to_tracker(hash)
     config = load_config
     info_hash_escaped = CGI::escape(hash.lines.to_a.pack("H*"))
-    open("http://#{config['opentracker']['host']}:#{config['opentracker']['port']}" +
-         "/scrape?info_hash=#{info_hash_escaped}").read
+    begin
+      open("http://#{config['opentracker']['host']}:#{config['opentracker']['port']}" +
+           "/scrape?info_hash=#{info_hash_escaped}").read
+    rescue OpenURI::HTTPError
+      return nil 
+    end
   end
 
   def load_config
-    begin
-      config_file = File.read(ENV['HOME'] + '/.opentracker-ws.yml')
-      YAML.load(config_file)
-    rescue Errno::ENOENT => e
-      puts e.message
-    end
+    config_file = File.read(ENV['HOME'] + '/.opentracker-ws.yml')
+    YAML.load(config_file)
   end
 end
 

data/lib/opentracker-ws.rb

@@ -12,11 +12,9 @@ class OpenTrackerWs < Sinatra::Base
   end
 
   get '/torrent/:hash' do
-    response = {}
-    response['seeders'] = get_seeders(params[:hash])
-    response['leechers'] = get_leechers(params[:hash])
-    
-    return JSON.generate(response)
+    # In production send JSON with correct content_type
+    #content_type 'application/json', :charset => 'utf-8'
+    return JSON.generate(stats_for_torrent(params[:hash]))
   end
 end
 

data/opentracker-ws.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{opentracker-ws}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Antonio Pardo"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Antonio Pardo