six-updater-web 0.23.2 → 0.23.3

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.23.2'
+  s.version = '0.23.3'
   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

@@ -354,6 +354,10 @@ class MainController < ApplicationController
         @msg << "Saved six-updater.yml!"
         @msg << "<b>A window should open displaying the update process progress</b>"
 
+      when "speedtest"
+        @system_setting.speedtest
+        @msg << "<b>A window should open displaying the speedtest progress</b>"          
+
       when "stop game"
         setting.kill!.each { |entry| @msg << "Process killed: #{entry}" }
         sleep 1

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

@@ -20,6 +20,8 @@ class Mod < ActiveRecord::Base
       mods += mod.all_dependentmods(mods)
       mods << mod
     end
+    mods -= [self]
+    mods += [self]
     mods.uniq
   end
 
@@ -73,14 +75,21 @@ class Mod < ActiveRecord::Base
     self.version_local && !self.version_local.empty?
   end
 
+  def my_path(setting)
+    return nil unless setting.real_modpath && self.real_name
+    File.join(self.real_path(setting), self.real_name).gsub("\\", "/")
+  end
+
   def exists?(setting)
-    return false unless setting.real_modpath && self.real_name
-    File.exists?(File.join(setting.real_modpath, self.real_name))
+    path = self.my_path(setting)
+    return false unless path
+    File.exists?(path)
   end
 
   def has_rsync?(setting)
-    return false unless setting.real_modpath && self.real_name
-    File.exists?(File.join(setting.real_modpath, self.real_name, ".rsync"))
+    path = self.my_path(setting)
+    return false unless path
+    File.exists?(File.join(path, ".rsync"))
   end
 
   def remote
@@ -94,20 +103,10 @@ class Mod < ActiveRecord::Base
   def read_version(path)
     return unless path && self.real_name
     cfg = File.join(path, self.real_name, '.rsync', '.repository.yml')
-    if File.exists?(cfg)
-      conf = YAML::load_file(cfg)
-      if conf
-        begin
-          conf[:version]
-        rescue
-          nil
-        end
-      else
-        nil
-      end
-    else
-      nil
-    end
+    return nil unless File.exists?(cfg)
+    conf = YAML::load_file(cfg)
+    return nil unless conf
+    begin; conf[:version]; rescue; nil; end
   end
 
   def update_version(path)
@@ -120,21 +119,20 @@ class Mod < ActiveRecord::Base
   end
 
   def real_path(appsetting)
-    if self.path
-      self.path
-    else
-      appsetting.real_modpath
-    end
+    self.path ? self.path : appsetting.real_modpath
   end
 
   def all_repositories
-    if self.networks.empty?
+    rep = if self.networks.empty?
       Repository.find(:all)
     else
       repos = []
       self.networks.each { |net| repos += net.repositories unless net.disabled }
       repos
     end
+    prio = nil
+    rep.each {|e| unless e.priority.nil?; prio = true; break; end }
+    prio ? rep.sort{|a, b| a.priority <=> b.priority} : rep.shuffle
   end
 
   def update_skip

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

@@ -12,7 +12,6 @@ class Queryserver < ActiveRecord::Base
   has_and_belongs_to_many :mods
   has_many :sixconfigs
 
-
   def export
 
   end

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

@@ -2,6 +2,40 @@ class Repository < ActiveRecord::Base
   belongs_to :network
   six_guid
 
+  attr_accessor :ping_value
+
+  def self.rank(pr = false)
+    repos = self.find(:all)
+    repos.each do |rep|
+      puts "Processing #{rep.url}" if pr
+      rep.ping_value = rep.ping!
+      sleep 1
+    end
+    repos.sort!{|a, b| a.ping_value <=> b.ping_value }
+    repos.each_with_index do |rep,index|
+      rep.priority = index
+      rep.save 
+    end
+    repos
+  end
+
+
+  def ping!
+    logger.info "Handling #{self.address}"
+    out = %x[ping -n 10 #{self.address}]
+    vals = []
+    out.each_line do |l|
+      l[/=([0-9]*)ms/]
+      if $1
+        vals << $1.to_i
+      end
+    end
+    logger.debug "Out: #{out}, Vals: #{vals}"
+    bla = 0
+    vals.each {|v| bla += v }
+    bla == 0 ? 9999 : bla / vals.size
+  end
+
   def ping
     SixUpdaterWeb.run_program("ping", SixUpdaterWeb::BASE_PATH, "-r 9 -n 30 -t #{self.address}")
   end

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

@@ -14,6 +14,12 @@ class SystemSetting < ActiveRecord::Base
     "rake" # .bat on Windows
   end
 
+  def speedtest
+    cl = "sync:priority RAILS_ENV=#{ENV['RAILS_ENV']}" # + cl
+    cl += " BASE_PATH=\'#{SixUpdaterWeb::BASE_PATH}\'" if defined?(SixUpdaterWeb::OLDLOCATION)
+    SixUpdaterWeb.run_program(exec, RAILS_ROOT, cl)
+  end
+
   def update_gamespy(internal = false)
     self.gamespied_at = Time.now
     self.save

data/lib/six-updater-web/app/views/main/_left.haml

@@ -60,6 +60,8 @@
           = submit_tag "Show status"
            
           = submit_tag "Server Mod check"
+        %p
+          = submit_tag "Speedtest"
       %strong Logs
       - form_tag :action => :fetch do
         %p

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

@@ -22,7 +22,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.23.2"
+  VERSION = "0.23.3"
   COMPONENT = "six-updater-web"
 
   DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)
@@ -207,6 +207,15 @@ module SixUpdaterWeb
     puts "Done!"
   end
 
+  def mirror_priority
+    puts "Checking mirror latencies, please be patient..."
+    repos = Repository.rank(true)
+    puts
+    repos.each do |rep|
+      puts "#{rep.priority} - #{rep.ping_value} - #{rep.url}"
+    end
+  end
+
   def logger
     ActiveRecord::Base.logger
   end

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

@@ -9,6 +9,11 @@ namespace :sync do
     sleep 3
   end
 
+  task :priority => :environment do
+    SixUpdaterWeb.mirror_priority
+    sleep 3
+  end
+
   task :system => :environment do
     Six::Dbmanager.reload_system
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 23
-  - 2
-  version: 0.23.2
+  - 3
+  version: 0.23.3
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-25 00:00:00 +02:00
+date: 2010-07-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency