six-updater-web 0.17.7 → 0.18.0

data/lib/six-updater-web/config/six-updater-web.rb

@@ -22,7 +22,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.17.7"
+  VERSION = "0.18.0"
   COMPONENT = "six-updater-web"
 
   DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)
@@ -123,34 +123,35 @@ module SixUpdaterWeb
     puts "Pings and Countries: #{geo.nil?}"
     puts ""
 
-    q = Six::Query::GamespyMaster.new(geo)
-    h = q.process
-
-    puts ""
-    puts "Received #{h.size} servers"
-
-    puts ""
-    puts "Updating database..."
-
-    i, saved = 0, 0
-    ids = []
-    #hasj = Hash.new
-    timestart = Time.now
-    h.each_pair do |key, e|
-      i += 1
-      time = Time.now
-      r = Queryserver.import(e)
-      next unless r
-      if r[0].changed?
-        #hasj[r[0].id] = r[1]
-        saved += 1
-        r[0].save
-      else
-        ids << r[0].id
+    ["arma2oapc", "arma2pc"].each do |game|
+      q = Six::Query::GamespyMaster.new(geo, game)
+      h = q.process
+      puts ""
+      puts "Received #{h.size} servers"
+
+      puts ""
+      puts "Updating database..."
+
+      i, saved = 0, 0
+      ids = []
+      #hasj = Hash.new
+      timestart = Time.now
+      h.each_pair do |key, e|
+        i += 1
+        time = Time.now
+        r = Queryserver.import(e)
+        next unless r
+        if r[0].changed?
+          #hasj[r[0].id] = r[1]
+          saved += 1
+          r[0].save
+        else
+          ids << r[0].id
+        end
+        print "#{i} / #{h.keys.size}, took #{SixUpdaterWeb::stamp(time)}s\r"
       end
-      print "#{i} / #{h.keys.size}, took #{SixUpdaterWeb::stamp(time)}s\r"
+      puts "Saved: #{saved}, Unchanged: #{h.keys.size - saved}. Took: #{SixUpdaterWeb::stamp(timestart)}s"
     end
-    puts "Saved: #{saved}, Unchanged: #{h.keys.size - saved}. Took: #{SixUpdaterWeb::stamp(timestart)}s"
 
 =begin
     timestart = Time.now

data/lib/six-updater-web/vendor/plugins/six-query/lib/six/query/gamespy_master.rb

@@ -17,8 +17,8 @@ module Six
           File.join(RAILS_ROOT, "config")
       end
 
-      def initialize(geo = nil)
-        @geo = geo
+      def initialize(geo = nil, game = "arma2oapc")
+        @geo, @game = geo, game
       end
 
       def process
@@ -33,7 +33,7 @@ module Six
           puts "Warning: GeoIP.dat database missing. Can't parse countries. #{GEOIP_PATH}"
           geo = nil
         end
-        reply = %x[gslist -p "#{GEOIP_PATH}" -n arma2pc #{geo}-X #{PARAMS.clone.map{|e| "#{DELIMIT}#{e}"}.join("")}]
+        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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 17
-  - 7
-  version: 0.17.7
+  - 18
+  - 0
+  version: 0.18.0
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 +02:00
+date: 2010-07-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency