six-updater-web 0.18.2 → 0.19.0

data/Rakefile

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

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

@@ -1,6 +1,6 @@
 class AppsettingsController < ApplicationController
   record_select :per_page => 10, :search_on => "name", :order_by => "name ASC", :full_text_search => true
-  active_scaffold :appsettings do |config|
+  active_scaffold :appsetting do |config|
     config = self # Ruby19 compatibility
     config.label = "Settings Profiles"
     config.columns = [
@@ -11,6 +11,8 @@ class AppsettingsController < ApplicationController
       :logpath,
       :params,
       :sixconfigs,
+      :beta,
+      :type,
 #      :created_at,
       :updated_at
     ]
@@ -20,7 +22,7 @@ class AppsettingsController < ApplicationController
 
     config.list.sorting = { :name => :asc }
 
-    [:name, :exe, :path, :modpath, :logpath, :params].each do |column|
+    [:name, :exe, :path, :modpath, :logpath, :params, :beta].each do |column|
       config.columns[column].inplace_edit = true
     end
   end

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

@@ -195,7 +195,7 @@ class MainController < ApplicationController
       @msg << "Using preset: #{preset.name}"
     else
       @msg << "No preset selected!"
-      act
+      act(setting, preset, action, server)
       return
     end
 
@@ -228,16 +228,21 @@ class MainController < ApplicationController
       end
     end
 
-    @msg << "Resetting skip status." if reset
-
-    setting = Appsetting.new unless setting
+    if setting
+      setting.type = "Arma2Appsetting" if setting.type.nil? || setting.type.empty?
+      setting.save
+      setting = Arma2Appsetting.find(setting.id)
+    else
+      setting = Arma2Appsetting.new
+    end
 
+    @msg << "Resetting skip status." if reset
     if setting.real_path
       unless File.directory?(setting.real_path)
         @msg << "<br /><b>WARNING:</b> ArmA folder not set or non existent: #{setting.real_path}"
       end
     else
-      @msg << "<br /><b>WARNING:</b> ArmA folder not set or non existent: #{setting.real_path}"      
+      @msg << "<br /><b>WARNING:</b> ArmA folder not set or non existent: #{setting.real_path}"
     end
 
     if setting.modpath
@@ -259,6 +264,7 @@ class MainController < ApplicationController
         mod.update_skip if @autoskip
       end
       mod.save unless mod.new_record?
+      mod.disabled = true if !mod.version_match?(setting)
       if mod.disabled
         @disabled << mod
         next
@@ -280,7 +286,7 @@ class MainController < ApplicationController
         return
 
       when "show"
-        redirect_to "/queryservers/show/#{params[:gamespy]}"
+        redirect_to "/queryservers/edit/#{params[:gamespy]}"
         return
 
       when "save"
@@ -310,14 +316,14 @@ class MainController < ApplicationController
     @check.sort! { |a, b| a.name <=> b.name }
     @install.sort! { |a, b| a.name <=> b.name }
     @disabled.sort! { |a, b| a.name <=> b.name }
-    act
+    act(setting, preset, action, server)
   end
 
   def fetch
     @system_setting = SystemSetting.singleton
     setting = nil
     setting = Sixconfig.find(@system_setting.favorite_preset).appsetting unless @system_setting.favorite_preset.empty?
-    setting = Appsetting.new unless setting
+    setting = Arma2Appsetting.new unless setting
     @msg = []
 
     case params["commit"].downcase
@@ -399,46 +405,11 @@ class MainController < ApplicationController
   end
 
   private
-  def act
-    @preset = if @system_setting.favorite_preset
-      begin
-        Sixconfig.find(@system_setting.favorite_preset.to_s)
-      rescue
-        Sixconfig.new
-      end
-    else
-      Sixconfig.new
-    end
-
-    @server = if @system_setting.favorite_server
-      begin
-        Server.find(@system_setting.favorite_server.to_s)
-      rescue
-        Server.new
-      end
-    else
-      Server.new
-    end
-
-    @action = if @system_setting.favorite_action
-      begin
-        Action.find(@system_setting.favorite_action.to_s)
-      rescue
-        Action.new
-      end
-    else
-      Action.new
-    end
-
-    @setting = if @system_setting.favorite_settings_profile
-      begin
-        Appsetting.find(@system_setting.favorite_settings_profile.to_s)
-      rescue
-        Appsetting.new
-      end
-    else
-      Appsetting.new
-    end
+  def act(setting, preset, action, server)
+    @preset = preset ? preset : Sixconfig.new
+    @server = server ? server : Queryserver.new
+    @action = action ? action : Action.new
+    @setting = setting ? setting : Arma2Appsetting.new
   end
 
   def fetch_param(ar, ty, default = nil)

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

@@ -9,6 +9,7 @@ class ModsController < ApplicationController
       :size,
       :categories,
       :path,
+      :type,
       :sixconfigs,
       :networks,
       :queryservers,

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

@@ -14,4 +14,12 @@ module AppsettingsHelper
   def logpath_column(record, b = nil)
     record.real_logpath
   end
+
+  def type_column(record, b = nil)
+    record.class.label
+  end
+
+  def type_form_column(record, t, options)
+    collection_select(:record, :type, ["Arma2Appsetting", "Arma2OaAppsetting"], :to_s, :to_s, {}, {:name => options[:name]})
+  end
 end

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

@@ -9,4 +9,12 @@ module ModsHelper
       0
     end
   end
+
+  def type_column(record, b = nil)
+    record.class.label
+  end
+
+  def type_form_column(record, t, options)
+    collection_select(:record, :type, ["Arma2Mod", "Arma2StMod", "Arma2OaMod", "Arma2OaStMod", "Arma2OaCoMod"], :to_s, :to_s, {:name => options[:name]})
+  end
 end

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

@@ -5,6 +5,30 @@ class Appsetting < ActiveRecord::Base
   has_many :sixconfigs
   six_guid
 
+  DEFAULT_EXE = "arma2.exe"
+  DEFAULT_EXE_PATH = ""
+  DEFAULT_BETA_EXE = "arma2.exe"
+  DEFAULT_BETA_EXE_PATH = "beta"
+  # TODO: Auto beta mod even?
+  DEFAULT_PARAMS = "-showScriptErrors -noSplash -noFilePatching"
+  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
+  end
+=end
+
   def to_updater_yml
     hash = Hash.new
     attribute_names.each do |at|
@@ -15,4 +39,38 @@ class Appsetting < ActiveRecord::Base
     end
     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
+  end
+
+  def self.label
+    self.to_s.sub("Appsetting", "")
+  end
+
+  def found_types
+    self.found_type.types
+  end
+
+  def nice_found_type
+    self.found_type.label
+  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  
 end

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

@@ -0,0 +1,6 @@
+class Arma2Appsetting < Appsetting
+  # Default game (Appsetting) is atm arma2
+  def found_type
+    return self.class
+  end
+end

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

@@ -0,0 +1,3 @@
+class Arma2Mod < Mod
+  #Code here
+end

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

@@ -0,0 +1,16 @@
+class Arma2OaAppsetting < Arma2Appsetting 
+  DEFAULT_EXE = "arma2oa.exe"
+  DEFAULT_BETA_EXE = "arma2oa.exe"
+  DEFAULT_BETA_EXE_PATH = "expansion/beta"
+  REGKEY = ['SOFTWARE\\Bohemia Interactive Studio\\ArmA 2 OA', 'MAIN']
+
+  def found_type
+    return self.class unless self.real_path
+    # TODO: Alternative ways to figure out the edition? Find arma2.exe? etc
+    if File.directory?(File.join(self.real_path, "Addons")) && File.exists?(File.join(self.real_path, "Addons", "Chernarus.pbo"))
+      Arma2OaCoAppsetting
+    else
+      Arma2OaStAppsetting
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+class Arma2OaCoAppsetting < Arma2OaAppsetting
+  #Code here
+
+# TODO: Evaluate
+# 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_co_mod.rb

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

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

@@ -0,0 +1,3 @@
+class Arma2OaMod < Arma2Mod 
+  #Code here
+end

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

@@ -0,0 +1,3 @@
+class Arma2OaStAppsetting < Arma2OaAppsetting
+  #Code here
+end

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

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

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

@@ -0,0 +1,3 @@
+class Arma2StAppsetting < Arma2Appsetting
+  #Code here
+end

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

@@ -0,0 +1,3 @@
+class Arma2StMod < Arma2Mod
+  #Code here
+end

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

@@ -12,15 +12,43 @@ class Mod < ActiveRecord::Base
 
   six_guid
 
-  def all_dependentmods
-    mods = []
+
+  def all_dependentmods(mods = [])
     self.mods.each do |mod|
+      next if mods.include?(mod)
       mods << mod
-      mods += mod.all_dependentmods
+      mods += mod.all_dependentmods(mods)
     end
     mods.uniq
   end
 
+
+  # arma2 mod: works for all subclasses
+  # armaoa mod; works for arma2-oa-st, arma2-oa-
+  def self.label
+    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
+      e = e.class
+    end
+    types
+  end
+
+  def version_match?(setting)
+    # setting.type == "ArmA2OaSt" (Arma2Oa, ArmA2)
+    # self.type == "ArmA2"
+
+    # 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)
+  end
+
   def real_name
     return unless self.name
     case RUBY_PLATFORM

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

@@ -16,7 +16,16 @@ class Queryserver < ActiveRecord::Base
   end
 
   def to_label
-    "#{self.name} (v#{self.gamever})"
+    "#{self.name} (#{self.game})"
+  end
+
+  def game
+    if self.gamever
+      # TODO: Figure out how to determine Combined Ops or Standalone
+      self.gamever[/^(1\.[0-9]*)/]
+      return nil unless $1
+      $1.to_f < 1.5 ? "A2" : "OA"
+    end
   end
 
   def mods_fetch

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

@@ -6,6 +6,8 @@
       %th Latest
       %th Remote
       %th Changelog
+      %th Type
+      %th Fits edition?
   %tbody
     - mods.each do |mod|
       %tr
@@ -16,3 +18,5 @@
         %td= mod.version
         %td= link_to "Info", "http://updater.dev-heaven.net/mods/show/#{mod.id}", :target => "_blank"
         %td= link_to "Changelog", "http://updater.dev-heaven.net/mods/changelog/#{mod.id}", :target => "_blank"
+        %td= mod.class.label
+        %td= mod.version_match?(@setting)

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

@@ -28,9 +28,9 @@
                 = submit_tag "Sync", :name => "serversync"
               %p
                 %label{ :for => "settings" }
-                  = link_to "Setting", "/appsettings", :title => "Click to access Settings Profiles overview" 
+                  = link_to "Setting", "/appsettings", :title => "Click to access Settings Profiles overview"
                    
-                = record_select_field 'setting', @setting
+                = record_select_field 'setting', @setting, :controller => "Appsettings"
               %p
                 = submit_tag "Execute"
                  
@@ -61,7 +61,7 @@
       %table{ :border => 1, :cellpadding => "5", :width => "100%"}
         %tr
           %td
-            Autoskip: #{@autoskip ? @autoskip : false}. 
+            Edition: #{link_to @setting.nice_found_type, nil, :title => "Supports mods for: #{@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)

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

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

data/lib/six-updater-web/db/migrate/20100520101653_add_type_to_mods_and_appsettings.rb

@@ -0,0 +1,11 @@
+class AddTypeToModsAndAppsettings < ActiveRecord::Migration
+  def self.up
+    add_column :mods, :type, :string
+    add_column :appsettings, :type, :string
+  end
+
+  def self.down
+    remove_column :mods, :type
+    remove_column :appsettings, :type
+  end
+end

data/lib/six-updater-web/db/migrate/20100520101654_add_beta_to_appsettings.rb

@@ -0,0 +1,9 @@
+class AddBetaToAppsettings < ActiveRecord::Migration
+  def self.up
+    add_column :appsettings, :beta, :boolean
+  end
+
+  def self.down
+    remove_column :appsettings, :beta
+  end
+end

data/lib/six-updater-web/db/migrate/20100520101655_add_defaults_to_type.rb

@@ -0,0 +1,11 @@
+class AddDefaultsToType < ActiveRecord::Migration
+  def self.up
+    change_column :appsettings, :type, :string, :default => "Appsetting"
+    change_column :mods, :type, :string, :default => "Mod"
+  end
+
+  def self.down
+    change_column :appsettings, :type, :string, :default => nil
+    change_column :mods, :type, :string, :default => nil
+  end
+end

data/lib/six-updater-web/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100520101652) do
+ActiveRecord::Schema.define(:version => 20100520101655) do
 
   create_table "actions", :id => false, :force => true do |t|
     t.string   "id",         :limit => 36, :null => false
@@ -20,7 +20,7 @@ ActiveRecord::Schema.define(:version => 20100520101652) do
   end
 
   create_table "appsettings", :id => false, :force => true do |t|
-    t.string   "id",         :limit => 36,  :null => false
+    t.string   "id",         :limit => 36,                            :null => false
     t.string   "name"
     t.string   "path"
     t.string   "exe"
@@ -29,6 +29,8 @@ ActiveRecord::Schema.define(:version => 20100520101652) do
     t.datetime "updated_at"
     t.string   "logpath"
     t.string   "modpath"
+    t.string   "type",                      :default => "Appsetting"
+    t.boolean  "beta"
   end
 
   create_table "categories", :id => false, :force => true do |t|
@@ -176,7 +178,7 @@ ActiveRecord::Schema.define(:version => 20100520101652) do
   end
 
   create_table "mods", :id => false, :force => true do |t|
-    t.string   "id",              :limit => 36,                :null => false
+    t.string   "id",              :limit => 36,                    :null => false
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -189,6 +191,7 @@ ActiveRecord::Schema.define(:version => 20100520101652) do
     t.integer  "size",                          :default => 0
     t.integer  "size_wd",                       :default => 0
     t.datetime "updated_version"
+    t.string   "type",                          :default => "Mod"
   end
 
   create_table "mods_networks", :id => false, :force => true do |t|

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

@@ -138,14 +138,17 @@ module Six
     end
 
     module Appsetting
-      # TODO: More generic? Instead of arma specific?
       def path_by_registry
-        SixUpdaterWeb::ARMA_PATH
+        self.class::DEFAULT_PATH
       end
 
       def real_exe
         if exe.nil?
-          "arma2.exe"
+          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}"
+          else
+            self.class::DEFAULT_EXE_PATH.size == 0 ? self.class::DEFAULT_EXE : "#{self.class::DEFAULT_EXE_PATH}/#{self.class::DEFAULT_EXE}"
+          end
         else
           exe
         end
@@ -153,7 +156,7 @@ module Six
 
       def real_params
         if params.nil?
-          "-noSplash -noFilePatching -showScriptErrors"
+          self.class::DEFAULT_PARAMS
         else
           params
         end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 18
-  - 2
-  version: 0.18.2
+  - 19
+  - 0
+  version: 0.19.0
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-10 00:00:00 +02:00
+date: 2010-07-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -156,6 +156,16 @@ files:
 - lib/six-updater-web/app/helpers/system_settings_helper.rb
 - lib/six-updater-web/app/models/action.rb
 - lib/six-updater-web/app/models/appsetting.rb
+- lib/six-updater-web/app/models/arma2_appsetting.rb
+- lib/six-updater-web/app/models/arma2_mod.rb
+- lib/six-updater-web/app/models/arma2_oa_appsetting.rb
+- lib/six-updater-web/app/models/arma2_oa_co_appsetting.rb
+- lib/six-updater-web/app/models/arma2_oa_co_mod.rb
+- lib/six-updater-web/app/models/arma2_oa_mod.rb
+- lib/six-updater-web/app/models/arma2_oa_st_appsetting.rb
+- lib/six-updater-web/app/models/arma2_oa_st_mod.rb
+- lib/six-updater-web/app/models/arma2_st_appsetting.rb
+- lib/six-updater-web/app/models/arma2_st_mod.rb
 - lib/six-updater-web/app/models/category.rb
 - lib/six-updater-web/app/models/log.rb
 - lib/six-updater-web/app/models/logsession.rb
@@ -241,6 +251,9 @@ files:
 - lib/six-updater-web/db/migrate/20100520101650_add_more_indexes.rb
 - lib/six-updater-web/db/migrate/20100520101651_remove_id_from_dependentmods.rb
 - lib/six-updater-web/db/migrate/20100520101652_create_categories.rb
+- lib/six-updater-web/db/migrate/20100520101653_add_type_to_mods_and_appsettings.rb
+- lib/six-updater-web/db/migrate/20100520101654_add_beta_to_appsettings.rb
+- lib/six-updater-web/db/migrate/20100520101655_add_defaults_to_type.rb
 - lib/six-updater-web/db/schema.rb
 - lib/six-updater-web/doc/README_FOR_APP
 - lib/six-updater-web/init.rb