fargo 0.3.0 → 0.4.0

data/lib/fargo/cli/searches.rb

@@ -0,0 +1,63 @@
+require 'active_support/core_ext/module/delegation'
+
+module Fargo
+  module CLI
+    module Searches
+      delegate :search, :to => :client
+
+      def setup_console
+        super
+
+        add_completion(/^results\s+[^\s]+$/){ client.searches }
+
+        add_logger(:search_result) do |message|
+          obj = client.search_objects.detect{ |s| s.matches? message }
+          if obj
+            "New search result for: #{obj.query.inspect}"
+          else
+            'New search result'
+          end
+        end
+      end
+
+      def results str = nil, opts = {}
+        str ||= client.searches.last
+        results = client.search_results(str)
+
+        if results.nil?
+          puts "No search results for: #{str.inspect}!"
+          return
+        end
+
+        results = results.map{ |r| r.dup }
+
+        results.each_with_index{ |r, i|
+          r[:file]  = r[:file].gsub("\\", '/')
+          r[:file]  = File.basename(r[:file]) unless opts[:full]
+          r[:index] = i
+        }
+
+        max_nick_size = results.map{ |r| r[:nick].size }.max
+
+        if opts[:sort] == 'size'
+          results = results.sort_by{ |r| r[:size] }
+        elsif !opts[:sort].nil?
+          puts "Unknown sort value: #{opts[:sort]}"
+          results = []
+        end
+
+        if opts[:grep]
+          results = results.select{ |r| r[:file].match opts[:grep] }
+        end
+
+        results.each do |r|
+          printf "%3d: %#{max_nick_size}s %9s -- %s\n", r[:index],
+            r[:nick], humanize_bytes(r[:size]), r[:file]
+        end
+
+        true
+      end
+
+    end
+  end
+end

data/lib/fargo/cli/stats.rb

@@ -0,0 +1,16 @@
+module Fargo
+  module CLI
+    module Stats
+
+      def status
+        puts "User count: #{client.nicks.size}"
+        puts "Shared Directories:"
+        client.shared_directories.each do |dir|
+          puts "\t#{dir}"
+        end
+        puts "Sharing: #{humanize_bytes(client.share_size)}"
+      end
+
+    end
+  end
+end

data/lib/fargo/client.rb

@@ -1,6 +1,9 @@
 require 'socket'
+require 'base64'
 require 'active_support/core_ext/object/try'
 require 'active_support/callbacks'
+require 'active_support/configurable'
+require 'em-websocket'
 
 module Fargo
   class Client
@@ -22,14 +25,17 @@ module Fargo
 
     configure do |config|
       config.download_dir   = '/tmp/fargo/downloads'
-      config.config_dir     = '/tmp/fargo/config'
-      config.address        = IPSocket.getaddress(Socket.gethostname)
+      config.config_dir     = ENV['HOME'] + '/.fargo'
+      config.address        =
+        (IPSocket.getaddress(Socket.gethostname) rescue '0.0.0.0')
       config.passive        = false
       config.nick           = 'fargo'
       config.hub_address    = '127.0.0.1'
       config.hub_port       = 7314
       config.active_port    = 7315
       config.search_port    = 7316
+      config.websocket_port = 9091
+      config.websocket_host = '127.0.0.1'
       config.download_slots = 4
       config.upload_slots   = 4
       config.password       = ''
@@ -49,15 +55,15 @@ module Fargo
         @channel.subscribe do |type, hash|
           Fargo.logger.debug "Channel received: #{type} - #{hash.inspect}"
         end
+
+        config_file = config.config_dir + '/config'
+        if File.exists? config_file
+          eval File.read(config_file)
+        end
       end
     end
 
     def connect
-      EventMachine.error_handler{ |e|
-        Fargo.logger.debug "Error raised during event loop: #{e.message}"
-        Fargo.logger.debug e.backtrace.join("\n")
-      }
-
       run_callbacks :connect do
         EventMachine.connect config.hub_address, config.hub_port,
             Protocol::Hub do |conn|
@@ -77,10 +83,29 @@ module Fargo
           end
         end
       end
+
+      start_websocket_service
+    end
+
+    def start_websocket_service
+      EventMachine.start_server(config.websocket_host, config.websocket_port,
+          EventMachine::WebSocket::Connection, {}) do |ws|
+        ws.onopen {
+          Fargo.logger.debug('ws connected')
+
+          sid = channel.subscribe do |type, hash|
+            if type != :download_opened
+              ws.send Base64.encode64(Marshal.dump([type, hash]))
+            end
+          end
+
+          ws.onclose{ channel.unsubscribe sid }
+        }
+      end
     end
 
     def connected?
-      EventMachine.reactor_running?
+      EventMachine.reactor_running? && !hub.error?
     end
 
     def disconnect

data/lib/fargo/ext/irb.rb

@@ -0,0 +1,33 @@
+require 'irb'
+
+# See url below for where this came from
+# http://jameskilton.com/2009/04/02/embedding-irb-into-your-ruby-application/
+module IRB
+  def self.start_session(binding)
+    unless @__initialized
+      args = ARGV
+      ARGV.replace(ARGV.dup)
+      IRB.setup(nil)
+      ARGV.replace(args)
+      @__initialized = true
+    end
+
+    workspace = WorkSpace.new(binding)
+
+    irb = Irb.new(workspace)
+
+    trap('SIGINT') do
+      irb.signal_handle
+    end
+
+    @CONF[:IRB_RC].call(irb.context) if @CONF[:IRB_RC]
+    @CONF[:MAIN_CONTEXT] = irb.context
+    @CONF[:PROMPT][@CONF[:PROMPT_MODE]][:RETURN].replace ''
+
+    yield if block_given?
+
+    catch(:IRB_EXIT) do
+      irb.eval_input
+    end
+  end
+end

data/lib/fargo/ext/readline.rb

@@ -0,0 +1,18 @@
+require 'readline'
+
+if Readline::VERSION =~ /editline/i
+  $stderr.puts "Sorry, fargo CLI requires a ruby compiled against the actual"
+  $stderr.puts "Readline library. Your version is: '#{Readline::VERSION}'"
+  exit 1
+end
+
+require 'readline/extra_utils'
+
+module Readline
+  def self.above_prompt
+    Readline.clear_rl
+    yield
+  ensure
+    Readline.restore
+  end
+end

data/lib/fargo/ext/struct.rb

@@ -0,0 +1,7 @@
+class Struct
+  def to_h
+    {}.tap do |h|
+      members.zip(entries).each{ |k, v| h[k] = v }
+    end
+  end
+end

data/lib/fargo/protocol/peer_download.rb

@@ -21,12 +21,14 @@ module Fargo
           download_finished!
         else
           percent = @recvd.to_f / @length
+          @download.percent = percent
+
           if percent - @last_published > 0.05
             @file.flush
             @client.channel << [:download_progress, {:percent => percent,
                                         :file           => download_path,
                                         :nick           => @other_nick,
-                                        :download       => @download,
+                                        :download       => @download.to_h,
                                         :size           => @recvd,
                                         :compressed     => @zlib}]
 
@@ -61,7 +63,8 @@ module Fargo
               end
 
               @client.channel << [:download_started, {:file => download_path,
-                                         :download  => @download,
+                                         :download  => @download.to_h,
+                                         :length    => @length,
                                          :nick      => @other_nick}]
             else
               error "Premature disconnect when #{message[:type]} received"
@@ -157,7 +160,7 @@ module Fargo
         reset_download
 
         @client.channel << [:download_failed, opts.merge(:nick => @other_nick,
-                                             :download   => download,
+                                             :download   => download.to_h,
                                              :file       => path,
                                              :last_error => msg)]
       end
@@ -172,7 +175,7 @@ module Fargo
         reset_download
 
         @client.channel << [:download_finished,
-            {:file => path, :download => download, :nick => @other_nick}]
+            {:file => path, :download => download.to_h, :nick => @other_nick}]
 
         close_connection_after_writing if download.file_list?
       end

data/lib/fargo/supports/chat.rb

@@ -5,6 +5,7 @@ module Fargo
 
       included do
         set_callback :initialization, :after, :initialize_chats
+        set_callback :connect, :after, :periodically_remove_chats
       end
 
       def messages
@@ -15,8 +16,22 @@ module Fargo
         @chats[nick]
       end
 
+      def send_chat text
+        hub.send_data "<#{config.nick}> #{text}|"
+      end
+
       protected
 
+      def periodically_remove_chats
+        EventMachine.add_periodic_timer 60 do
+          @public_chats = @public_chats[0..100]
+
+          @chats.each_pair do |k, v|
+            @chats[k] = v[0..100]
+          end
+        end
+      end
+
       def initialize_chats
         @public_chats = []
         @chats        = Hash.new{ |h, k| h[k] = [] }

data/lib/fargo/supports/downloads.rb

@@ -19,7 +19,11 @@ module Fargo
                   :failed_downloads, :trying, :timed_out
 
       def has_download_slot?
-        @current_downloads.size + @trying.size < config.download_slots
+        open_download_slots > 0
+      end
+
+      def open_download_slots
+        config.download_slots - @trying.size - @current_downloads.size
       end
 
       def clear_failed_downloads

data/lib/fargo/supports/local_file_list.rb

@@ -1,5 +1,5 @@
 require 'bzip2'
-require 'libxml'
+require 'nokogiri'
 require 'active_support/core_ext/module/synchronization'
 
 module Fargo
@@ -8,7 +8,7 @@ module Fargo
       extend ActiveSupport::Concern
       include TTH
 
-      attr_reader :local_file_list
+      attr_reader :local_file_list, :shared_directories
 
       included do
         set_callback :initialization, :after, :initialize_upload_lists
@@ -16,17 +16,14 @@ module Fargo
       end
 
       def share_directory dir
-        @shared_directories << dir unless @shared_directories.include? dir
+        shared_directories << dir unless shared_directories.include? dir
 
-        if connected?
-          EventMachine.defer {
+        EventMachine.schedule { # Make sure we run in the reactor
+          EventMachine.defer {  # This takes awhile so don't block the reactor
             update_tth dir
             write_file_list
           }
-        else
-          update_tth dir
-          write_file_list
-        end
+        }
       end
 
       def share_size
@@ -38,11 +35,11 @@ module Fargo
       end
 
       def local_listings
-        collect_local_listings @local_file_list, [], nil
+        collect_local_listings local_file_list, [], nil
       end
 
       def search_local_listings search
-        collect_local_listings @local_file_list, [], search
+        collect_local_listings local_file_list, [], search
       end
 
       def listing_for query
@@ -56,6 +53,10 @@ module Fargo
 
       protected
 
+      def cache_file_list_path
+        File.join config.config_dir, 'file_cache'
+      end
+
       def collect_local_listings hash, arr, search
         hash.each_pair do |k, v|
           if v.is_a?(Listing)
@@ -69,18 +70,24 @@ module Fargo
       end
 
       def write_file_list
-        doc      = LibXML::XML::Document.new
-        doc.root = LibXML::XML::Node.new 'FileListing'
-        doc.root['Version']   = '1'
-        doc.root['Base']      = '/'
-        doc.root['Generator'] = "fargo #{VERSION}"
-
-        create_entities @local_file_list, doc.root
+        builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
+          attrs = ActiveSupport::OrderedHash.new
+          attrs[:Base]      = '/'
+          attrs[:Version]   = '1'
+          attrs[:Generator] = "fargo #{VERSION}"
+          xml.FileListing(attrs) {
+            create_entities local_file_list, xml
+          }
+        end
 
         FileUtils.mkdir_p config.config_dir
         Bzip2::Writer.open(local_file_list_path, 'w') do |f|
-          f << doc.to_s(:indent => false)
+          f << builder.to_xml
         end
+
+        File.open(cache_file_list_path, 'w'){ |f|
+          f << Marshal.dump([local_file_list, shared_directories, share_size])
+        }
       end
 
       def update_tth root, directory = nil, hash = nil
@@ -89,7 +96,7 @@ module Fargo
           root      = File.dirname(root)
         end
 
-        hash ||= (@local_file_list[File.basename(directory)] ||= {})
+        hash ||= (local_file_list[File.basename(directory)] ||= {})
 
         Pathname.glob(directory + '/*').each do |path|
           if path.directory?
@@ -125,27 +132,24 @@ module Fargo
 
       synchronize :update_tth, :with => :@update_lock
 
-      def create_entities entity, node
+      def create_entities entity, xml
         entity.each_pair do |k, v|
           if v.is_a? Hash
-            dir = LibXML::XML::Node.new 'Directory'
-            dir['Name'] = k
-            create_entities v, dir
-            node << dir
+            xml.Directory(:Name => k) { create_entities v, xml }
           else
-            file = LibXML::XML::Node.new 'File'
-            file['Name'] = k
-            file['Size'] = v.size.to_s
-            file['TTH']  = v.tth
-
-            node << file
+            # Make sure they always show up in this order
+            attrs        = ActiveSupport::OrderedHash.new
+            attrs[:Name] = k
+            attrs[:Size] = v.size.to_s
+            attrs[:TTH]  = v.tth
+            xml.File attrs
           end
         end
       end
 
       def schedule_update
         EventMachine::Timer.new(60) do
-          @shared_directories.each{ |d| update_tth d }
+          shared_directories.each{ |d| update_tth d }
 
           write_file_list
           schedule_update
@@ -153,10 +157,12 @@ module Fargo
       end
 
       def initialize_upload_lists
-        @shared_directories = []
-        @local_file_list    = {}
-        @share_size         = 0
-        @update_lock        = Mutex.new
+        @local_file_list, @shared_directories, @share_size = begin
+          Marshal.load File.read(cache_file_list_path)
+        rescue
+          [{}, [], 0]
+        end
+        @update_lock = Mutex.new
       end
 
     end