xget 1.0.2 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fea40eb92d2b04847b8db0ebf07540c6474bebc6
-  data.tar.gz: fa51ff8c1c38761aee63f47119a18ecdd2de0089
+  metadata.gz: d53971aeea75422201037489b8cba4f9842b8a6e
+  data.tar.gz: 2424da3f8132b7f3986c0c8b9dc3518450c01949
 SHA512:
-  metadata.gz: 3fbe201554779a3dd35a48b2d42ee6af743825716030d30677741639c7d6163cfbd387b3c75b8e89821e59c03501d2e5001ca7051d3fb8727813784a734556b3
-  data.tar.gz: dd8ec00178cd2f3e622ec1bed83ccb669cdfcca289c756b674edaa855cf68324e9a052841966480b3fd21c022f7377a015bfe8f7eb55b0a8f4efa2b5b2a4000d
+  metadata.gz: 39d5e569ad048bc81adc6c5629c94da2cce2ad23c00be5dacfc0aad70161a11be90431f8ca5db5f4b3c6fa288db4c0c2220d1ec66651cf850bbf1121a65ac4d0
+  data.tar.gz: dcacfcf3d877d04c7090b7ba8844df6ca9fc6ccf622260afde11225ebf0dc02a4b25a8ad42f4014e6e6f6f6e0e22c0514e8c6957b40ec7fee06cca2b2131731c

data/bin/xget

@@ -18,7 +18,7 @@ Thread.abort_on_exception = true
 $stdout.sync = true
 
 # Version values
-$ver_maj, $ver_min, $ver_rev = 2, 1, 0
+$ver_maj, $ver_min, $ver_rev = 2, 1, 1
 $ver_str = "#{$ver_maj}.#{$ver_min}.#{$ver_rev}"
 
 config = {
@@ -92,8 +92,8 @@ class XDCC_SEND
   def initialize fname, fsize, ip, port
     @fname = fname
     @fsize = fsize
-    @ip = ip
-    @port = port
+    @ip    = ip
+    @port  = port
   end
 
   def to_s
@@ -126,7 +126,7 @@ class Stream
 
   def initialize serv
     @buf = []
-    timeout(5) { @io  = TCPSocket.new serv, 6667 }
+    Timeout.timeout(5) { @io  = TCPSocket.new serv, 6667 }
   rescue SocketError => e
     puts_abort "Failed to connect to #{serv}! #{e.message}"
   rescue Timeout::Error
@@ -214,9 +214,9 @@ end
 def time_distance t
   if t < 60
     case t
-    when 0 then "- nevermind, done!"
-    when 1..4 then "in a moment!"
-    when 5..9 then "less than 10 seconds"
+    when 0      then "- nevermind, done!"
+    when 1..4   then "in a moment!"
+    when 5..9   then "less than 10 seconds"
     when 10..19 then "less than 20 seconds"
     when 20..39 then "half a minute"
     else "less than a minute"
@@ -224,11 +224,11 @@ def time_distance t
   else # Use minutes, to aovid big numbers
     t = t / 60.0
     case t.to_i
-    when 1 then "about a minute"
-    when 2..45 then "#{t.round} minutes"
-    when 45..90 then "about an hour"
-    when 91..1440 then "about #{(t / 60.0).round} hours"
-    when 1441..2520 then "about a day"
+    when 1           then "about a minute"
+    when 2..45       then "#{t.round} minutes"
+    when 45..90      then "about an hour"
+    when 91..1440    then "about #{(t / 60.0).round} hours"
+    when 1441..2520  then "about a day"
     when 2521..86400 then "about #{(t / 1440.0).round} days"
     else "about #{(t/ 43200.0).round} months"
     end
@@ -253,9 +253,9 @@ def time_elapsed t
   end
 
   # Unit suffixes
-  suffix = [ "seconds", "minutes", "hours", "days", "months", "years" ];
+  suffix     = [ "seconds", "minutes", "hours", "days", "months", "years" ]
   # Don't use plural if x is 1
-  plural = ->(x, y) { x == 1 ? y[0..-2] : y }
+  plural     = ->(x, y) { x == 1 ? y[0..-2] : y }
   # Format string to "value unit"
   format_str = ->(x) { "#{ta[x]} #{plural[ta[x], suffix[x]]}, " }
 
@@ -270,7 +270,7 @@ end
 def dcc_download ip, port, fname, fsize, read = 0
   sock = nil
   begin
-    timeout(5) { sock = TCPSocket.new ip, port }
+    Timeout.timeout(5) { sock = TCPSocket.new ip, port }
   rescue Timeout::Error
     puts_abort "Connection to #{ip} timed out!"
   end
@@ -283,7 +283,7 @@ def dcc_download ip, port, fname, fsize, read = 0
   # Form the status bar
   print_bar = ->() {
     print "\r\e[0K> [ \e[1;37m"
-    pc = read.to_f / fsize.to_f * 100.0
+    pc   = read.to_f / fsize.to_f * 100.0
     bars = (pc / 10).to_i
     bars.times { print "#" }
     (10 - bars).times { print " " }
@@ -349,8 +349,10 @@ if __FILE__ == $0 then
     puts "\n Examples"
     puts " \txget.rb --config config.conf --nick test"
     puts " \txget.rb --files test1.txt:test2.txt:test3.txt"
-    puts " \txget.rb irc.rizon.net/#news/ginpachi-sensei/1"
-    puts " \txget.rb irc.rizon.net/#news/ginpachi-sensei/41..46"
+    puts " \txget.rb #news@irc.rizon.net/ginpachi-sensei/1"
+    puts " \txget.rb #news@irc.rizon.net/ginpachi-sensei/41..46"
+    puts " \txget.rb #news@irc.rizon.net/ginpachi-sensei/41..46|2"
+    puts " \txget.rb #news@irc.rizon.net/ginpachi-sensei/41..46&49..52|2&30"
     exit
   end
 
@@ -409,7 +411,7 @@ if __FILE__ == $0 then
         config[$1] << "/" unless config[$1][-1] == "/"
         next
       when "sleep-interval" then config[$1] = $2.to_i
-      when "skip-existing" then config[$1] = ($2 == "true")
+      when "skip-existing"  then config[$1] = ($2 == "true")
       when "allow-queueing" then config[$1] = ($2 == "true")
       else
         # Add value to current header, default is *
@@ -445,34 +447,32 @@ if __FILE__ == $0 then
   end
 
   # Parse to_check array for valid XDCC links, irc.serv.org/#chan/bot/pack
-  tmp_requests, tmp_range = [], []
+  tmp_requests = []
   to_check.each do |x|
-    if x =~ /^(\w+?).(\w+?).(\w+?)\/#(\S+)\/(\S+)\/(\d+)(..\d+(\|\d+)?)?$/
-      serv = [$1, $2, $3].join(".")
-      info = (config["servers"].has_key?(serv) ? serv : "*")
-      chan = "##{$4}"
-      bot  = $5
-      pack = $6.to_i
-
-      if $7.nil?
-        tmp_requests.push XDCC_REQ.new serv, chan, bot, pack, info
-      else
-        step = $8.nil? ? 1 : $8[1..-1].to_i
-        to_range = $7[2..-1].gsub(/(\|\d+)?$/, '').to_i # Clip off the ".." and the interval if present
-        if pack > to_range or pack == to_range
-          puts_error "Invalid range #{pack} to #{to_range} in \"#{x}\""
-          next
+    if x =~ /^(#\S+)@(irc.\w+.\w+{2,3})\/(\S+)\/([\.&\|\d]+)$/
+      chan  = $1
+      serv  = $2
+      bot   = $3
+      info  = config["servers"].has_key?(serv) ? serv : "*"
+      $4.split('&').each do |y|
+        if y =~ /^(\d+)(\.\.\d+(\|\d+)?)?$/
+          pack = $1.to_i
+          if $2.nil?
+            tmp_requests.push XDCC_REQ.new serv, chan, bot, pack, info
+          else
+            step  = $3.nil? ? 1 : $3[1..-1].to_i
+            range = $2[2..-1].to_i
+
+            puts_abort "Invalid range #{pack} to #{range} in \"#{x}\"" if pack > range or pack == range
+
+            (pack..range).step(step).each do |z|
+              tmp_requests.push XDCC_REQ.new serv, chan, bot, z, info
+            end
+          end
         end
-        tmp_range =* (pack..to_range).step(step)
-      end
-
-      # Convert range array to new requests
-      unless tmp_range.empty?
-        tmp_range.each { |y| tmp_requests.push XDCC_REQ.new serv, chan, bot, y, info }
-        tmp_range.clear
       end
     else
-      puts_abort "#{x} is not a valid XDCC address\n XDCC Address format: irc.serv.com/#chan/bot/pack"
+      puts_abort "#{x} is not a valid XDCC address\n XDCC Address format: #chan@irc.serv.com/bot/pack(s)"
     end
   end
 
@@ -503,17 +503,16 @@ if __FILE__ == $0 then
   # Sort requests by pack
   requests.each do |k,v|
     puts "#{k} \e[1;37m->\e[0m"
-    v = v.sort_by { |x| [x.chan, x.pack] }.each { |x| puts "\t#{x}" }
+    v.sort_by { |x| [x.chan, x.bot, x.pack] }.each { |x| puts "  #{x}" }
   end
   puts
 
   # H-h-here we g-go...
   requests.each do |k, v|
     req, info = v[0], config["servers"][v[0].info]
-    last_chan, cur_req, motd = "", -1, false
-    nick_sent, nick_check, nick_valid = false, false, false
-
-    xdcc_sent, xdcc_accepted, xdcc_queued = false, false, false
+    last_chan, cur_req, motd                  = "", -1, false
+    nick_sent, nick_check, nick_valid         = false, false, false
+    xdcc_sent, xdcc_accepted, xdcc_queued     = false, false, false
     xdcc_accept_time, xdcc_ret, req_send_time = nil, nil, nil
 
     stream  = Stream.new req.serv
@@ -534,7 +533,7 @@ if __FILE__ == $0 then
             puts_error 'Login failed'
             stream.disconnect
           end
-          puts "> \e[1;32m#{msg}\e[0m"
+          #puts "> \e[1;32m#{msg}\e[0m"
         else
           if prefix =~ /^NickServ!/
             if not nick_sent and info[:nserv] != nil
@@ -550,7 +549,7 @@ if __FILE__ == $0 then
                 nick_check = true
               end
             end
-            puts "> \e[1;33m#{msg}\e[0m"
+            #puts "> \e[1;33m#{msg}\e[0m"
           elsif prefix =~ /^#{Regexp.escape req.bot}!(.*)$/i
             case msg
             when /already requested that pack/i, /closing connection/i, /you have a dcc pending/i
@@ -579,10 +578,10 @@ if __FILE__ == $0 then
             req_send_time = nil
 
             tmp_fname = fname
-            fname = $1 if tmp_fname =~ /^"(.*)"$/
+            fname     = $1 if tmp_fname =~ /^"(.*)"$/
             puts "Preparing to download: \e[36m#{fname}\e[0m"
-            fname = (config["out-dir"].dup << fname)
-            xdcc_ret = XDCC_SEND.new fname, fsize.to_i, [ip.to_i].pack('N').unpack('C4') * '.', port.to_i
+            fname     = (config["out-dir"].dup << fname)
+            xdcc_ret  = XDCC_SEND.new fname, fsize.to_i, [ip.to_i].pack('N').unpack('C4') * '.', port.to_i
 
             # Check if the for unfinished download amd try to resume
             if File.exists? xdcc_ret.fname and File.stat(xdcc_ret.fname).size < xdcc_ret.fsize
@@ -630,17 +629,17 @@ if __FILE__ == $0 then
 
             Process.wait pid
             xdcc_sent, xdcc_accepted, xdcc_queued = false, false, false
-            xdcc_accept_time, xdcc_ret = nil, nil
+            xdcc_accept_time, xdcc_ret            = nil, nil
           end
         end
       when /^\d+?$/
         type_i = type.to_i
         case type_i
-        when 1 # Print welcome message, because it's nice
-          msg.sub!(/#{Regexp.escape info[:nick]}/, "\e[34m#{info[:nick]}\e[0m")
-          puts "! #{msg}"
-        when 400..533 # Handle errors, except 439
-          next if type_i == 439 # Skip 439
+        # when 1 # Print welcome message, because it's nice
+        #   msg.sub!(/#{Regexp.escape info[:nick]}/, "\e[34m#{info[:nick]}\e[0m")
+        #   puts "! #{msg}"
+        when 400..533 # Handle errors, except a few
+          next if [439, 462, 477].include? type_i
           puts_error "#{msg}"
           stream.disconnect
         when 376 then motd = true # Mark the end of the MOTD
@@ -675,7 +674,7 @@ if __FILE__ == $0 then
 
           stream << "PRIVMSG #{req.bot} :XDCC SEND #{req.pack}"
           req_send_time = Time.now
-          xdcc_sent = true
+          xdcc_sent     = true
         end
 
         # Wait 3 seconds for DCC SEND response, if there isn't one, abort
@@ -683,7 +682,7 @@ if __FILE__ == $0 then
           if config["allow-queueing"] and xdcc_queued
             next
           end
-          if (Time.now - req_send_time).floor > 3
+          if (Time.now - req_send_time).floor > 10
             puts_error "#{req.bot} took too long to respond, are you sure it's a bot?"
             stream.disconnect
             bot.stop
@@ -692,7 +691,7 @@ if __FILE__ == $0 then
 
         # Wait 3 seconds for a DCC ACCEPT response, if there isn't one, don't resume
         if xdcc_sent and xdcc_accepted and not xdcc_accept_time.nil?
-          if (Time.now - xdcc_accept_time).floor > 3
+          if (Time.now - xdcc_accept_time).floor > 10
             puts "FAILED! Bot client doesn't support resume!"
             puts "Connecting to: #{req.bot} @ #{xdcc_ret.ip}:#{xdcc_ret.port}"
             dcc_download xdcc_ret.ip, xdcc_ret.port, xdcc_ret.fname, xdcc_ret.fsize

data/xget.rb

@@ -0,0 +1,711 @@
+#!/usr/bin/env ruby
+
+# xget.rb - xget
+# Created by Rusty Shackleford on 2013/05/19
+# Copyright (c) 2013, Rusty Shackleford
+# All rights reserved.
+
+begin
+  require 'Win32/Console/ANSI' if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+  %w(socket thread slop timeout).each { |r| require r }
+rescue LoadError
+  abort "#{$0} requires slop and, if you're on Windows, win32console\nPlease run 'gem install slop win32console'"
+end
+
+# Why isn't this enabled by default?
+Thread.abort_on_exception = true
+# Put standard output into syncronised mode
+$stdout.sync = true
+
+# Version values
+$ver_maj, $ver_min, $ver_rev = 2, 1, 1
+$ver_str = "#{$ver_maj}.#{$ver_min}.#{$ver_rev}"
+
+config = {
+  "out-dir"        => './',
+  "skip-existing"  => false,
+  "servers"        => {},
+  "sleep-interval" => 5,
+  "allow-queueing" => false
+}
+
+def puts_error msg
+  puts "! \e[31mERROR\e[0m: #{msg}"
+end
+
+def puts_abort msg
+  abort "! \e[31mERROR\e[0m: #{msg}"
+end
+
+def puts_warning msg
+  puts "! \e[33mWARNING:\e[0m: #{msg}"
+end
+
+# Extend IO to readlines without blocking
+class IO
+  def gets_nonblock
+    @rlnb_buffer ||= ""
+    ch = nil
+    while ch = self.read_nonblock(1)
+      @rlnb_buffer += ch
+      if ch == "\n" then
+        res  = @rlnb_buffer
+        @rlnb_buffer = ""
+        return res
+      end
+    end
+  end
+end
+
+# Extend Array to get averages
+class Array
+  def average
+    inject(:+) / count
+  end
+end
+
+# Class to hold XDCC requests
+class XDCC_REQ
+  attr_accessor :serv, :chan, :bot, :pack, :info
+
+  def initialize serv, chan, bot, pack, info = "*"
+    @serv = serv
+    @chan = chan
+    @bot  = bot
+    @pack = pack
+    @info = info
+  end
+
+  def eql? other
+    self.serv == other.serv and self.chan == other.chan and self.bot == other.bot and self.pack == other.pack
+  end
+
+  def to_s
+    "[ #{self.serv}, #{self.chan}, #{self.bot}, #{self.pack}, #{self.info} ]"
+  end
+end
+
+# Class to hold DCC SEND info for when waiting for DCC ACCEPT
+class XDCC_SEND
+  attr_accessor :fname, :fsize, :ip, :port
+
+  def initialize fname, fsize, ip, port
+    @fname = fname
+    @fsize = fsize
+    @ip    = ip
+    @port  = port
+  end
+
+  def to_s
+    "[ #{self.fname}, #{self.fsize}, #{self.ip}, #{self.port} ]"
+  end
+end
+
+# Class to emit events
+module Emitter
+  def callbacks
+    @callbacks ||= Hash.new { |h, k| h[k] = [] }
+  end
+
+  def on type, &block
+    callbacks[type] << block
+    self
+  end
+
+  def emit type, *args
+    callbacks[type].each do |block|
+      block.call(*args)
+    end
+  end
+end
+
+# Class to handle IRC stream and emit events
+class Stream
+  include Emitter
+  attr_accessor :io, :buf
+
+  def initialize serv
+    @buf = []
+    Timeout.timeout(5) { @io  = TCPSocket.new serv, 6667 }
+  rescue SocketError => e
+    puts_abort "Failed to connect to #{serv}! #{e.message}"
+  rescue Timeout::Error
+    puts_abort "Connection to #{serv} timed out!"
+  end
+
+  def disconnect
+    @io.puts 'QUIT'
+  end
+
+  def << data
+    @buf << data
+  end
+
+  def write
+    @buf.each do |x|
+      @io.puts x
+      emit :WROTE, x
+    end
+    @buf = []
+  rescue EOFError, Errno::ECONNRESET
+    emit :CLOSED
+  end
+
+  def read
+    read = @io.gets_nonblock
+    emit :READ, read
+  rescue IO::WaitReadable
+    emit :WAITING
+  rescue EOFError, Errno::ECONNRESET
+    emit :CLOSED
+  end
+end
+
+# Class to handle IRC stream
+class Bot
+  attr_reader :stream
+
+  def initialize stream
+    @stream = stream
+    stream.on :CLOSED do stop; end
+  end
+
+  def start
+    @running = true
+    tick while @running
+  end
+
+  def stop
+    @running = false
+  end
+
+  def tick
+    stream.read
+    stream.write
+  end
+end
+
+# Get relative size from bytes
+def bytes_to_closest bytes
+  fsize_arr = [ 'B', 'KB', 'MB', 'GB', 'TB' ]
+  exp = (Math.log(bytes) / Math.log(1024)).to_i
+  exp = fsize_arr.length if exp > fsize_arr.length
+  bytes /= 1024.0 ** exp
+  return "#{bytes.round(2)}#{fsize_arr[exp]}"
+end
+
+# Loop until there is no file with the same name
+def safe_fname fname
+  return fname unless File.exists? fname
+
+  ext = File.extname fname
+  base = File.basename fname, ext
+  dir = File.dirname fname
+
+  cur = 2
+  while true
+    test = "#{dir}/#{base} (#{cur})#{ext}"
+    return test unless File.exists? test
+    cur += 1
+  end
+end
+
+# Get a close relative time remaining, in words
+def time_distance t
+  if t < 60
+    case t
+    when 0      then "- nevermind, done!"
+    when 1..4   then "in a moment!"
+    when 5..9   then "less than 10 seconds"
+    when 10..19 then "less than 20 seconds"
+    when 20..39 then "half a minute"
+    else "less than a minute"
+    end
+  else # Use minutes, to aovid big numbers
+    t = t / 60.0
+    case t.to_i
+    when 1           then "about a minute"
+    when 2..45       then "#{t.round} minutes"
+    when 45..90      then "about an hour"
+    when 91..1440    then "about #{(t / 60.0).round} hours"
+    when 1441..2520  then "about a day"
+    when 2521..86400 then "about #{(t / 1440.0).round} days"
+    else "about #{(t/ 43200.0).round} months"
+    end
+  end
+end
+
+# Get elapsed time in words
+def time_elapsed t
+  return "instantly!" if t <= 0
+
+  # Get the GMTime from seconds and split
+  ta = Time.at(t).gmtime.strftime('%S|%M|%H|%-d|%-m|%Y').split('|', 6).collect { |i| i.to_i }
+  ta[-1] -= 1970 # fuck the police
+  ta[-2] -= 1 # fuck, fuck
+  ta[-3] -= 1 # fuck the police
+
+  # Remove the 0 digets
+  i = 0
+  ta.reverse.each do |x|
+    break if x != 0
+    i += 1
+  end
+
+  # Unit suffixes
+  suffix     = [ "seconds", "minutes", "hours", "days", "months", "years" ]
+  # Don't use plural if x is 1
+  plural     = ->(x, y) { x == 1 ? y[0..-2] : y }
+  # Format string to "value unit"
+  format_str = ->(x) { "#{ta[x]} #{plural[ta[x], suffix[x]]}, " }
+
+  # Form the string
+  ta = ta.take(ta.length - i)
+  str = ""
+  (ta.length - 1).downto(0) { |x| str += format_str[x] }
+  "in #{str[0..-3]}"
+end
+
+# DCC download handler
+def dcc_download ip, port, fname, fsize, read = 0
+  sock = nil
+  begin
+    Timeout.timeout(5) { sock = TCPSocket.new ip, port }
+  rescue Timeout::Error
+    puts_abort "Connection to #{ip} timed out!"
+  end
+  puts_abort "Failed to connect to \"#{ip}:#{port}\": #{e}" if sock.nil?
+
+  fsize_clean = bytes_to_closest fsize
+  avgs, last_check, start_time = [], Time.now - 2, Time.now
+  fh = File.open fname, (read == 0 ? "w" : "a") # Write or append
+
+  # Form the status bar
+  print_bar = ->() {
+    print "\r\e[0K> [ \e[1;37m"
+    pc   = read.to_f / fsize.to_f * 100.0
+    bars = (pc / 10).to_i
+    bars.times { print "#" }
+    (10 - bars).times { print " " }
+    avg = avgs.average * 1024.0
+    time_rem = time_distance ((fsize - read) / avg) * 8.0
+    print "\e[0m ] #{pc.round(2)}% #{bytes_to_closest read}/#{fsize_clean} \e[1;37m@\e[0m #{bytes_to_closest avg}/s \e[1;37min\e[0m #{time_rem}"
+
+    last_check = Time.now
+    avgs.clear
+  }
+
+  while buf = sock.readpartial(8192)
+    read += buf.bytesize
+    avgs << buf.bytesize
+    print_bar[] if (Time.now - last_check) > 1 and not avgs.empty?
+
+    begin
+      sock.write_nonblock [read].pack('N')
+    rescue Errno::EWOULDBLOCK
+    rescue Errno::EAGAIN => e
+      puts_error "#{File.basename fname} timed out! #{e}"
+    end
+
+    fh << buf
+    break if read >= fsize
+  end
+  print_bar.call unless avgs.empty?
+  elapsed_time = time_elapsed (Time.now - start_time).to_i
+
+  sock.close
+  fh.close
+
+  puts "\n! \e[1;32mSUCCESS\e[0m: downloaded #{File.basename fname} #{elapsed_time}"
+rescue EOFError, SocketError => e
+  puts "\n! ERROR: #{File.basename fname} failed to download! #{e}"
+end
+
+if __FILE__ == $0 then
+  opts = Slop.parse do |o|
+    o.banner = " Usage: #{$0} [options] [value] [links] [--files] [file1:file2:file3]\n"
+    o.bool '-h', '--help', 'Prints help'
+
+    o.on '-v', '--version', 'Print version' do
+      puts "#{$0}: v#{$ver_str}"
+      exit
+    end
+
+    o.string '--config',         'Config file location'
+    o.string '--user',           'IRC \'USER\' for Ident'
+    o.string '--nick',           'IRC nick'
+    o.string '--pass',           'IRC \'PASS\' for Ident'
+    o.string '--realname',       'Realname for \'USER\' Ident'
+    o.string '--nickserv',       'Password for Nickserv'
+    o.array  '--files',          'Pass list of files to parse for links', as: Array, delimiter: ':'
+    o.string '--out-dir',        'Output directory to save fiels to', :default => "./"
+    o.bool   '--skip-existing',  'Don\' download files that already exist'
+    o.bool   '--allow-queueing', 'Wait for pack to start downloading rather than fail immediately when queued'
+    o.int    '--sleep-interval', 'Time in seconds to sleep before requesting next pack. Zero for no sleep.'
+  end
+
+  if opts.help?
+    puts opts
+    puts "\n Examples"
+    puts " \txget.rb --config config.conf --nick test"
+    puts " \txget.rb --files test1.txt:test2.txt:test3.txt"
+    puts " \txget.rb #news@irc.rizon.net/ginpachi-sensei/1"
+    puts " \txget.rb #news@irc.rizon.net/ginpachi-sensei/41..46"
+    puts " \txget.rb #news@irc.rizon.net/ginpachi-sensei/41..46|2"
+    puts " \txget.rb #news@irc.rizon.net/ginpachi-sensei/41..46&49..52|2&30"
+    exit
+  end
+
+  # Get the config location
+  config_loc  = opts["config"]
+  config_loc  = File.expand_path config_loc unless config_loc.nil?
+  if config_loc.nil? or not File.exists? config_loc
+    config_loc = File.expand_path "~/.xget.conf"
+    config_loc = ".xget.conf" unless File.exists? config_loc
+
+    unless File.exists? config_loc
+      puts "ERROR! Invalid config path '#{config_loc}''. Exiting!"
+      exit
+    end
+  end
+
+  # Insert config settings from arguments into config hash
+  cur_block = "*"
+  config["servers"][cur_block] = {}
+  %w(user nick pass real nserv).each do |x|
+    config["servers"][cur_block][x.to_sym] = opts[x] unless opts[x].nil?
+  end
+
+  # Check if specified output directory actually exists
+  puts_abort "Out directory, \"#{opts["out-dir"]}\" doesn't exist!" unless Dir.exists? opts["out-dir"]
+  config["out-dir"] = opts["out-dir"].dup
+  config["out-dir"] << "/" unless config["out-dir"][-1] == "/"
+
+  # Parse config
+  config_copies = {}
+  File.open(config_loc, "r").each_line do |line|
+    next if line.length <= 1 or line[0] == '#'
+
+    if line =~ /^\[(\S+)\]$/ # Check if header
+      cur_block = $1
+      if cur_block.include? ',' # Check if header contains more than one server
+        tmp_split = cur_block.split(",")
+        next unless tmp_split[0] =~ /^(\w+?).(\w+?).(\w+?)$/
+        config_copies[tmp_split[0]] = []
+        tmp_split.each do |x| # Add all copies to copies hash
+          next if x == tmp_split[0] or not x =~ /^(\w+?).(\w+?).(\w+?)$/
+          config_copies[tmp_split[0]].push x unless config_copies[tmp_split[0]].include? x
+        end
+        cur_block = tmp_split[0]
+      end
+
+      # Set current block to the new header
+      config["servers"][cur_block] = {} unless config["servers"].has_key? cur_block
+    elsif line =~ /^(\S+)=(.*+?)$/
+      # Check if current line is specifying out directory
+      case $1
+      when "out-dir"
+        t_out_dir = File.expand_path $2
+        puts_abort "Out directory, \"#{t_out_dir}\" doesn't exist!" unless Dir.exists? t_out_dir
+        config[$1] = t_out_dir
+        config[$1] << "/" unless config[$1][-1] == "/"
+        next
+      when "sleep-interval" then config[$1] = $2.to_i
+      when "skip-existing"  then config[$1] = ($2 == "true")
+      when "allow-queueing" then config[$1] = ($2 == "true")
+      else
+        # Add value to current header, default is *
+        t_sym = $1.downcase.to_sym
+        config["servers"][cur_block][t_sym] = $2 unless config["servers"][cur_block].has_key? t_sym
+      end
+    end
+  end
+
+  # Go through each and make copies of the original
+  unless config_copies.empty?
+    config_copies.each do |k,v|
+      v.each { |x| config["servers"][x] = config["servers"][k] }
+    end
+  end
+
+  # Set the set the command line config options if specified
+  config["skip-existing"] = opts["skip-existing"] if opts["skip-existing"]
+  config["allow-queueing"] = opts["allow-queueing"] if opts["allow-queueing"]
+  config["sleep-interval"] = opts["sleep-interval"] unless opts["sleep-interval"].nil?
+
+  # Take remaining arguments and all lines from --files arg and put into array
+  to_check = ($*)
+  if opts['files'] != nil and not opts['files'].empty?
+    opts['files'].each do |x|
+      File.open(x, "r").each_line { |y| to_check << y.chomp } if File.exists? x
+    end
+  end
+
+  if to_check.empty?
+    puts opts
+    abort "\n No jobs, nothing to do!"
+  end
+
+  # Parse to_check array for valid XDCC links, irc.serv.org/#chan/bot/pack
+  tmp_requests = []
+  to_check.each do |x|
+    if x =~ /^(#\S+)@(irc.\w+.\w+{2,3})\/(\S+)\/([\.&\|\d]+)$/
+      chan  = $1
+      serv  = $2
+      bot   = $3
+      info  = config["servers"].has_key?(serv) ? serv : "*"
+      $4.split('&').each do |y|
+        if y =~ /^(\d+)(\.\.\d+(\|\d+)?)?$/
+          pack = $1.to_i
+          if $2.nil?
+            tmp_requests.push XDCC_REQ.new serv, chan, bot, pack, info
+          else
+            step  = $3.nil? ? 1 : $3[1..-1].to_i
+            range = $2[2..-1].to_i
+
+            puts_abort "Invalid range #{pack} to #{range} in \"#{x}\"" if pack > range or pack == range
+
+            (pack..range).step(step).each do |z|
+              tmp_requests.push XDCC_REQ.new serv, chan, bot, z, info
+            end
+          end
+        end
+      end
+    else
+      puts_abort "#{x} is not a valid XDCC address\n XDCC Address format: #chan@irc.serv.com/bot/pack(s)"
+    end
+  end
+
+  # Remove duplicate entries from requests
+  i = j = 0
+  to_pop = []
+  tmp_requests.each do |x|
+    tmp_requests.each do |y|
+      to_pop << j if x.eql? y if i != j
+      j += 1
+    end
+    i += 1
+  end
+  to_pop.each { |x| tmp_requests.delete_at(x) }
+
+  # Sort requests array to hash, serv {} -> chan {} -> requests []
+  requests = {}
+  tmp_requests.each do |x|
+    requests[x.serv] = [] unless requests.has_key? x.serv
+    requests[x.serv] << x
+  end
+
+  if requests.empty?
+    puts opts
+    abort "\n No jobs, nothing to do!"
+  end
+
+  # Sort requests by pack
+  requests.each do |k,v|
+    puts "#{k} \e[1;37m->\e[0m"
+    v.sort_by { |x| [x.chan, x.bot, x.pack] }.each { |x| puts "  #{x}" }
+  end
+  puts
+
+  # H-h-here we g-go...
+  requests.each do |k, v|
+    req, info = v[0], config["servers"][v[0].info]
+    last_chan, cur_req, motd                  = "", -1, false
+    nick_sent, nick_check, nick_valid         = false, false, false
+    xdcc_sent, xdcc_accepted, xdcc_queued     = false, false, false
+    xdcc_accept_time, xdcc_ret, req_send_time = nil, nil, nil
+
+    stream  = Stream.new req.serv
+    bot     = Bot.new stream
+    stream << "NICK #{info[:nick]}"
+    stream << "USER #{info[:user]} 0 * #{info[:real]}"
+    stream << "PASS #{info[:pass]}" unless info[:pass].nil?
+
+    # Handle read data
+    stream.on :READ do |data|
+      /^(?:[:](?<prefix>\S+) )?(?<type>\S+)(?: (?!:)(?<dest>.+?))?(?: [:](?<msg>.+))?$/ =~ data
+      #puts "\e[1;37m>>\e[0m #{prefix} | #{type} | #{dest} | #{msg}"
+
+      case type
+      when 'NOTICE'
+        if dest == 'AUTH'
+          if msg =~ /erroneous nickname/i
+            puts_error 'Login failed'
+            stream.disconnect
+          end
+          #puts "> \e[1;32m#{msg}\e[0m"
+        else
+          if prefix =~ /^NickServ!/
+            if not nick_sent and info[:nserv] != nil
+              stream << "PRIVMSG NickServ :IDENTIFY #{info[:nserv]}"
+              nick_sent = true
+            elsif nick_sent and not nick_check
+              case msg
+              when /password incorrect/i
+                nick_valid = false
+                nick_check = true
+              when /password accepted/i
+                nick_valid = true
+                nick_check = true
+              end
+            end
+            #puts "> \e[1;33m#{msg}\e[0m"
+          elsif prefix =~ /^#{Regexp.escape req.bot}!(.*)$/i
+            case msg
+            when /already requested that pack/i, /closing connection/i, /you have a dcc pending/i
+              puts_error msg
+              stream << "PRIVMSG #{req.bot} :XDCC CANCEL"
+              stream << 'QUIT'
+            when /you can only have (\d+?) transfer at a time/i
+              if config["allow-queueing"]
+                puts "! #{prefix}: #{msg}"
+                puts_warning "Pack queued, waiting for transfer to start..."
+                xdcc_queued = true
+              else
+                puts_error msg
+                stream << "PRIVMSG #{req.bot} :XDCC CANCEL"
+                stream << 'QUIT'
+              end
+            else
+              puts "! #{prefix}: #{msg}"
+            end
+          end
+        end
+      when 'PRIVMSG'
+        if xdcc_sent and not xdcc_accepted and prefix =~ /#{Regexp.escape req.bot}!(.*)$/i
+          /^\001DCC SEND (?<fname>((".*?").*?|(\S+))) (?<ip>\d+) (?<port>\d+) (?<fsize>\d+)\001\015$/ =~ msg
+          unless $~.nil?
+            req_send_time = nil
+
+            tmp_fname = fname
+            fname     = $1 if tmp_fname =~ /^"(.*)"$/
+            puts "Preparing to download: \e[36m#{fname}\e[0m"
+            fname     = (config["out-dir"].dup << fname)
+            xdcc_ret  = XDCC_SEND.new fname, fsize.to_i, [ip.to_i].pack('N').unpack('C4') * '.', port.to_i
+
+            # Check if the for unfinished download amd try to resume
+            if File.exists? xdcc_ret.fname and File.stat(xdcc_ret.fname).size < xdcc_ret.fsize
+              stream << "PRIVMSG #{req.bot} :\001DCC RESUME #{tmp_fname} #{xdcc_ret.port} #{File.stat(xdcc_ret.fname).size}\001"
+              xdcc_accepted = true
+              print "! Incomplete file detected. Attempting to resume..."
+              next # Skip and wait for "DCC ACCEPT"
+            elsif File.exists? xdcc_ret.fname
+              if config["skip-existing"]
+                puts_warning "File already exists, skipping..."
+                stream << "PRIVMSG #{req.bot} :XDCC CANCEL"
+
+                xdcc_sent, xdcc_accepted, xdcc_queued = false, false, false
+                xdcc_accept_time, xdcc_ret = nil, nil
+                next
+              else
+                puts_warnings "File already existing, using a safe name..."
+                xdcc_ret.fname = safe_fname xdcc_ret.fname
+              end
+            end
+
+            # It's a new download, start from beginning
+            Thread.new do
+              pid = fork do
+                puts "Connecting to: #{req.bot} @ #{xdcc_ret.ip}:#{xdcc_ret.port}"
+                dcc_download xdcc_ret.ip, xdcc_ret.port, xdcc_ret.fname, xdcc_ret.fsize
+              end
+
+              Process.wait pid
+              xdcc_sent, xdcc_accepted, xdcc_queued = false, false, false
+              xdcc_accept_time, xdcc_ret = nil, nil
+            end
+          end
+        elsif xdcc_accepted and xdcc_ret != nil and msg =~ /^\001DCC ACCEPT ((".*?").*?|(\S+)) (\d+) (\d+)\001\015$/
+          # DCC RESUME request accepted, continue the download!
+          xdcc_accept_time = nil
+          xdcc_accepted    = false
+          puts "\e[1;32mSUCCESS\e[0m!"
+
+          Thread.new do
+            pid = fork do
+              puts "Connecting to: #{req.bot} @ #{xdcc_ret.ip}:#{xdcc_ret.port}"
+              dcc_download xdcc_ret.ip, xdcc_ret.port, xdcc_ret.fname, xdcc_ret.fsize, File.stat(xdcc_ret.fname).size
+            end
+
+            Process.wait pid
+            xdcc_sent, xdcc_accepted, xdcc_queued = false, false, false
+            xdcc_accept_time, xdcc_ret            = nil, nil
+          end
+        end
+      when /^\d+?$/
+        type_i = type.to_i
+        case type_i
+        # when 1 # Print welcome message, because it's nice
+        #   msg.sub!(/#{Regexp.escape info[:nick]}/, "\e[34m#{info[:nick]}\e[0m")
+        #   puts "! #{msg}"
+        when 400..533 # Handle errors, except a few
+          next if [439, 462, 477].include? type_i
+          puts_error "#{msg}"
+          stream.disconnect
+        when 376 then motd = true # Mark the end of the MOTD
+        end
+      when 'PING'  then stream << "PONG :#{msg}"
+      when 'ERROR' then (msg =~ /closing link/i ? puts(msg) : puts_error(msg))
+      end
+    end
+
+    # Handle things while waiting for data
+    stream.on :WAITING do
+      unless xdcc_accepted
+        if motd and not xdcc_sent
+          cur_req += 1
+          if cur_req >= v.length
+            stream.disconnect
+            next
+          end
+          req = v[cur_req]
+
+          if req.chan != last_chan
+            stream   << "PART #{last_chan}" unless last_chan == ""
+            last_chan = req.chan
+            stream   << "JOIN #{req.chan}"
+          end
+
+          # Cooldown between downloads
+          if cur_req > 0
+            puts "Sleeping for #{config["sleep-interval"]} seconds before requesting the next pack"
+            sleep(config["sleep-interval"])
+          end
+
+          stream << "PRIVMSG #{req.bot} :XDCC SEND #{req.pack}"
+          req_send_time = Time.now
+          xdcc_sent     = true
+        end
+
+        # Wait 3 seconds for DCC SEND response, if there isn't one, abort
+        if xdcc_sent and not req_send_time.nil? and not xdcc_accepted
+          if config["allow-queueing"] and xdcc_queued
+            next
+          end
+          if (Time.now - req_send_time).floor > 10
+            puts_error "#{req.bot} took too long to respond, are you sure it's a bot?"
+            stream.disconnect
+            bot.stop
+          end
+        end
+
+        # Wait 3 seconds for a DCC ACCEPT response, if there isn't one, don't resume
+        if xdcc_sent and xdcc_accepted and not xdcc_accept_time.nil?
+          if (Time.now - xdcc_accept_time).floor > 10
+            puts "FAILED! Bot client doesn't support resume!"
+            puts "Connecting to: #{req.bot} @ #{xdcc_ret.ip}:#{xdcc_ret.port}"
+            dcc_download xdcc_ret.ip, xdcc_ret.port, xdcc_ret.fname, xdcc_ret.fsize
+          end
+        end
+      end
+    end
+
+    # Print sent data, for debugging only really
+    stream.on :WROTE do |data|
+      #puts "\e[1;37m<<\e[0m #{data}"
+    end
+
+    # Start the bot
+    bot.start
+  end
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: xget
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.1.1
 platform: ruby
 authors:
 - George Watson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies: []
-description: 
+description: XDCC Download Client
 email: gigolo@hotmail.co.uk
 executables:
 - xget
@@ -18,9 +18,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/xget
-homepage: http://rubygems.org/gems/xget
+- xget.rb
+homepage: http://rubygems.org/gems/hola
 licenses:
-- BSD-3-Clause
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -41,5 +42,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: XDCC CLI download client
+summary: XDCC Download Client
 test_files: []