gamespy_query 0.0.5 → 0.1.0

data/lib/gamespy_query/base.rb

@@ -1,55 +1,87 @@
-#require 'six/tools'
-require 'action_controller'
-require 'logger'
-
-module GamespyQuery
-  STR_X0, STR_X1, STR_X2 = "\x00", "\x01", "\x02"
-  RX_X0, RX_X0_S, RX_X0_E = /\x00/, /^\x00/, /\x00$/
-  RX_X0_SPEC = /^\x00|[^\x00]+\x00?/
-  STR_EMPTY = ""
-
-  DEBUG = false
-
-  module Tools
-    STR_EMPTY = ""
-  
-    module_function
-    def logger
-      @logger ||= ActionController::Base.logger || Logger.new("logger.log")
-    end
-  
-    def debug(&block)
-      return unless DEBUG
-      logger.debug yield
-    rescue Exception => e
-      puts "Error: #{e.class} #{e.message}, #{e.backtrace.join("\n")}"
-    end
-  end
-  
-  class Base
-    class TimeOutError < StandardError
-    end
-
-    def strip_tags(str)
-      # TODO: Strip tags!!
-      str
-    end
-
-    RX_F = /\A\-?[0-9][0-9]*\.[0-9]*\Z/
-    RX_I = /\A\-?[0-9][0-9]*\Z/
-    RX_S = /\A\-?0[0-9]+.*\Z/
-
-    def clean(value) # TODO: Force String, Integer, Float etc?
-      case value
-        when STR_X0
-          nil
-        when RX_F
-          value =~ RX_S ? strip_tags(value) : value.to_f
-        when RX_I
-          value =~ RX_S ? strip_tags(value) : value.to_i
-        else
-          strip_tags(value)
-      end
-    end
-  end
-end
+#require 'six/tools'
+require 'action_controller'
+require 'logger'
+
+module GamespyQuery
+  STR_X0, STR_X1, STR_X2 = "\x00", "\x01", "\x02"
+  RX_X0, RX_X0_S, RX_X0_E = /\x00/, /^\x00/, /\x00$/
+  RX_X0_SPEC = /^\x00|[^\x00]+\x00?/
+  STR_EMPTY = ""
+
+  DEBUG = false
+
+  module Tools
+    STR_EMPTY = ""
+  
+    module_function
+    def logger
+      @logger ||= ActionController::Base.logger || Logger.new("logger.log")
+    end
+  
+    def debug(&block)
+      return unless DEBUG
+      logger.debug yield
+    rescue Exception => e
+      puts "Error: #{e.class} #{e.message}, #{e.backtrace.join("\n")}"
+    end
+  end
+
+  module Funcs
+    class TimeOutError < StandardError
+    end
+
+    def strip_tags(str)
+      # TODO: Strip tags!!
+      str
+    end
+
+    RX_F = /\A\-?[0-9][0-9]*\.[0-9]*\Z/
+    RX_I = /\A\-?[0-9][0-9]*\Z/
+    RX_S = /\A\-?0[0-9]+.*\Z/
+
+    def clean(value) # TODO: Force String, Integer, Float etc?
+      case value
+        when STR_X0
+          nil
+        when RX_F
+          value =~ RX_S ? strip_tags(value) : value.to_f
+        when RX_I
+          value =~ RX_S ? strip_tags(value) : value.to_i
+        else
+          strip_tags(value)
+      end
+    end
+
+    def handle_chr(number)
+      number = ((number % 256)+256) if number < 0
+      number = number % 256 if number > 255
+      number
+    end
+
+    def get_string(*params)
+      puts "Getting string #{params}"
+      _get_string(*params)
+    end
+
+    if RUBY_PLATFORM =~ /mswin32/
+      include System::Net
+      include System::Net::Sockets
+
+      def _get_string(str)
+        str.map {|e| e.chr}.join  #  begin; System::Text::Encoding.USASCII.GetString(reply[0]).to_s; rescue nil, Exception => e; Tools.log_exception(e); reply[0].map {|e| e.chr}.join; end
+      end
+    else
+      require 'socket'
+      require 'timeout'
+
+      def _get_string(str)
+        str
+      end
+    end
+  end
+
+
+  class Base
+    include Funcs
+  end
+end

data/lib/gamespy_query/master.rb

@@ -1,81 +1,90 @@
-require_relative 'base'
-
-module GamespyQuery
-  class Master < Base
-    PARAMS = [:hostname, :gamever, :gametype, :gamemode, :numplayers, :maxplayers, :password, :equalModRequired, :mission, :mapname,
-              :mod, :signatures, :verifysignatures, :gamestate, :dedicated, :platform, :sv_battleeye, :language, :difficulty]
-
-    # TODO: Gspy v3 multipacket
-
-    DELIMIT = case RUBY_PLATFORM
-      when /-mingw32$/, /-mswin32$/
-        "\\"
-      else
-        "\\\\"
-    end
-
-    def geoip_path
-      return File.join(Dir.pwd, "config") unless defined?(Rails)
-
-      case RUBY_PLATFORM
-      when /-mingw32$/, /-mswin32$/
-        File.join(Rails.root, "config").gsub("/", "\\")
-      else
-        File.join(Rails.root, "config")
-      end
-    end
-
-    def initialize(geo = nil, game = "arma2oapc")
-      @geo, @game = geo, game
-    end
-
-    def process
-      @list = Hash.new
-      self.to_hash(self.read)
-    end
-
-    def read
-      geo = @geo ? @geo : "-Q 11 "
-      unless File.exists?(File.join(geoip_path, "GeoIP.dat"))
-        puts
-        puts "Warning: GeoIP.dat database missing. Can't parse countries. #{geoip_path}"
-        geo = nil
-      end
-      reply = %x[gslist -p "#{geoip_path}" -n #{@game} #{geo}-X #{PARAMS.clone.map{|e| "#{DELIMIT}#{e}"}.join("")}]
-      reply.gsub!("\\\\\\", "") if geo
-      reply.split("\n")
-    end
-
-    RX_H = /\A([\.0-9]*):([0-9]*) *\\(.*)/
-    STR_SPLIT = "\\"
-    def to_hash(ar)
-      ar.each_with_index do |entry, index|
-        str = entry[RX_H]
-        next unless str
-        ip, port, content = $1, $2, $3
-        content = content.split(STR_SPLIT)
-        content << "" unless (content.size % 2 == 0)
-        i = 0
-        content.map! do |e|
-          i += 1
-          i % 2 == 0 ? e : clean(e)
-        end
-        addr = "#{ip}:#{port}"
-        if @list.has_key?(addr)
-          e = @list[addr]
-        else
-          e = Hash.new
-          e[:ip] = ip
-          e[:port] = port
-          @list[addr] = e
-        end
-        if e[:gamedata]
-          e[:gamedata].merge!(Hash[*content])
-        else
-          e[:gamedata] = Hash[*content]
-        end
-      end
-      @list
-    end
-  end
-end
+require_relative 'base'
+
+module GamespyQuery
+  class Master < Base
+    PARAMS = [:hostname, :gamever, :gametype, :gamemode, :numplayers, :maxplayers, :password, :equalModRequired, :mission, :mapname,
+              :mod, :signatures, :verifysignatures, :gamestate, :dedicated, :platform, :sv_battleeye, :language, :difficulty]
+
+    # TODO: Gspy v3 multipacket
+
+    DELIMIT = case RUBY_PLATFORM
+      when /-mingw32$/, /-mswin32$/
+        "\\"
+      else
+        "\\\\"
+    end
+
+    def geoip_path
+      return File.join(Dir.pwd, "config") unless defined?(Rails)
+
+      case RUBY_PLATFORM
+      when /-mingw32$/, /-mswin32$/
+        File.join(Rails.root, "config").gsub("/", "\\")
+      else
+        File.join(Rails.root, "config")
+      end
+    end
+
+    def initialize(geo = nil, game = "arma2oapc")
+      @geo, @game = geo, game
+    end
+
+    def process
+      @list = Hash.new
+      self.to_hash(self.read)
+    end
+
+    def get_server_list list = nil
+      addrs = []
+      list = %x[gslist -n #{@game}] if list.nil?
+      list.split("\n").each do |line|
+        addrs << "#{$1}:#{$2}" if line =~ /([\d\.]+)[\s\t]*(\d+)/
+      end
+      addrs
+    end
+
+    def read
+      geo = @geo ? @geo : "-Q 11 "
+      unless File.exists?(File.join(geoip_path, "GeoIP.dat"))
+        puts
+        puts "Warning: GeoIP.dat database missing. Can't parse countries. #{geoip_path}"
+        geo = nil
+      end
+      reply = %x[gslist -p "#{geoip_path}" -n #{@game} #{geo}-X #{PARAMS.clone.map{|e| "#{DELIMIT}#{e}"}.join("")}]
+      reply.gsub!("\\\\\\", "") if geo
+      reply.split("\n")
+    end
+
+    RX_H = /\A([\.0-9]*):([0-9]*) *\\(.*)/
+    STR_SPLIT = "\\"
+    def to_hash(ar)
+      ar.each_with_index do |entry, index|
+        str = entry[RX_H]
+        next unless str
+        ip, port, content = $1, $2, $3
+        content = content.split(STR_SPLIT)
+        content << "" unless (content.size % 2 == 0)
+        i = 0
+        content.map! do |e|
+          i += 1
+          i % 2 == 0 ? e : clean(e)
+        end
+        addr = "#{ip}:#{port}"
+        if @list.has_key?(addr)
+          e = @list[addr]
+        else
+          e = Hash.new
+          e[:ip] = ip
+          e[:port] = port
+          @list[addr] = e
+        end
+        if e[:gamedata]
+          e[:gamedata].merge!(Hash[*content])
+        else
+          e[:gamedata] = Hash[*content]
+        end
+      end
+      @list
+    end
+  end
+end