six-updater-web 0.22.3 → 0.22.4

data/Rakefile

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

@@ -229,13 +229,13 @@ class MainController < ApplicationController
     if setting
       setting.beta = @beta unless @beta.nil?
       setting.server = @server_bool unless @server_bool.nil?
-      @msg << "Override settings profile: <a href='/appsettings/edit/#{setting.id}' title='#{setting.real_exe} #{setting.real_params} (#{setting.real_path})'>#{setting.label}</a>"
+      @msg << "Override settings profile: <a href='/appsettings/edit/#{setting.id}' title='#{setting.class.short}: #{setting.real_exe} #{setting.real_params} (#{setting.real_path})'>#{setting.label}</a>"
     else
       if preset.appsetting
         setting = preset.appsetting
         setting.beta = @beta unless @beta.nil?
         setting.server = @server_bool unless @server_bool.nil?
-        @msg << "Preset settings profile: <a href='/appsettings/edit/#{setting.id}' title='#{setting.real_exe} #{setting.real_params} (#{setting.real_path})'>#{setting.label}</a>"
+        @msg << "Preset settings profile: <a href='/appsettings/edit/#{setting.id}' title='#{setting.class.short}: #{setting.real_exe} #{setting.real_params} (#{setting.real_path})'>#{setting.label}</a>"
       end
     end
 
@@ -248,13 +248,7 @@ class MainController < ApplicationController
       end
     end
 
-    if setting
-      if setting.type.nil? || setting.type.empty? || setting.type == "Appsetting"
-        setting.type = "Arma2Appsetting"
-        setting.save
-        setting = Appsetting.find(setting.id)
-      end
-    else
+    unless setting
       setting = Arma2Appsetting.new(:beta => @beta, :server => @server_bool)
     end
 

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

@@ -8,13 +8,6 @@ class Appsetting < ActiveRecord::Base
   SPECIFIC = false
   FRIENDLY_NAME = "ArmA 2 (Any)"
 
-  # TODO: Auto enumurate from model properties?
-  # folders: expansion, common, addons
-  # files: arma2.exe, arma2server.exe (-.exe for linux), arma2oa.exe, arma2oaserver.exe, addons/chernarus.pbo
-  FAMILY = Hash.new
-  FAMILY["Arma2"] = [["arma2.exe", "arma2server.exe"], {"Arma2St" => []}]
-  FAMILY["Arma2Oa"] = [["arma2oa.exe", "arma2oaserver.exe"], {"Arma2OaCo" => ["addons/"], "Arma2OaSt" => ["!addons/"]}]
-
   DEFAULT_EXE = "arma2.exe"
   DEFAULT_EXE_PATH = ""
   DEFAULT_BETA_EXE = "arma2.exe"
@@ -27,16 +20,15 @@ class Appsetting < ActiveRecord::Base
   DEFAULT_MODS_PARAM = "-mod=" # TODO
   DEFAULT_BETA_MODS = ["beta"]
 
+  # TODO: Auto enumurate from model properties?
+  # folders: expansion, common, addons
+  # files: arma2.exe, arma2server.exe (-.exe for linux), arma2oa.exe, arma2oaserver.exe, addons/chernarus.pbo
+  FAMILY = Hash.new
+  FAMILY["Arma2"] = [[DEFAULT_EXE, DEFAULT_SERVER_EXE, "#{DEFAULT_BETA_EXE_PATH}/#{DEFAULT_BETA_EXE}"], {"Arma2St" => []}]
+  FAMILY["Arma2Oa"] = [[Arma2OaAppsetting::DEFAULT_EXE, Arma2OaAppsetting::DEFAULT_SERVER_EXE, "#{Arma2OaAppsetting::DEFAULT_BETA_EXE_PATH}/#{Arma2OaAppsetting::DEFAULT_BETA_EXE}"], {"Arma2OaCo" => ["addons/"], "Arma2OaSt" => ["!addons/"]}]
+
   # TODO: Windows-only
   REGKEYS = {"Arma2Oa" => ['SOFTWARE\\Bohemia Interactive Studio\\ArmA 2 OA', 'MAIN'], "Arma2" => ['SOFTWARE\\Bohemia Interactive Studio\\ArmA 2', 'MAIN']}
-  path = nil
-
-  self::REGKEYS.each_pair do |k, v|
-    path = begin; Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, v[0])[v[1]]; rescue; nil; end
-    break if path
-  end
-  DEFAULT_PATH = path
-
 
   def to_updater_yml
     hash = Hash.new
@@ -49,7 +41,7 @@ class Appsetting < ActiveRecord::Base
     hash[:app_path] = self.real_path unless hash[:app_path]
     hash[:app_exe] = self.real_exe unless hash[:app_exe]
     if self.beta
-      hash[:mods] = self.found_type::DEFAULT_BETA_MODS.map{|e| e.gsub("/", "\\")}.join(";")
+      hash[:mods] = self.edition::DEFAULT_BETA_MODS.map{|e| e.gsub("/", "\\")}.join(";")
     end
     hash
   end
@@ -71,170 +63,120 @@ class Appsetting < ActiveRecord::Base
     self.to_s.sub("Appsetting", "")
   end
 
-  def get_exe
-    edition = self.class::SPECIFIC ? self.class : self.detect_edition
-    return nil unless edition
-    if self.server
-      if self.beta
-        edition::DEFAULT_BETA_EXE_PATH.size == 0 ? edition::DEFAULT_SERVER_EXE : "#{edition::DEFAULT_BETA_EXE_PATH}/#{edition::DEFAULT_SERVER_EXE}"
-      else
-        edition::DEFAULT_SERVER_EXE_PATH.size == 0 ? edition::DEFAULT_SERVER_EXE : "#{edition::DEFAULT_SERVER_EXE_PATH}/#{edition::DEFAULT_SERVER_EXE}"
-      end
-    else
-      if self.beta
-        edition::DEFAULT_BETA_EXE_PATH.size == 0 ? edition::DEFAULT_BETA_EXE : "#{edition::DEFAULT_BETA_EXE_PATH}/#{edition::DEFAULT_BETA_EXE}"
-      else
-        edition::DEFAULT_EXE_PATH.size == 0 ? edition::DEFAULT_EXE : "#{edition::DEFAULT_EXE_PATH}/#{edition::DEFAULT_EXE}"
-      end
+  def self.types
+    return [Arma2Appsetting] if self == Appsetting
+    t, e = [], self
+    until e.nil? || [Appsetting, ActiveRecord::Base].include?(e) do
+      t << e
+      e = e.superclass
     end
+    t
   end
 
-  def path_by_registry
-    self.class::DEFAULT_PATH
+  def self.default_path
+    return @mpath unless @mpath.nil?
+    @mpath = nil
+    self::REGKEYS.each_pair do |k, v|
+      @mpath = begin; Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, v[0])[v[1]]; rescue; nil; end
+      break if @mpath
+    end
+    @mpath
   end
 
-  def real_exe
-    if self.exe.nil?
-      self.get_exe
-    else
-      self.exe
-    end
+  def edition(force = true)
+    ed = self.detect_edition
+    ed = self.class if ed.nil? && force
+    ed
   end
 
-  def real_params
-    if self.params.nil?
-      edition = self.detect_edition
-      edition ? edition::DEFAULT_PARAMS : nil
-    else
-      self.params
-    end
+  def nice_edition
+    t = self.edition(false)
+    t ? t.label : "ERROR: None detected"
   end
 
-  def real_logpath
-    if self.logpath.nil?
-      case RUBY_PLATFORM
-        when /-mingw32$/, /-mswin32$/
-          "#{File.join(ENV['USERPROFILE'], 'appdata', 'local', 'arma 2')}"
-        else
-          nil
-      end
-    else
-      self.logpath
-    end
+  def found_types
+    t = self.edition(false)
+    t ? t.types : []
   end
 
-  def real_path
-    if self.path.nil?
-      self.path_by_registry
-    else
-      self.path
-    end
+  # TODO: Linux auto cut of '.exe' ?
+  def self.beta_server_exe()
+    self::DEFAULT_BETA_EXE_PATH.empty? ? self::DEFAULT_SERVER_EXE : "#{self::DEFAULT_BETA_EXE_PATH}/#{self::DEFAULT_SERVER_EXE}"
   end
 
-  def real_modpath
-    if self.modpath.nil?
-      self.real_path
-    else
-      self.modpath
-    end
+  def self.server_exe()
+    self::DEFAULT_SERVER_EXE_PATH.empty? ? self::DEFAULT_SERVER_EXE : "#{self::DEFAULT_SERVER_EXE_PATH}/#{self::DEFAULT_SERVER_EXE}"
   end
 
-  def process_name
-    if self.exe
-      if self.exe[FOLDER]
-        $2
-      else
-        self.exe
-      end
-    else
-      self.get_exe
-    end
+  def self.beta_exe()
+    self::DEFAULT_BETA_EXE_PATH.empty? ? self::DEFAULT_BETA_EXE : "#{self::DEFAULT_BETA_EXE_PATH}/#{self::DEFAULT_BETA_EXE}"
   end
 
-  def allowance(signatures)
-    signatures = signatures.map{|e| e.downcase}
-    allowed, disallowed, garbage = [], [], []
-    path = self.real_path.gsub("\\", "/")
-    pbos = Dir[File.join(path, "**", "*.pbo")]
-    pbos.each do |p|
-      inter = p.sub("#{path}/", "")
-      unless inter =~ /\/(addons|dta)\//i || inter =~ /^common\//i || inter =~ /^(addons|dta)\//i
-        garbage << inter
-        next
-      end
-      if signatures.empty?
-        allowed << inter
-        next
-      end
-      sigs = Dir["#{p}*.bisign"]
-      found = false
-      sigs.each do |s|
-        sig = s.sub("#{p}.", "").sub(".bisign", "").downcase
-        if signatures.include?(sig)
-          found = true
-          allowed << inter
-          break
-        end
-      end
-      unless found
-        disallowed << inter
-      end
+  def self.normal_exe()
+    self::DEFAULT_EXE_PATH.empty? ? self::DEFAULT_EXE : "#{self::DEFAULT_EXE_PATH}/#{self::DEFAULT_EXE}"
+  end
+
+  def any_exe?
+    ed = self.class::SPECIFIC ? self.class : self.edition
+    (!self.exe.nil? && File.exists?(File.join(self.real_path, self.exe))) || File.exists?(File.join(self.real_path, ed.normal_exe)) || File.exists?(File.join(self.real_path, ed.server_exe)) || File.exists?(File.join(self.real_path, ed.beta_exe)) || File.exists?(File.join(self.real_path, ed.beta_server_exe))
+  end
+
+  def real_exe
+    return self.exe unless self.exe.nil?
+    return nil unless self.edition()
+    if self.server
+      self.beta ? self.edition.beta_server_exe : self.edition.server_exe
+    else
+      self.beta ? self.edition.beta_exe : self.edition.normal_exe
     end
-    [allowed, disallowed, garbage]
   end
 
-  def processes
-    Six::Appmanager.find_process(process_name, self.real_path)
+  def real_path
+    self.path.nil? ? self.class.default_path : self.path
   end
 
-  def read_logfile
-    Six::Appmanager.read_logfile logfile unless logfile.nil?
+  def default_params
+    self.edition.nil? ? nil : self.edition::DEFAULT_PARAMS
   end
 
-  def kill!
-    Six::Appmanager.kill_by_name(process_name, self.real_path)
+  def real_params
+    self.params.nil? ? self.default_params : self.params
   end
 
-  def rpt
-    process_name[/(.*)\./]
-    "#{$1}.rpt"
+  def real_modpath
+    self.modpath.nil? ? self.real_path : self.modpath
   end
 
-  def logfile
-    if FileTest.directory? real_logpath
-      File.join(real_logpath, rpt) if FileTest.exist?(File.join(real_logpath, rpt))
+  def real_logpath
+    if self.logpath.nil?
+      case RUBY_PLATFORM
+        when /-mingw32$/, /-mswin32$/
+          "#{File.join(ENV['USERPROFILE'], 'appdata', 'local', 'arma 2')}"
+        else
+          nil
+      end
     else
-      nil
+      self.logpath
     end
   end
 
   def detect_edition
     # TODO: Read the appsetting.exe to figure out an edition, as a static setting by the user?
-
+    return @det_ed unless @det_ed.nil?
     return nil if self.real_path.nil?
     return nil unless File.directory?(self.real_path)
     if self.class::SPECIFIC
-      if File.exists?(File.join(self.real_path, self.real_exe))
-        return self.class
-      elsif File.exists?(File.join(self.real_path, self.class::DEFAULT_EXE)) || File.exists?(File.join(self.real_path, self.class::DEFAULT_SERVER_EXE))
-        return self.class
-      else
-        return nil
-      end
+      return self.any_exe? ? self.class : nil
     end
     game = nil
-    cond = nil
-    ed = nil
     self.class::FAMILY.each_pair do |key, value|
       found = false
       # Find game
       value[0].each do |e|
         case e
-          when /\/$/
-            # folder
+          when /\/$/ # folder
             found = File.directory?(File.join(self.real_path, e))
-          else
-            # file
+          else # file
             case RUBY_PLATFORM
               when /-mingw32$/, /-mswin32$/
               else
@@ -249,26 +191,22 @@ class Appsetting < ActiveRecord::Base
       game = key
 
       # Find edition
-      found = nil
-      cond = true
-      ed = nil
+      ed, found, cond = nil, nil, true
       value[1].each_pair do |edition, conditions|
         ed = edition
         conditions.each do |condition|
           c = condition.clone
           reverse = c.sub!(/^!/, "")
           case c
-            when /\/$/
-              # folder
+            when /\/$/ # folder
               found = File.directory?(File.join(self.real_path, c))
-            else
+            else # file
               case RUBY_PLATFORM
                 when /-mingw32$/, /-mswin32$/
                 else
                   c = c.clone
                   c.sub!(/\.exe$/, "")
               end
-              # file
               found = File.exists?(File.join(self.real_path, c))
           end
           cond = reverse ? !found : found
@@ -280,34 +218,68 @@ class Appsetting < ActiveRecord::Base
     end
 
     return nil unless game
-    Object.const_get("#{game}Appsetting")
+    @det_ed = Object.const_get("#{game}Appsetting")
+    @det_ed
   end
 
-  def found_type
-    #Arma2StAppsetting
-    # TODO: Add detection support based on user settings (exe/path)
-    return self.class unless self.real_path
-    self.detect_edition
+  def allowance(signatures)
+    signatures = signatures.map{|e| e.downcase}
+    allowed, disallowed, garbage = [], [], []
+    path = self.real_path.gsub("\\", "/")
+    pbos = Dir[File.join(path, "**", "*.pbo")]
+    pbos.each do |p|
+      inter = p.sub("#{path}/", "")
+      unless inter =~ /\/(addons|dta)\//i || inter =~ /^common\//i || inter =~ /^(addons|dta)\//i
+        garbage << inter
+        next
+      end
+      if signatures.empty?
+        allowed << inter
+        next
+      end
+      sigs = Dir["#{p}*.bisign"]
+      found = false
+      sigs.each do |s|
+        sig = s.sub("#{p}.", "").sub(".bisign", "").downcase
+        if signatures.include?(sig)
+          found = true
+          allowed << inter
+          break
+        end
+      end
+      disallowed << inter unless found
+    end
+    [allowed, disallowed, garbage]
   end
 
-  def found_types
-    t = self.found_type
-    t ? t.types : []
+  def process_name
+    ex = self.real_exe
+    return nil unless ex
+    File.basename(ex)
   end
 
-  def nice_found_type
-    t = self.found_type
-    t ? t.label : nil
+  def processes
+    Six::Appmanager.find_process(process_name, self.real_path)
   end
 
-  def self.types
-    return [Arma2Appsetting] if self == Appsetting
-    t = []
-    e = self
-    until e.nil? || [Appsetting, ActiveRecord::Base].include?(e) do
-      t << e
-      e = e.superclass
+  def read_logfile
+    Six::Appmanager.read_logfile logfile unless logfile.nil?
+  end
+
+  def kill!
+    Six::Appmanager.kill_by_name(process_name, self.real_path)
+  end
+
+  def rpt
+    process_name[/(.*)\./]
+    "#{$1}.rpt"
+  end
+
+  def logfile
+    if File.directory?(real_logpath)
+      File.join(real_logpath, rpt) if File.exists?(File.join(real_logpath, rpt))
+    else
+      nil
     end
-    t
-  end  
+  end
 end

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

@@ -1,7 +1,2 @@
 class Arma2Appsetting < Appsetting
-
-  # Default game (Appsetting) is atm arma2
-  #def found_type
-  #  Arma2StAppsetting
-  #end
 end

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

@@ -12,10 +12,5 @@ class Arma2OaAppsetting < Arma2Appsetting
   REGKEYS = {"Arma2Oa" => ['SOFTWARE\\Bohemia Interactive Studio\\ArmA 2 OA', 'MAIN']}
 
   FAMILY = Hash.new
-  FAMILY["Arma2Oa"] = [["arma2oa.exe", "arma2oaserver.exe"], {"Arma2OaCo" => ["addons/"], "Arma2OaSt" => ["!addons/"]}]
-
-#  def found_type
-#    return self.class unless self.real_path
-#    self.detect_edition
-#  end
+  FAMILY["Arma2Oa"] = [[DEFAULT_EXE, DEFAULT_SERVER_EXE, "#{DEFAULT_BETA_EXE_PATH}/#{DEFAULT_BETA_EXE}"], {"Arma2OaCo" => ["addons/"], "Arma2OaSt" => ["!addons/"]}]
 end

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

@@ -6,9 +6,4 @@ class Arma2OaCoAppsetting < Arma2OaAppsetting
 # Perhaps look at adding a boolean: specific, so when it is enabled, non of the inherited editions can be used?
 # Since Arma2 standalone addons should work on OaCo, yet you would loose the specific 'arma2standalone only' option
 
-=begin
-  def found_types
-    [Arma2OaCoAppsetting, Arma2OaAppsetting, Arma2StAppsetting, Arma2Appsetting]
-  end
-=end
 end

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

@@ -3,6 +3,6 @@ class Arma2OaStAppsetting < Arma2OaAppsetting
   SPECIFIC = true
 
   FAMILY = Hash.new
-  FAMILY["Arma2Oa"] = [["arma2oa.exe", "arma2oaserver.exe"], {"Arma2OaSt" => ["!addons/"]}]
+  FAMILY["Arma2Oa"] = [[DEFAULT_EXE, DEFAULT_SERVER_EXE, "#{DEFAULT_BETA_EXE_PATH}/#{DEFAULT_BETA_EXE}"], {"Arma2OaSt" => ["!addons/"]}]
   #Code here
 end

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

@@ -19,7 +19,7 @@ class Sixconfig < ActiveRecord::Base
     m += srv.mods if srv
     self.mods.each { |mod| m << mod unless m.include?(mod) }
     if setting.beta
-      t = setting.found_type
+      t = setting.edition
       if t
         t::DEFAULT_BETA_MODS.each do |mf|
           mod = Mod.find_by_name(mf)

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

@@ -1,8 +1,7 @@
 %table{ :border => 1, :cellpadding => "5", :width => "100%"}
   %tr
     %td
-      - t = @current_setting.nice_found_type
-      Edition: #{link_to t ? t : "ERROR: None detected", nil, :title => "Supports mods for: #{@current_setting.found_types.map{|e| e.label}.join(", ")}" }
+      Edition: #{link_to @current_setting.nice_edition, nil, :title => "Supports mods for: #{@current_setting.found_types.map{|e| e.label}.join(", ")}" }
       %br
       Last sync #{@system_setting.synchronized_at ? time_ago_in_words(@system_setting.synchronized_at) + " ago" : "never"}
       Gamespy #{@system_setting.gamespied_at ? time_ago_in_words(@system_setting.gamespied_at) + " ago" : "never"}

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

@@ -22,7 +22,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.22.3"
+  VERSION = "0.22.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
   - 22
-  - 3
-  version: 0.22.3
+  - 4
+  version: 0.22.4
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-24 00:00:00 +02:00
+date: 2010-07-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency