six-updater-web 0.23.3 → 0.23.4

data/Rakefile

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

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

@@ -91,7 +91,7 @@ class MainController < ApplicationController
         end
 
         if gslist_installed
-          @msg << "Updating Gamespy...This will take a while, please wait until done!"
+          @msg << "<b>A window should open displaying the gamespy progress</b>"
           if gs_geo
             @system_setting.update_gamespy #(true)
           else
@@ -112,12 +112,10 @@ class MainController < ApplicationController
 
       when "purge_gamespy"
         d = false
-        if params["really"]
-          if params["really"]["sure"] == "1"
-            Queryserver.purge
-            @msg << "Purged Gamespy..."
-            d = true
-          end
+        if params["really"] && params["really"]["sure"] == "1"
+          Queryserver.purge
+          @msg << "Purged Gamespy..."
+          d = true
         end
         @error << "<b>ERROR: Please confirm by checking the checkbox</b>" if !d
     end
@@ -207,12 +205,10 @@ class MainController < ApplicationController
       @system_setting.save
     end
 
-    if grab
-      if params["all"]
-        preset = Sixconfig.new
-        preset.name = "Dynamic"
-        preset.mods += Mod.find(:all)
-      end
+    if grab && params["all"]
+      preset = Sixconfig.new
+      preset.name = "Dynamic"
+      preset.mods += Mod.find(:all)
     end
 
     if preset

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

@@ -17,7 +17,7 @@ class Queryserver < ActiveRecord::Base
   end
 
   def export_to_preset
-    cfg = Sixconfig.new(:name => "CUST - #{self.name} clone", :mods => self.mods)
+    cfg = Sixconfig.new(:name => "CUST - #{self.name} clone", :mods => self.mods.reject {|e| e.new_record? })
     cfg.save
     cfg
   end

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

@@ -4,6 +4,8 @@ class Repository < ActiveRecord::Base
 
   attr_accessor :ping_value
 
+  PING_PACKET_SIZE = 1400
+
   def self.rank(pr = false)
     repos = self.find(:all)
     repos.each do |rep|
@@ -22,7 +24,7 @@ class Repository < ActiveRecord::Base
 
   def ping!
     logger.info "Handling #{self.address}"
-    out = %x[ping -n 10 #{self.address}]
+    out = %x[ping -n 10 -f -l #{PING_PACKET_SIZE} #{self.address}]
     vals = []
     out.each_line do |l|
       l[/=([0-9]*)ms/]
@@ -37,7 +39,7 @@ class Repository < ActiveRecord::Base
   end
 
   def ping
-    SixUpdaterWeb.run_program("ping", SixUpdaterWeb::BASE_PATH, "-r 9 -n 30 -t #{self.address}")
+    SixUpdaterWeb.run_program("ping", SixUpdaterWeb::BASE_PATH, "-f -l #{PING_PACKET_SIZE} -r 9 -n 30 -t #{self.address}")
   end
 
   def tracert

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

@@ -31,7 +31,7 @@ class Sixconfig < ActiveRecord::Base
     m.each {|mod| if (mod.new_record? && !mod.exists?(self.appsetting)); mod.disabled = true; end }
     ms = []
     m.each {|mod| ms += mod.all_dependentmods; ms << mod } 
-    ms.uniq
+    ms.uniq.reject{|e| e.class == Mod} # Shitty workaround for crap input (Wrong type mods...)
   end
 
   def exec

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

@@ -22,7 +22,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.23.3"
+  VERSION = "0.23.4"
   COMPONENT = "six-updater-web"
 
   DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 23
-  - 3
-  version: 0.23.3
+  - 4
+  version: 0.23.4
 platform: ruby
 authors: 
 - Sickboy