fargo 0.1.0 → 0.1.1

data/lib/fargo/connection/base.rb

@@ -1,7 +1,7 @@
 require 'active_support/configurable'
 require 'active_support/callbacks'
 
-module Fargo  
+module Fargo
   class ConnectionError < RuntimeError; end
 
   module Connection
@@ -10,16 +10,16 @@ module Fargo
       include ActiveSupport::Configurable
       include ActiveSupport::Callbacks
       include Fargo::Publisher
-  
+
       attr_accessor :socket
       define_callbacks :listen
-      
+
       def initialize client
         @outgoing = Queue.new
         @client   = client
         config.quit_on_disconnect = true
       end
-  
+
       def connect
         Fargo.logger.info(
           "#{self}: Opening connection with #{config.address}, #{config.port}"
@@ -35,7 +35,7 @@ module Fargo
       def receive
         raise 'Implement me!'
       end
-  
+
       def open_socket
         @socket ||= TCPSocket.open config.address, config.port
       rescue Errno::ECONNREFUSED
@@ -43,20 +43,21 @@ module Fargo
       end
 
       def connected?
-        !@socket.nil?
+        !@socket.nil? && !@socket.closed?
       end
 
       def listen
         return unless @threads.nil? || @threads.size == 0
-        
+
         run_callbacks :listen do
           @threads = []
+          @looping = true
 
           # Start a thread to read the socket
-          @threads << Thread.start { loop { read_data } }
+          @threads << Thread.start { read_data while @looping }
 
           # Start a thread to send information from the queue
-          @threads << Thread.start { loop { write_data @outgoing.pop } }
+          @threads << Thread.start { write_data @outgoing.pop while @looping }
 
           @threads.each { |t| t.abort_on_exception = true }
         end
@@ -67,8 +68,10 @@ module Fargo
 
         write "$Quit #{@client.config.nick}" if config.quit_on_disconnect
 
+        @looping = false
+
         if @threads
-          @threads.each &:exit
+          @threads.each{ |t| t.exit unless t == Thread.current }
           @threads.clear
         end
 
@@ -86,48 +89,38 @@ module Fargo
         connection_type = self.class.name.split('::').last.downcase
         @client.publish :"#{connection_type}_disconnected"
       end
-  
+
       def write string
         string << '|' unless string.end_with?('|')
         @outgoing << string # append this to the queue of things to be written
         true
       end
-    
+
       private
 
       def read_data
-        if @socket.closed?
-          Fargo.logger.debug 'When reading data, socket was already closed!'
+        data = @socket.gets '|'
+        raise ConnectionError.new('Received nil data!') if data.nil?
+
+        Fargo.logger.debug "#{self} Received: #{data.inspect}"
+        receive data.chomp('|')
+      rescue => e
+        unless @socket.closed?
+          Fargo.logger.warn "#{self}: Error reading data, going away: #{e}"
           disconnect
-        else
-          begin
-            data = @socket.gets '|'
-            raise ConnectionError.new("Received nil data!") if data.nil?
-          rescue => e
-            Fargo.logger.warn "#{self}: Error reading data, disconnecting: #{e}"
-            disconnect
-          end
-
-          Fargo.logger.debug "#{self} Received: #{data.inspect}" 
-          receive data.chomp('|')
         end
       end
 
       def write_data data
-        if @socket.closed?
-          Fargo.logger.debug "When writing data, socket was already closed!"
+        Fargo.logger.debug "#{self} Sending: #{data.inspect}"
+        @socket << data
+      rescue => e
+        unless @socket.closed?
+          Fargo.logger.warn "#{self}: Error writing data, going away: #{e}"
           disconnect
-        else
-          begin
-            Fargo.logger.debug "#{self} Sending: #{data.inspect}" 
-            @socket << data
-          rescue
-            @client.publish :write_error
-            disconnect
-          end
         end
       end
-    
+
     end
   end
 end

data/lib/fargo/connection/download.rb

@@ -3,24 +3,24 @@ require 'zlib'
 module Fargo
   module Connection
     class Download < Base
-      
+
       include Fargo::Utils
       include Fargo::Parser
-      
+
       set_callback :listen, :before, :pre_listen
       set_callback :listen, :after do |connection|
         send_lock if connection.config.first
       end
-      
+
       attr_accessor :download
 
       def pre_listen
         Fargo.logger.debug "Initiating connection on: #{config.address}:#{config.port}"
-        
+
         config.quit_on_disconnect = false
         @lock, @pk = generate_lock
         @handshake_step = 0
-        
+
         @buffer_size = (2 << 12).freeze
       end
 
@@ -30,32 +30,38 @@ module Fargo
 
       def read_data
         # only download if we're at the correct time
-        return super if @handshake_step != 6 
+        return super if @handshake_step != 6
 
         @exit_time = 20 # reset our timeout time
-        
+
         data = @socket.readpartial @buffer_size
-        
+
         if @zlib
           @zs = Zlib::Inflate.new if @zs.nil?
           data = @zs.inflate data
         end
-        
+
         @file << data
         @recvd += data.length
 
-        if @recvd == @length
-          download_finished!
-        elsif @recvd > @length
+        if @recvd > @length
           error "#{self} #{@recvd} > #{@length}!!!"
           download_finished!
         else
-          publish :download_progress, :percent    => @recvd.to_f / @length, 
-                                      :file       => download_path, 
-                                      :nick       => @other_nick, 
-                                      :download   => @download,
-                                      :size       => @length, 
-                                      :compressed => @zlib
+          percent = @recvd.to_f / @length
+          if percent - @last_published > 0.05
+            @file.flush
+            publish :download_progress, :percent    => percent,
+                                        :file       => download_path,
+                                        :nick       => @other_nick,
+                                        :download   => @download,
+                                        :size       => @recvd,
+                                        :compressed => @zlib
+
+            @last_published = percent
+          end
+
+          download_finished! if @recvd == @length
         end
       rescue IOError => e
         error "#{self}: IOError, disconnecting #{e}"
@@ -67,7 +73,7 @@ module Fargo
         case message[:type]
           when :mynick
             if @handshake_step == 0
-              @handshake_step  = 1 
+              @handshake_step  = 1
               @other_nick      = message[:nick]
 
               @client.connected_with! @other_nick
@@ -94,7 +100,7 @@ module Fargo
             else
               error 'Premature disconnect when lock received'
             end
-            
+
           when :supports
             if @handshake_step == 2
               @client_extensions = message[:extensions]
@@ -102,7 +108,7 @@ module Fargo
             else
               error 'Premature disconnect when supports received'
             end
-            
+
           when :direction
             if @handshake_step == 3 && message[:direction] == 'upload'
               @client_num     = message[:number]
@@ -110,7 +116,7 @@ module Fargo
             else
               error 'Premature disconnect when direction received'
             end
-            
+
           when :key
             if @handshake_step == 4 && generate_key(@lock) == message[:key]
 
@@ -132,9 +138,9 @@ module Fargo
 
               write "$Send" unless @client_extensions.include? 'ADCGet'
 
-              publish :download_started, :file     => download_path, 
-                                         :download => @download, 
-                                         :nick     => @other_nick   
+              publish :download_started, :file     => download_path,
+                                         :download => @download,
+                                         :nick     => @other_nick
             else
               error "Premature disconnect when #{message[:type]} received"
             end
@@ -142,27 +148,29 @@ module Fargo
           when :noslots
             if @download
               Fargo.logger.debug "#{self}: No Slots for #{self[:download]}"
-              
+
               download_failed! 'No Slots'
             end
 
           when :error
-            error "#{self}: Error! #{message[:message]}"
-          
-          # This wasn't handled by us, proxy it on up to the client  
+            Fargo.logger.warn @last_error = "#{self}: Error! #{message[:message]}"
+            download_failed! message[:message]
+
+          # This wasn't handled by us, proxy it on up to the client
           else
             @client.publish message[:type], message
 
         end
       end
-      
+
       def begin_download!
-        @file = File.new download_path, File::CREAT | File::WRONLY
+        @file = File.open download_path, 'wb'
 
         @file.seek @download.offset
         @file.sync      = true
         @socket.sync    = true
         @handshake_step = 5
+        @last_published = 0
 
         if @download.file_list?
           if @client_extensions.include? 'XmlBZList'
@@ -177,7 +185,7 @@ module Fargo
         if @client_extensions.include? 'ADCGet'
           download_query = @download.file
           if @download.tth && @client_extensions.include?('TTHF')
-            download_query = @download.tth.gsub ':', '/'
+            download_query = 'TTH/' + @download.tth
           end
 
           zlig = ''
@@ -194,66 +202,67 @@ module Fargo
         # This is the thread for the timeout of a connection. The @exit_time
         # variable is reset to 20 after every bit of information is received.
         @exit_time = 20
-        @exit_thread = Thread.start { 
+        @exit_thread = Thread.start {
           while @exit_time > 0
             sleep 1
             @exit_time -= 1
             Fargo.logger.debug "#{self} time out in #{@exit_time} seconds"
           end
 
-          download_failed! 'Download timeout!' 
+          download_failed! 'Download timeout!'
         }
-        
+
         Fargo.logger.debug "#{self}: Beginning download of #{@download}"
       end
-      
+
       def download_failed! msg, opts = {}
         Fargo.logger.debug "#{self}: #{msg} #{@download}"
-        
+
         # cache because publishing must be at end of method and we're about to
         # clear these
         path, download = download_path, @download
 
         reset_download
 
-        publish :download_failed, opts.merge(:nick => @other_nick, 
-                                             :download   => download, 
-                                             :file       => path, 
+        publish :download_failed, opts.merge(:nick => @other_nick,
+                                             :download   => download,
+                                             :file       => path,
                                              :last_error => msg)
 
         @exit_thread = nil
       end
-      
+
       def download_finished!
         Fargo.logger.debug "#{self}: Finished download of #{@download}"
-        
+
         # cache because publishing must be at end of method and we're about to
         # clear these
         path, download = download_path, @download
-        
+
         reset_download
-        
-        publish :download_finished, :file => path, :download => download, 
+
+        publish :download_finished, :file => path, :download => download,
                                     :nick => @other_nick
+        disconnect if download.file_list?
       end
-      
+
       def disconnect
         Fargo.logger.debug "#{self} Disconnecting from: #{@other_nick}"
-        
+
         super
 
         if @download
           download_failed! @last_error, :recvd => @recvd, :length => @length
         end
-        
+
         reset_download
       end
-     
+
       private
       def reset_download
         @file.close unless @file.nil? || @file.closed?
         if @file_path && File.exists?(@file_path) && File.size(@file_path) == 0
-          File.delete(@file_path) 
+          File.delete(@file_path)
         end
 
         if @socket
@@ -262,18 +271,18 @@ module Fargo
         end
 
         # If this was called from exit thread, don't kill it
-        if @exit_thread != Thread.current 
+        if @exit_thread != Thread.current
           @exit_thread.exit if @exit_thread && @exit_thread.alive?
           @exit_thread = nil
         end
-        
+
         # clear out these variables
-        @zs = @file_path = @zlib = @download = @length = @recvd = nil        
+        @zs = @file_path = @zlib = @download = @length = @recvd = nil
 
         # Go back to the get step
         @handshake_step = 5
       end
-  
+
       def download_path
         return nil if @download.try(:file).nil?
 
@@ -282,10 +291,12 @@ module Fargo
           filename = File.basename @download.file.gsub("\\", '/')
           path     = File.join(prefix, @other_nick, filename)
 
-          i = 0
-          while File.exists?(path)
-            i += 1
-            path = File.join(prefix, @other_nick, "#{i}-#{filename}")
+          unless @download.file_list?
+            i = 0
+            while File.exists?(path)
+              i += 1
+              path = File.join(prefix, @other_nick, "#{i}-#{filename}")
+            end
           end
 
           path

data/lib/fargo/publisher.rb

@@ -1,26 +1,42 @@
 module Fargo
   module Publisher
-    
+
     attr_reader :subscribers
 
     def subscribe &subscriber
-      raise RuntimeError.new("Need a subscription block!") if subscriber.nil?
+      raise RuntimeError.new('Need a subscription block!') if subscriber.nil?
+
       Fargo.logger.debug "#{self}: subscribing #{subscriber}"
       (@subscribers ||= []) << subscriber
     end
-    
+
     def subscribed_to?
       @subscribers && @subscribers.size > 0
     end
-    
+
     def unsubscribe &subscriber
-      raise RuntimeError.new("Need a subscription block!") if subscriber.nil?
+      raise RuntimeError.new('Need a subscription block!') if subscriber.nil?
+
       Fargo.logger.debug "#{self}: unsubscribing #{subscriber}"
       (@subscribers ||= []).delete subscriber
     end
 
     def publish message_type, hash = {}
-      @subscribers.each { |subscriber| subscriber.call message_type, hash } if @subscribers
+      @subscribers ||= []
+
+      to_remove = []
+
+      @subscribers.each do |subscriber|
+        begin
+          subscriber.call message_type, hash
+        rescue => e
+          Fargo.logger.warn "#{self}: error publishing to: #{subscriber}! #{e}"
+          to_remove << subscriber
+        end
+      end
+
+      @subscribers -= to_remove
     end
+
   end
 end

data/lib/fargo/supports/downloads.rb

@@ -10,31 +10,48 @@ module Fargo
           file == 'files.xml.bz2'
         end
       end
-      
+
       attr_reader :current_downloads, :finished_downloads, :queued_downloads,
                   :failed_downloads, :open_download_slots, :trying, :timed_out,
                   :download_slots
-      
+
       included do
         set_callback :setup, :after, :initialize_queues
       end
-      
+
       def clear_failed_downloads
         failed_downloads.clear
       end
-      
+
       def clear_finished_downloads
         finished_downloads.clear
       end
 
-      def download nick, file, tth=nil, size=-1, offset=0
+      def download nick, file=nil, tth=nil, size=-1, offset=0
         raise ConnectionException.new 'Not connected yet!' unless hub
-        raise 'File cannot be nil!' if file.nil?
 
+        if nick.is_a?(Supports::FileList::Listing)
+          listing = nick
+          nick    = listing.nick
+          file    = listing.name
+          tth     = listing.tth
+          size    = listing.size
+        elsif nick.is_a?(Download)
+          dl     = nick
+          nick   = dl.nick
+          file   = dl.file
+          tth    = dl.tth
+          size   = dl.size || -1
+          offset = dl.offset || 0
+        end
+
+        raise 'File must not be nil!' if file.nil?
         unless nicks.include? nick
-          raise ConnectionException.new "User #{nick} does not exist!" 
+          raise ConnectionException.new "User #{nick} does not exist!"
         end
 
+        tth = tth.gsub /^TTH:/, '' if tth
+
         download         = Download.new nick, file, tth, size, offset
         download.percent = 0
         download.status  = 'idle'
@@ -52,13 +69,13 @@ module Fargo
           Fargo.logger.warn "#{file} isn't a failed download for: #{nick}!"
           return
         end
-        
+
         @failed_downloads[nick].delete dl
         download dl.nick, dl.file, dl.tth, dl.size
       end
 
       def remove_download nick, file
-        # We need to synchronize this access, so append these arguments to a 
+        # We need to synchronize this access, so append these arguments to a
         # queue to be processed later
         @to_remove << [nick, file]
         true
@@ -93,11 +110,11 @@ module Fargo
         @downloading_lock.synchronize {
           # Find the first nick and download list
           arr = @queued_downloads.to_a.detect{ |nick, downloads|
-            downloads.size > 0 && 
-              !@current_downloads.has_key?(nick) && 
-              !@trying.include?(nick) && 
-              !@timed_out.include?(nick) && 
-              has_slot?(nick)
+            downloads.size > 0 &&
+              !@current_downloads.has_key?(nick) &&
+              !@trying.include?(nick) &&
+              !@timed_out.include?(nick) &&
+              (connection_for(nick) || has_slot?(nick))
           }
 
           return false if arr.nil? || arr.size == 0
@@ -131,7 +148,7 @@ module Fargo
           return nil
         end
 
-        download                 = @queued_downloads[user].shift 
+        download                 = @queued_downloads[user].shift
         @current_downloads[user] = download
         @trying.delete user
 
@@ -160,12 +177,14 @@ module Fargo
 
         download
       end
-      
+
       def download_finished! user, failed
         download = nil
-        @downloading_lock.synchronize{ 
+        @downloading_lock.synchronize{
           download = @current_downloads.delete user
           @open_download_slots += 1
+
+          # connection_for(user).disconnect if @queued_downloads[user].size == 0
         }
 
         if failed
@@ -176,7 +195,7 @@ module Fargo
 
         start_download # Start another download if possible
       end
-      
+
       def connection_failed_with! nick
         @trying.delete nick
         @timed_out << nick
@@ -224,7 +243,7 @@ module Fargo
         @download_removal_thread.exit
       end
 
-      # Both of these need access to the synchronization lock, so we use 
+      # Both of these need access to the synchronization lock, so we use
       # separate threads to do these processes.
       def start_download_queue_threads
         @to_download = Queue.new
@@ -236,8 +255,13 @@ module Fargo
               download.status = 'timeout'
               (@failed_downloads[download.nick] ||= []) << download
             else
-              (@queued_downloads[download.nick] ||= []) << download
-              start_download
+              @queued_downloads[download.nick] ||= []
+
+              unless @queued_downloads[download.nick].include?(download) ||
+                  @current_downloads[download.nick] == download
+                @queued_downloads[download.nick] << download
+                start_download
+              end
             end
           }
         }
@@ -256,6 +280,6 @@ module Fargo
         }
       end
 
-    end # Downloads  
+    end # Downloads
   end # Supports
 end # Fargo

data/lib/fargo/supports/file_list.rb

@@ -4,13 +4,19 @@ require 'libxml'
 module Fargo
   module Supports
     module FileList
-      class Listing < Struct.new(:tth, :size, :name); end
+      class Listing < Struct.new(:tth, :size, :name, :nick); end
 
       # Lazily load the file list for the nick. Subscribe to the client for the
       # event :file_list to get notified.
       def file_list nick
         @file_list ||= {}
-        return parse_file_list(@file_list[nick]) if @file_list.has_key?(nick)
+        @getting_file_list ||= {}
+
+        if @file_list.has_key?(nick)
+          return parse_file_list(@file_list[nick], nick)
+        elsif @getting_file_list[nick]
+          return true
+        end
 
         file_gotten = lambda{ |type, map|
           case type
@@ -19,19 +25,23 @@ module Fargo
                 @file_list[nick] = map[:file]
                 unsubscribe &file_gotten
                 publish :file_list, :nick => nick, :list => @file_list[nick]
+                @getting_file_list.delete nick
               end
           end
         }
 
         subscribe &file_gotten
 
+        @getting_file_list[nick] = true
         download nick, 'files.xml.bz2'
       end
 
       # Wait for the results to arrive, timed out after some time
       def file_list! nick, timeout = 10
         @file_list ||= {}
-        return parse_file_list(@file_list[nick]) if @file_list.has_key?(nick)
+        if @file_list.has_key?(nick)
+          return parse_file_list(@file_list[nick], nick)
+        end
 
         list = nil
         list_gotten = lambda{ |type, map|
@@ -45,35 +55,37 @@ module Fargo
 
         timeout_response(timeout, list_gotten){ file_list nick }
 
-        parse_file_list list
+        parse_file_list list, nick
       end
 
       private
 
-      def parse_file_list file
+      def parse_file_list file, nick
         if file && File.exists?(file)
+          Fargo.logger.debug "Parsing file list for: '#{nick}' at '#{file}'"
           xml = Bzip2::Reader.open(file).read
           doc = LibXML::XML::Document.string xml
 
-          construct_file_list doc.root
+          construct_file_list doc.root, nil, nick
         else
           nil
         end
       end
 
-      def construct_file_list node
+      def construct_file_list node, prefix, nick
         list = {}
 
         node.each_element do |element|
-          element_name = element['Name']
+          path = prefix ? prefix + "\\" + element['Name'] : element['Name']
+
           if element.name =~ /directory/i
-            list[element_name] = construct_file_list element
+            list[element['Name']] = construct_file_list element, path, nick
           else
-            list[element_name] = Listing.new(
-              element['TTH'],
-              element['Size'],
-              element_name
-            )
+            # Why does this consistently segfault ruby 1.8.7 when I convert
+            # element['Size'] to an integer before the struct is created?!
+            element = list[element['Name']] = Listing.new(element['TTH'],
+              element['Size'], path, nick)
+            element.size = element.size.to_i
           end
         end
 

data/lib/fargo/supports/persistence.rb

@@ -13,30 +13,33 @@ module Fargo
 
       def connection_for nick
         c = @connection_cache.try :[], nick
-        return c if c.nil? || c.connected?
+        if c.nil? || c.connected?
+          Fargo.logger.debug "#{self} has connection with: #{nick}: #{c}"
+          return c
+        end
 
         # If it's present and not connected, remove it from the cache
         @connection_cache.try :delete, nick
         nil
       end
-      
+
       def connected_with? nick
         c = @connection_cache.try :[], nick
         c.connected? unless c.nil?
-      end 
-      
+      end
+
       def disconnect_from nick
         c = @connection_cache.try :delete, nick
         c.disconnect unless c.nil?
       end
-      
+
       def nicks_connected_with
         return [] if @connection_cache.nil?
 
         nicks = @connection_cache.keys
-        nicks.reject{ |n| !connected_with? n } 
+        nicks.reject{ |n| !connected_with? n }
       end
-      
+
       def setup_connection_cache
         @connection_cache = {}
 
@@ -49,4 +52,4 @@ module Fargo
 
     end
   end
-end
+end

data/lib/fargo/version.rb

@@ -1,3 +1,3 @@
 module Fargo
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fargo
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Alex Crichton
@@ -14,51 +15,54 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 -04:00
+date: 2010-09-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
         version: 3.0.0
+  requirement: *id001
   type: :runtime
+  name: activesupport
   prerelease: false
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: libxml-ruby
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id002
   type: :runtime
+  name: libxml-ruby
   prerelease: false
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bzip2-ruby
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id003
   type: :runtime
+  name: bzip2-ruby
   prerelease: false
-  version_requirements: *id003
-description: DC Client
+description: Direct Connect (DC) Client implemented in pure Ruby
 email: alex@alexcrichton.com
 executables: []
 
@@ -103,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1373483426740815041
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -112,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1373483426740815041
+      hash: 3
       segments: 
       - 0
       version: "0"