six-updater-web 0.19.4 → 0.19.5

data/Rakefile

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

data/lib/six-updater-web/app/helpers/appsettings_helper.rb

@@ -20,6 +20,6 @@ module AppsettingsHelper
   end
 
   def type_form_column(record, t, options)
-    collection_select(:record, :type, ["Arma2Appsetting", "Arma2OaAppsetting"], :to_s, :to_s, {}, {:name => options[:name]})
+    collection_select(:record, :type, ["Arma2Appsetting", "Arma2StAppsetting", "Arma2OaAppsetting", "Arma2OaStAppsetting", "Arma2OaCoAppsetting"], :to_s, :to_s, {}, {:name => options[:name]})
   end
 end

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

@@ -5,6 +5,17 @@ class Appsetting < ActiveRecord::Base
   has_many :sixconfigs
   six_guid
 
+  # Defaults to ArmA2 atm...
+  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"
@@ -14,20 +25,16 @@ class Appsetting < ActiveRecord::Base
   DEFAULT_MODS_PARAM = "-mod=" # TODO
   DEFAULT_BETA_MODS = ["beta"]
 
-  REGKEY = ['SOFTWARE\\Bohemia Interactive Studio\\ArmA 2', 'MAIN']
-
   # TODO: Windows-only
-  DEFAULT_PATH = begin; Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, REGKEY[0])[REGKEY[1]]; rescue; nil; end
-
-=begin
-  before_save :check_values
-  def check_values
-    # TODO: Fix hardcoding
-    if self.type.nil? || !(["Appsetting", "Arma2Appsetting", "Arma2OaAppsetting"].include?(self.type))
-      self.type = "Appsetting"
-    end
+  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
-=end
+  DEFAULT_PATH = path
+
 
   def to_updater_yml
     hash = Hash.new
@@ -42,21 +49,87 @@ class Appsetting < ActiveRecord::Base
     hash
   end
 
-  def found_type
-    case self.real_exe
-      when "arma2.exe"
-        Arma2StAppsetting.found_type
-      when "arma2oa.exe"
-        Arma2OaAppsetting.found_type
-      else
-        self.class
-    end
+  def self.label
+    #self.to_s.sub("Appsetting", "")
+    self::FRIENDLY_NAME
   end
 
-  def self.label
+  def self.short
     self.to_s.sub("Appsetting", "")
   end
 
+  def detect_edition
+    return self.class if self.class::SPECIFIC
+    return self.class unless self.real_path
+    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
+            found = File.directory?(File.join(self.real_path, e))
+          else
+            # file
+            case RUBY_PLATFORM
+              when /-mingw32$/, /-mswin32$/
+              else
+                e = e.clone
+                e.sub!(/\.exe$/)
+            end
+            found = File.exists?(File.join(self.real_path, e))
+        end
+        break if found
+      end
+      next unless found
+      game = key
+
+      # Find edition
+      found = nil
+      cond = true
+      ed = nil
+      value[1].each_pair do |edition, conditions|
+        ed = edition
+        conditions.each do |condition|
+          c = condition.clone
+          reverse = c.sub!(/^!/, "")
+          case c
+            when /\/$/
+              # folder
+              found = File.directory?(File.join(self.real_path, c))
+            else
+              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
+          break if cond
+        end
+        game = ed if cond
+        next unless cond
+      end
+    end
+
+    return nil unless game
+    Object.const_get("#{game}Appsetting")
+  end
+
+  def found_type
+    #Arma2StAppsetting
+    # TODO: Add detection support based on user settings (exe/path)
+    return self.class unless self.real_path
+    d = self.detect_edition
+    d ? d : self.class
+  end
+
   def found_types
     self.found_type.types
   end

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

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

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

@@ -1,20 +1,18 @@
 class Arma2OaAppsetting < Arma2Appsetting 
+  FRIENDLY_NAME = "A2 Op. Arrowhead (Any)"
+
+  # TODO: Specific server support like done with Beta?
   DEFAULT_EXE = "arma2oa.exe"
   DEFAULT_BETA_EXE = "arma2oa.exe"
   DEFAULT_BETA_EXE_PATH = "expansion/beta"
-  REGKEY = ['SOFTWARE\\Bohemia Interactive Studio\\ArmA 2 OA', 'MAIN']
+  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
-    # TODO: Alternative ways to figure out the edition? Find arma2.exe? etc
-    dir = File.join(self.real_path, "addons")
-    rdir = File.directory?(dir) ? dir : File.join(self.real_path, "Addons")
-    rdir = File.join(self.real_path, "AddOns") unless File.directory?(rdir)
+#  def found_type
+#    return self.class unless self.real_path
+#    self.detect_edition
+#  end
 
-    if File.exists?(File.join(rdir, "chernarus.pbo")) || File.exists?(File.join(rdir, "Chernarus.pbo"))
-      Arma2OaCoAppsetting
-    else
-      Arma2OaStAppsetting
-    end
-  end
 end

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

@@ -1,5 +1,6 @@
 class Arma2OaCoAppsetting < Arma2OaAppsetting
-  #Code here
+  FRIENDLY_NAME = "A2 Op. Arrowhead (Combined Ops)"
+  SPECIFIC = true
 
 # TODO: Evaluate
 # Perhaps look at adding a boolean: specific, so when it is enabled, non of the inherited editions can be used?

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

@@ -1,3 +1,3 @@
-class Arma2OaCo < Arma2OaStMod
+class Arma2OaCoMod < Arma2OaStMod
   #Code here
 end

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

@@ -1,3 +1,5 @@
 class Arma2OaStAppsetting < Arma2OaAppsetting
+  FRIENDLY_NAME = "A2 Op. Arrowhead (Standalone)"
+  SPECIFIC = true
   #Code here
 end

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

@@ -1,3 +1,2 @@
 class Arma2OaStMod < Arma2OaMod
-  #Code here
 end

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

@@ -1,3 +1,5 @@
 class Arma2StAppsetting < Arma2Appsetting
-  #Code here
+  FRIENDLY_NAME = "ArmA 2 (Standalone)"
+  SPECIFIC = true
+  REGKEYS = {"Arma2" => ['SOFTWARE\\Bohemia Interactive Studio\\ArmA 2', 'MAIN']}
 end

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

@@ -29,11 +29,15 @@ class Mod < ActiveRecord::Base
     self.to_s.sub("Mod", "")
   end
 
+  def self.short
+    self.to_s.sub("Mod", "")
+  end
+
   def self.types
     return [Arma2Mod] if self.class == Appsetting
     e = self
     unless e.nil? || [Mod, ActiveRecord::Base].include?(e)
-      types << e.label
+      types << e
       e = e.class
     end
     types
@@ -46,7 +50,7 @@ class Mod < ActiveRecord::Base
     # setting.type == "ArmA2OaSt" (ArmA2Oa, ArmA2)
     # self.type == "ArmA2Oa"
     return nil if setting.nil?
-    self.type.nil? ? true : setting.found_types.map{|e| e.label }.include?(self.class.label)
+    self.type.nil? ? true : setting.found_types.map{|e| e.short }.include?(self.class.short)
   end
 
   def real_name

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

@@ -61,24 +61,16 @@
       %table{ :border => 1, :cellpadding => "5", :width => "100%"}
         %tr
           %td
-            Edition: #{link_to @current_setting.nice_found_type, nil, :title => "Supports mods for: #{@current_setting.found_types.map{|e| e.label}.join(", ")}" } Autoskip: #{@autoskip ? @autoskip : false}.
-            Last sync
-            - if @system_setting.synchronized_at
-              = time_ago_in_words(@system_setting.synchronized_at)
-              ago,
-            - else
-              never,
-            Gamespy
-            - if @system_setting.gamespied_at
-              = time_ago_in_words(@system_setting.gamespied_at)
-              ago.
-            - else
-              never.
+            Edition: #{link_to @current_setting.nice_found_type, nil, :title => "Supports mods for: #{@current_setting.found_types.map{|e| e.label}.join(", ")}" }, 
+            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"}
             %br
             %br
             = @msg.join("<br />")
             %br
-            - if (@check.size + @skip.size + @install.size) > 0
+            Autoskip: #{@autoskip ? "Enabled" : "Disaabled"}.
+            %br
+            - if (@check.size + @skip.size + @install.size + @disabled.size) > 0
               - if @check.size > 0
                 %br
                 To be checked:

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

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

data/lib/six-updater-web/public/images/active_scaffold/DO_NOT_EDIT

@@ -1,2 +1,2 @@
-Any changes made to files in sub-folders will be lost.
-See http://activescaffold.com/tutorials/faq#custom-css.
+Any changes made to files in sub-folders will be lost.
+See http://activescaffold.com/tutorials/faq#custom-css.

data/lib/six-updater-web/public/javascripts/active_scaffold/DO_NOT_EDIT

@@ -1,2 +1,2 @@
-Any changes made to files in sub-folders will be lost.
-See http://activescaffold.com/tutorials/faq#custom-css.
+Any changes made to files in sub-folders will be lost.
+See http://activescaffold.com/tutorials/faq#custom-css.

data/lib/six-updater-web/public/stylesheets/active_scaffold/DO_NOT_EDIT

@@ -1,2 +1,2 @@
-Any changes made to files in sub-folders will be lost.
-See http://activescaffold.com/tutorials/faq#custom-css.
+Any changes made to files in sub-folders will be lost.
+See http://activescaffold.com/tutorials/faq#custom-css.

data/lib/six-updater-web/vendor/plugins/six-app_manager/lib/six/appmanager.rb

@@ -145,9 +145,9 @@ module Six
       def real_exe
         if exe.nil?
           if self.beta
-            self.class::DEFAULT_BETA_EXE_PATH.size == 0 ? self.class::DEFAULT_BETA_EXE : "#{self.class::DEFAULT_BETA_EXE_PATH}/#{self.class::DEFAULT_BETA_EXE}"
+            self.detect_edition::DEFAULT_BETA_EXE_PATH.size == 0 ? self.detect_edition::DEFAULT_BETA_EXE : "#{self.detect_edition::DEFAULT_BETA_EXE_PATH}/#{self.detect_edition::DEFAULT_BETA_EXE}"
           else
-            self.class::DEFAULT_EXE_PATH.size == 0 ? self.class::DEFAULT_EXE : "#{self.class::DEFAULT_EXE_PATH}/#{self.class::DEFAULT_EXE}"
+            self.detect_edition::DEFAULT_EXE_PATH.size == 0 ? self.detect_edition::DEFAULT_EXE : "#{self.detect_edition::DEFAULT_EXE_PATH}/#{self.detect_edition::DEFAULT_EXE}"
           end
         else
           exe
@@ -156,7 +156,7 @@ module Six
 
       def real_params
         if params.nil?
-          self.class::DEFAULT_PARAMS
+          self.detect_edition::DEFAULT_PARAMS
         else
           params
         end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 19
-  - 4
-  version: 0.19.4
+  - 5
+  version: 0.19.5
 platform: ruby
 authors: 
 - Sickboy