gamespy_query 0.1.2 → 0.1.3

data/lib/gamespy_query/master.rb

@@ -34,24 +34,35 @@ module GamespyQuery
       self.to_hash(self.read)
     end
 
-    def get_server_list list = nil
+    def get_params
+      PARAMS.clone.map{|e| "#{DELIMIT}#{e}"}.join("")
+    end
+
+    def get_server_list list = nil, include_data = false, geo = nil
       addrs = []
-      list = %x[gslist -n #{@game}] if list.nil?
-      list.split("\n").each do |line|
-        addrs << "#{$1}:#{$2}" if line =~ RX_ADDR_LINE
+      list = %x[gslist -p "#{geoip_path}"#{" #{geo}-X #{get_params}" if include_data} -n #{@game}] if list.nil?
+      if include_data
+        addrs = handle_data(list, geo)
+      else
+        list.split("\n").each do |line|
+          addrs << "#{$1}:#{$2}" if line =~ RX_ADDR_LINE
+        end
       end
       addrs
     end
 
     def read
       geo = @geo ? @geo : "-Q 11 "
-      unless File.exists?(File.join(geoip_path, "GeoIP.dat"))
+      unless geo.nil? || geo.empty? || File.exists?(File.join(geoip_path, "GeoIP.dat"))
         Tools.logger.warn "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")
+      get_server_list(nil, true, geo)
+    end
+
+    def handle_data(reply, geo = nil)
+      reply = reply.gsub("\\\\\\", "") if geo
+      reply.split("\n").select{|line| line =~ RX_ADDR_LINE }
     end
 
     RX_H = /\A([\.0-9]*):([0-9]*) *\\(.*)/
@@ -87,3 +98,9 @@ module GamespyQuery
     end
   end
 end
+
+if $0 == __FILE__
+  master = GamespyQuery::Master.new
+  r = master.read
+  puts r
+end

data/lib/gamespy_query/version.rb

@@ -1,3 +1,3 @@
 module GamespyQuery
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gamespy_query
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors: