gamespy_query 0.2.0pre17 → 0.2.0pre18

data/lib/gamespy_query/master.rb

@@ -34,8 +34,8 @@ module GamespyQuery
     # Initializes the instance
     # @param [String] geo Geo string
     # @param [String] game Game string
-    def initialize(geo = nil, game = "arma2oapc", geoip_path = nil)
-      @geo, @game, @geoip_path = geo, game, geoip_path
+    def initialize(geo = nil, game = "arma2oapc", geoip_path = nil, filter = nil)
+      @geo, @game, @geoip_path, @filter = geo, game, geoip_path, filter
     end
 
     # Convert the master browser data to hash
@@ -45,16 +45,16 @@ module GamespyQuery
 
     # Gets list of PARAMS, delimited by {DELIMIT}
     def get_params
-      PARAMS.map{|e| "#{DELIMIT}#{e}"}.join("")
+      PARAMS.clone.map{|e| "#{DELIMIT}#{e}"}.join("")
     end
 
     # Gets list of server addressses and optionally data
     # @param [String] list Specify list or nil to fetch the list
     # @param [Boolean] include_data Should server info data from the master browser be included
     # @param [String] geo Geo String
-    def get_server_list list = nil, include_data = false, geo = nil
+    def get_server_list list = nil, include_data = false, geo = nil, filter = nil
       addrs = []
-      list = %x[gslist -C -p "#{geoip_path}"#{" #{geo}-X #{get_params}" if include_data} -n #{@game}] if list.nil?
+      list = %x[gslist -C -p "#{geoip_path}"#{" #{geo}-X #{get_params}" if include_data} -n #{@game}#{" -f \"#{filter}\"" if filter}] if list.nil?
       if include_data
         addrs = handle_data(list, geo)
       else
@@ -72,7 +72,7 @@ module GamespyQuery
         Tools.logger.warn "Warning: GeoIP.dat database missing. Can't parse countries. #{geoip_path}"
         geo = nil
       end
-      get_server_list(nil, true, geo)
+      get_server_list(nil, true, geo, @filter)
     end
 
     # Handle reply data from gamespy master browser

data/lib/gamespy_query/options.rb

@@ -86,6 +86,7 @@ module GamespyQuery
 
           option :g, :game, 'Specify game', :argument => :required
           option nil, :geo, 'Specify geo', :argument => :required
+          option :f, :filter, 'Specify filter', :argument => :required
 
           subcommand Cri::Command.new_basic_help
 
@@ -128,7 +129,7 @@ module GamespyQuery
 
           run do |opts, args, cmd|
             opts = GamespyQuery::Options.setup_master_opts opts
-            process = GamespyQuery::SocketMaster.process_master(opts[:game], opts[:geo], nil, false, true, true)
+            process = GamespyQuery::SocketMaster.process_master(opts[:game], opts[:geo], nil, false, true, true, opts[:filter])
             puts process.size
             #puts process
           end

data/lib/gamespy_query/socket_master.rb

@@ -111,7 +111,7 @@ module GamespyQuery
       # @param [String] game Game to fetch info from
       # @param [String] geo Geo location enabled?
       # @param [Array] remote Hostname and path+filename strings if the list needs to be fetched from http server
-      def process_master(game = "arma2oapc", geo = nil, remote = nil, dedicated_only = false, sm_dedicated_only = true, info = false)
+      def process_master(game = "arma2oapc", geo = nil, remote = nil, dedicated_only = false, sm_dedicated_only = true, info = false, filter = nil)
         master = GamespyQuery::Master.new(geo, game)
         list = if remote
                  Net::HTTP.start(remote[0]) do |http|
@@ -119,7 +119,7 @@ module GamespyQuery
                    resp.body.split("\n")
                  end
                else
-                 master.get_server_list(nil, true, geo)
+                 master.get_server_list(nil, true, geo, filter)
                end
 
         dat = master.process list

data/lib/gamespy_query/version.rb

@@ -1,4 +1,4 @@
 module GamespyQuery
   # Version of the library
-  VERSION = "0.2.0pre17"
+  VERSION = "0.2.0pre18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gamespy_query
 version: !ruby/object:Gem::Version
-  version: 0.2.0pre17
+  version: 0.2.0pre18
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri