torrenter 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3234eb20fcd3339fcecb2a52c4bfe3bdb0f84ee5
-  data.tar.gz: 88f9959f5111cb4c8bbc082a42a8bd7897b5c95a
+  metadata.gz: d0c2b67a7d7f4f57dcf57fd67990b0faf6fe2817
+  data.tar.gz: 17efbbf5c9c17387bda7daf6bc735c59c54653bf
 SHA512:
-  metadata.gz: ecb115dd277b70cd8769f2300d016b714042777be8665852fabe64f6c45a5bce5cab063b3ba97ad8625bc8eb3361401a63c30bae9e4e3508cc8f17c9a9f16546
-  data.tar.gz: e5a295b9a04b632801c3560fea6b2ce312830364fdfd06255bae7e3b649c040c160e5cb9ec06d4963ba33ded91e531e53ef71811d9f99da0fa344ffbfa0d459f
+  metadata.gz: 0f9aa55935462a0354d28090b54250386358f31c8ccbc382e187a6ab6e4e31eeccb59e169a1330fa258a8f5fc13c4052358709c4886367b52a3ea87c29bfe70f
+  data.tar.gz: a3d9d9011aa5211fcd41fa8db189b85331b12792859628134b869dd5bbe32364ac8e9f93f8898d2d8bbdbaa7234713087cd55cbfb31e724b823409a784d13f65

data/lib/torrenter.rb

@@ -2,9 +2,11 @@ require 'socket'
 require 'digest/sha1'
 require 'bencode'
 require 'fileutils'
+require 'json'
 require 'torrenter/constants'
 require 'torrenter/peer'
 require 'torrenter/peer/buffer_state'
+require 'torrenter/peer/seed'
 require 'torrenter/reactor'
 require 'torrenter/tracker'
 require 'torrenter/tracker/http_tracker'
@@ -14,6 +16,7 @@ require 'torrenter/torrent_reader/piece'
 require 'torrenter/torrent_reader/piece_index'
 require 'torrenter/torrent_reader/piece_constructor'
 require 'torrenter/version'
+require 'pry'
 
 module Torrenter
   class Torrent

data/lib/torrenter/peer/buffer_state.rb

@@ -117,7 +117,11 @@ module Torrenter
       end
 
       def send(msg)
-        @socket.sendmsg_nonblock(msg)
+        begin
+          @socket.sendmsg_nonblock(msg)
+        rescue *EXCEPTIONS
+          @socket.close
+        end
       end
 
       def recv(bytes=BLOCK)

data/lib/torrenter/peer/seed.rb

@@ -0,0 +1,18 @@
+module Torrenter
+  class Peer
+    class Seed
+      def initialize
+        @server = TCPServer.new(6881)
+      end
+
+      def server_loop
+        begin
+          Thread.start(@server.accept_nonblock) do |client|
+            binding.pry if client
+          end
+        rescue IO::EAGAINWaitReadable
+        end
+      end
+    end
+  end
+end

data/lib/torrenter/reactor.rb

@@ -12,7 +12,7 @@ module Torrenter
 
     def message_reactor
       @piece_index.verify_status
-      @peers.each { |peer| peer.connect }
+      @peers.each { |peer| peer.connect unless active_peers.size > 5 }
       puts "You are now connected to #{active_peers.size} peers."
       loop do
         break if finished?
@@ -20,7 +20,7 @@ module Torrenter
           if peer.peer_state
             peer.connection_state(@piece_index, have)
           else
-            peer.connect if Time.now.to_i % 60 == 0
+            peer.connect if Time.now.to_i % ((active_peers.size * 10) + 1) == 0
           end
         end
         @piece_index.clean_peers
@@ -28,6 +28,9 @@ module Torrenter
       end
     end
 
+    def server_listen
+    end
+
     def have
       ->(index, peer) { @piece_index[index].add_peer(peer) }
     end

data/lib/torrenter/torrent_reader.rb

@@ -89,16 +89,18 @@ module Torrenter
       }
     end
 
-    def connect_trackers
+    def trackers
       url_list.compact.map do |url|
-        tracker = if url.include?('http://')
+        if url.include?('http://')
           Tracker::HTTPTracker.new(url, tracker_params)
         else
           Tracker::UDPTracker.new(url, tracker_params)
         end
-
-        tracker.connect
       end
     end
+
+    def connect_trackers
+      trackers.map { |tracker| tracker.connect }
+    end
   end
 end

data/lib/torrenter/torrent_reader/piece_constructor.rb

@@ -9,21 +9,12 @@ module Torrenter
         @sha_hashes   = sha_hashes
         @piece_length = piece_length
         @index        = PieceIndex.new(piece_length)
-        @excess_bytes = 0
       end
 
       def index_length
         @sha_hashes.size / 20
       end
 
-      def correct?
-        total_left == @arr.map { |x| x.tally }.inject { |x,y| x + y }
-      end
-
-      def total_left
-        @files.map { |f| f['length']}.inject { |x,y| x + y }
-      end
-
       def final_piece?
         index_length == @index.size + 1
       end

data/lib/torrenter/torrent_reader/piece_index.rb

@@ -59,10 +59,6 @@ module Torrenter
         @piece_index.size
       end
 
-      def length
-        @piece_index.length
-      end
-
       def [](index)
         @piece_index[index]
       end
@@ -71,10 +67,6 @@ module Torrenter
         @piece_index[i] = Piece.new(i, piece_length, val)
       end
 
-      def push(val)
-        @piece_index[size] = val
-      end
-
       def last
         @piece_index.last
       end

data/lib/torrenter/version.rb

@@ -1,3 +1,3 @@
 module Torrenter
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torrenter
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - wismer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies: []
 description: BitTorrent Client written in Ruby
 email:
@@ -23,6 +23,7 @@ files:
 - lib/torrenter/constants.rb
 - lib/torrenter/peer.rb
 - lib/torrenter/peer/buffer_state.rb
+- lib/torrenter/peer/seed.rb
 - lib/torrenter/reactor.rb
 - lib/torrenter/torrent_reader.rb
 - lib/torrenter/torrent_reader/piece.rb