six-updater-web 0.13.6 → 0.14.1

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.13.6'
+  s.version = '0.14.1'
   s.has_rdoc = false
   #s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six-updater-web/app/controllers/logviews_controller.rb

@@ -10,38 +10,35 @@ class LogviewsController < ApplicationController
   end
 
   def upd
-    a = false
-    session[:logentry] = 0 if session[:logentry]
-
-
-    cached = Rails.cache.read('logs_last')
-    s = 0
-    if cached
-      s = cached.to_i
-    else
-      #begin
-        s = Log.find(:last)
-        if s
-          s = s.id
-        end
-      #rescue
-      #end
-      Rails.cache.write('logs_last', s)
-    end
-
-    logger.info "cached/new entry #{s}"
+    s = Log.find(:last, :select => "id")
+    s = s.id if s
+    logger.debug "Latest entry: #{s}"
+
+    #session[:logentry] = 0 unless session[:logentry]
+    # Cache'll loop :D
+#    cached = Rails.cache.read('logs_last')
+#    if cached
+#      s = cached.to_i
+#      logger.debug "cached entry #{s}"
+#    else
+#      Rails.cache.write('logs_last', s)
+#    end
 
+    a = false
     if session[:logentry]
-      logger.info "session entry #{session[:logentry]}"
-      if s != session[:logentry]
+      logger.debug "Session entry #{session[:logentry]}"
+      if s != session[:logentry]            
         session[:logentry] = s
+        logger.debug "New session entry #{session[:logentry]}"
         a = true
       end
     else
       session[:logentry] = s
+      logger.debug "New session entry #{session[:logentry]}"
       a = true
     end
 
+    # TODO: Only refresh activescaffold instead?
     render :nothing => true unless a
   end
 

data/lib/six-updater-web/app/controllers/main_controller.rb

@@ -19,7 +19,8 @@ class MainController < ApplicationController
     if ok
       @msg << "Auto Synchronize: " + begin
         @system_setting.sync
-      rescue
+      rescue => e
+        logger.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
         "FAILURE: #{$!}"
       end + "<br />"
     end

data/lib/six-updater-web/app/models/mod.rb

@@ -108,7 +108,7 @@ class Mod < ActiveRecord::Base
           m = Mod.new :name => dir
           m.save
         end
-        logger.info "#{m.inspect}"
+        logger.debug "#{m.inspect}"
       end
     end
   end

data/lib/six-updater-web/app/models/queryserver.rb

@@ -62,6 +62,7 @@ class Queryserver < ActiveRecord::Base
   end
 
   def convert(data)
+    r = Hash.new
     data.each_pair do |k, v|
       if !k.is_a? String
         logger.info "Key that is no string: #{k} #{v}!"
@@ -71,10 +72,15 @@ class Queryserver < ActiveRecord::Base
           logger.info "Key that is empty: #{k} #{v}!"
           next
         end
-        self[k] = v if FIELDS.include?(k.to_sym)
-        self[k] = v.split(";").reject{|e| e.empty?} if FIELDS2.include?(k.to_sym)
+        if FIELDS.include?(k.to_sym)
+          r[k] = v
+        end
+        if FIELDS2.include?(k.to_sym)
+          r[k] = v.split(";").reject{|e| e.empty?} 
+        end
       end
     end
+    r
   end
 
 
@@ -137,31 +143,21 @@ class Queryserver < ActiveRecord::Base
   end
 
   def self.import(e)
+    return nil unless e[:gamedata]
     s = self.find_by_ip_and_port(e[:ip], e[:port])
-    if e[:gamedata]
-      unless s
-        s = self.new
-        s.ip = e[:ip]
-        s.port = e[:port]
-      end
-      #oldmod = s.mod ? s.mod.clone : nil
-      s.name = e[:gamedata]["hostname"].split(",").join(", ") if e[:gamedata]["hostname"]
-      #s.content = e[:gamedata]
-      s.convert(e[:gamedata])
-
-      if s.mod
-        # TODO: Can't use the unless condition this until we can measure if there are any new Mod records too
-        s.mods = s.mods_fetch2 # unless s.mod == oldmod
-      end
-      s.save
-    else
-      if s
-        s.failures = 0 unless s.failures
-        s.failures += 1
-        s.save
-      end
-      # TODO: If more than 5 subsequent failures, only try em once an hour?
+    unless s
+      s = self.new(:ip => e[:ip], :port => e[:port])
+      #s.name = e[:gamedata]["hostname"].split(",").join(", ") if e[:gamedata]["hostname"]
+      # s.save # only when using 'update later'
     end
-    s
+    s.name = e[:gamedata]["hostname"].split(",").join(", ") if e[:gamedata]["hostname"]
+    r = s.convert(e[:gamedata])
+    s.attributes = r
+
+    if s.mod
+      # TODO: Can't use the unless condition this until we can measure if there are any new Mod records too
+      s.mods = s.mods_fetch2 # unless s.mod == oldmod
+    end
+    return [s, r]
   end
 end

data/lib/six-updater-web/app/models/system_setting.rb

@@ -42,8 +42,8 @@ class SystemSetting < ActiveRecord::Base
       end
     rescue Timeout::Error
       logger.info "TIMEOUT while trying to synchronize!"
-    rescue
-      logger.info "ERROR: #{$!}"
+    rescue => e
+      logger.info "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
     end
     l
   end

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

@@ -41,8 +41,8 @@ begin
     ENV["OS_VERSION"] = ENV["VERSION"]
     ENV["VERSION"] = nil
   end
-rescue
-  puts "ERROR: #{$!}"
+rescue => e
+  puts "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
 end
 
 ENV["RAILS_ENV"] = "production"

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

@@ -1,28 +1,28 @@
-# Settings specified here will take precedence over those in config/environment.rb
-
-# The production environment is meant for finished, "live" apps.
-# Code is not reloaded between requests
-config.cache_classes = true
-
-# Full error reports are disabled and caching is turned on
-config.action_controller.consider_all_requests_local = false
-config.action_controller.perform_caching             = true
-config.action_view.cache_template_loading            = true
-
-# See everything in the log (default is :info)
-# config.log_level = :debug
-
-# Use a different logger for distributed setups
-# config.logger = SyslogLogger.new
-
-# Use a different cache store in production
-# config.cache_store = :mem_cache_store
-
-# Enable serving of images, stylesheets, and javascripts from an asset server
-# config.action_controller.asset_host = "http://assets.example.com"
-
-# Disable delivery errors, bad email addresses will be ignored
-# config.action_mailer.raise_delivery_errors = false
-
-# Enable threaded mode
+# Settings specified here will take precedence over those in config/environment.rb
+
+# The production environment is meant for finished, "live" apps.
+# Code is not reloaded between requests
+config.cache_classes = true
+
+# Full error reports are disabled and caching is turned on
+config.action_controller.consider_all_requests_local = false
+config.action_controller.perform_caching             = true
+config.action_view.cache_template_loading            = true
+
+# See everything in the log (default is :info)
+# config.log_level = :debug
+
+# Use a different logger for distributed setups
+# config.logger = SyslogLogger.new
+
+# Use a different cache store in production
+# config.cache_store = :mem_cache_store
+
+# Enable serving of images, stylesheets, and javascripts from an asset server
+# config.action_controller.asset_host = "http://assets.example.com"
+
+# Disable delivery errors, bad email addresses will be ignored
+# config.action_mailer.raise_delivery_errors = false
+
+# Enable threaded mode
 # config.threadsafe!

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

@@ -19,7 +19,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.13.6"
+  VERSION = "0.14.1"
   COMPONENT = "six-updater-web"
 
   DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)
@@ -120,6 +120,11 @@ module SixUpdaterWeb
     ActiveRecord::Base.logger
   end
 
+  def stamp(time)
+    (Time.now - time).to_s[/(.*\..?.?.?)/]
+    $1
+  end
+
   def initialize(config)
     if defined?(OLDLOCATION)
       config.log_path = File.join(DATA_PATH, 'logs', 'six-updater-web.log')
@@ -154,8 +159,8 @@ module SixUpdaterWeb
             #begin
               shell = WIN32OLE.new('Shell.Application')
               shell.ShellExecute(file_to_use, arguments, directory, operation, show)
-            #rescue
-              #logger.warn "Unable to open browser: #{$!}"
+            #rescue => e
+              #logger.warn "Unable to open browser: ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
             #end
 =end
       end

data/lib/six-updater-web/lib/tasks/sync.rake

@@ -7,26 +7,74 @@ namespace :sync do
   task :gamespy => :environment do
     puts "Fetching server info..."
     geo = ENV['NOGEO'] ? "" : nil
+    #geo = ""
     puts "Pings and Countries: #{geo.nil?}"
-    puts
+    puts ""
 
     q = Six::Query::GamespyMaster.new(geo)
     h = q.process
 
-    puts
+    puts ""
     puts "Received #{h.size} servers"
 
-    puts
+    puts ""
     puts "Updating database..."
 
+    i, saved = 0, 0
+    ids = []
+    #hasj = Hash.new
+    timestart = Time.now
     h.each_pair do |key, e|
-      Queryserver.import(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
+    puts "Saved: #{saved}, Unchanged: #{h.keys.size - saved}. Took: #{SixUpdaterWeb::stamp(timestart)}s"
+
+=begin
+    timestart = Time.now
+    puts "Updating #{hasj.keys.size} records..."
+    begin
+      Queryserver.update(hasj.keys, hasj.values) unless hasj.keys.empty?
+    rescue => e
+      puts "#{e.class}: #{e.message} #{e.backtrace.join("\n")}"
+      sleep 3
+    ensure
+      puts "Took: #{SixUpdaterWeb::stamp(timestart)}s"
+    end
+=end
+
+    timestart = Time.now
+    puts "Tagging... #{ids.size} records"
+    begin
+      Queryserver.update_all("updated_at = '#{Time.now}'", ["id in (?)",ids]) unless ids.empty?
+    rescue => e
+      puts "#{e.class}: #{e.message} #{e.backtrace.join("\n")}"
+    ensure
+      puts "Took: #{SixUpdaterWeb::stamp(timestart)}s"
     end
 
     puts "Pruning database..."
+    timestart = Time.now
     Queryserver.prune
+    puts "Took: #{SixUpdaterWeb::stamp(timestart)}s"
+
     puts "Cleaning database..."
+    timestart = Time.now
     Queryserver.clean
+    puts "Took: #{SixUpdaterWeb::stamp(timestart)}s"
+    puts ""
+    puts "Done!"
+    sleep 3
   end
 
   task :system => :environment do

data/lib/six-updater-web/vendor/plugins/six-import/lib/six/import.rb

@@ -67,7 +67,7 @@ module Six
           end
 
           path = "/#{self.to_s.pluralize.downcase}/exp/1.json"
-          logger.info "Path: #{path}"
+          logger.debug "Path: #{path}"
           res = Six::Network::Panel.get(path)
           h = ActiveSupport::JSON.decode res.body
           k = []
@@ -96,11 +96,13 @@ module Six
             end
           end
           n = nil
+          previous = nil
           if h["id"]
             id = h["id"]
             h.delete "id"
-            r = self.find(:first, :conditions => "id = \"#{id}\"")
+            r = self.find(id)
             if r
+              previous = r.inspect
               r.attributes = h
               n = r
             else
@@ -110,7 +112,8 @@ module Six
           else
             n = self.new h
           end
-          n.save
+          logger.debug "#{n.class} #{n.id} #{n.changed?}: #{"#{n.inspect} - #{previous}" if n.changed?}"
+          n.save if n.changed?# || n.new?
           n
         end
 

data/lib/six-updater-web/vendor/plugins/six-network/lib/six/network.rb

@@ -58,10 +58,10 @@ module Six
         #  {'login[user]'=>'admin', 'login[password]'=>'admin', 'authenticity_token' => auth, 'commit'=>'Login'})
 
         # Output on the screen -> we should get either a 302 redirect (after a successful login) or an error page
-        logger.debug 'Code = ' + resp.code
-        logger.debug 'Message = ' + resp.message
+        #logger.debug 'Code = ' + resp.code
+        #logger.debug 'Message = ' + resp.message
       #  resp.each {|key, val| puts key + ' = ' + val}
-        logger.debug data
+        #logger.debug data
       end
 
       def Panel.get(path)

data/lib/six-updater-web/vendor/plugins/six-query/app/controllers/sixsense/auth_controller.rb

@@ -94,8 +94,8 @@ module Sixsense
         else
           logger.info "WARNING: Found goldberguser by cookie, but hash mismatch!"
         end
-      rescue
-        logger.info "WARNING: Something went wrong during login_goldberg: #{$!}"
+      rescue => e
+        logger.info "WARNING: Something went wrong during login_goldberg: ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
       end
     end
 
@@ -104,8 +104,8 @@ module Sixsense
       forumuser = nil
       begin
         forumuser = Remote::Vbulletin::User.find(cookies[:bbuserid])
-      rescue
-        logger.info "WARNING: Something went wrong during login_vb: #{$!}"
+      rescue => e
+        logger.info "WARNING: Something went wrong during login_vb: ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
       end
       return unless forumuser
       if forumuser.banned?
@@ -156,8 +156,8 @@ module Sixsense
               }
             end
           end
-        rescue
-          logger.info "WARNING: Something went wrong during save_vb_cookie: #{$!}"
+        rescue => e
+          logger.info "WARNING: Something went wrong during save_vb_cookie: ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
         end
       end
     end

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

@@ -4,15 +4,25 @@ module Six
       PARAMS = [:hostname, :gamever, :gametype, :gamemode, :numplayers, :maxplayers, :password, :equalModRequired, :mission, :mapname,
                 :mod, :signatures, :verifysignatures, :gamestate, :dedicated, :platform, :sv_battleeye, :language, :difficulty]
 
-      LINUX, WIN = "\\\\", "\\" # TODO: Autodetect?
-      GEOIP_PATH = File.join(RAILS_ROOT, "config")
+      DELIMIT = case RUBY_PLATFORM
+        when /-mingw32$/, /-mswin32$/
+          "\\"
+        else
+          "\\\\"
+      end
+      GEOIP_PATH = case RUBY_PLATFORM
+        when /-mingw32$/, /-mswin32$/
+          File.join(RAILS_ROOT, "config").gsub("/", "\\")
+        else
+          File.join(RAILS_ROOT, "config")
+      end
 
       def initialize(geo = nil)
-        @list = Hash.new
         @geo = geo
       end
 
       def process
+        @list = Hash.new
         self.to_hash(self.read)
       end
 
@@ -23,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.gsub("/", "\\")}" -n arma2pc #{geo}-X #{PARAMS.clone.map{|e| "#{WIN}#{e}"}.join("")}]
+        reply = %x[gslist -p "#{GEOIP_PATH}" -n arma2pc #{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
-  - 13
-  - 6
-  version: 0.13.6
+  - 14
+  - 1
+  version: 0.14.1
 platform: ruby
 authors: 
 - Sickboy