six-updater-web 0.21.1 → 0.21.2

data/Rakefile

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

@@ -264,7 +264,7 @@ class MainController < ApplicationController
       @msg << "<br /><b>WARNING:</b> There seem to be open arma processes: #{setting.real_exe}<br />Pids: #{procs}"
     end
 
-    preset.all_mods(server).each do |mod|
+    preset.all_mods(server, setting).each do |mod|
       mod.update_version(setting.real_path) # TODO: this already runs in updater_yml, but there doesn't run if autoskip is disabled
       if reset && !@autoskip
         mod.skip = false

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

@@ -49,7 +49,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.join(";")
+      hash[:mods] = self.found_type::DEFAULT_BETA_MODS.map{|e| e.gsub("/", "\\")}.join(";")
     end
     hash
   end

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

@@ -7,7 +7,7 @@ class Arma2OaAppsetting < Arma2Appsetting
   DEFAULT_BETA_EXE_PATH = "expansion/beta"
   DEFAULT_SERVER_EXE = "arma2oaserver.exe"
   DEFAULT_SERVER_EXE_PATH = DEFAULT_EXE_PATH
-  DEFAULT_BETA_MODS = ["expansion\\beta", "expansion\\beta\\expansion"]
+  DEFAULT_BETA_MODS = ["expansion/beta", "expansion/beta/expansion"]
 
   REGKEYS = {"Arma2Oa" => ['SOFTWARE\\Bohemia Interactive Studio\\ArmA 2 OA', 'MAIN']}
 

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

@@ -14,10 +14,17 @@ class Sixconfig < ActiveRecord::Base
     end
   end
 
-  def all_mods(srv = self.get_server)
+  def all_mods(srv = self.get_server, setting = Appsetting.new)
     m = []
     m += srv.mods if srv
     self.mods.each { |mod| m << mod unless m.include?(mod) }
+    if setting.beta
+      setting.found_type::DEFAULT_BETA_MODS.each do |mf|
+        mod = Mod.find_by_name(mf)
+        next unless mod
+        m << mod unless m.include?(mod)
+      end
+    end
     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 } 
@@ -94,7 +101,7 @@ class Sixconfig < ActiveRecord::Base
 
     setting = Appsetting.new unless setting
 
-    self.all_mods(srv).each do |mod|
+    self.all_mods(srv, setting).each do |mod|
       if force
         mod.skip = false
       else
@@ -130,7 +137,7 @@ class Sixconfig < ActiveRecord::Base
     hash = setting.to_updater_yml
     hash[:folders] = []
 
-    self.all_mods(srv).each do |mod|
+    self.all_mods(srv, setting).each do |mod|
       y = mod.to_updater_yml
       hash[:folders] << y unless hash[:folders].include?(y)
     end

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

@@ -22,7 +22,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.21.1"
+  VERSION = "0.21.2"
   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
   - 21
-  - 1
-  version: 0.21.1
+  - 2
+  version: 0.21.2
 platform: ruby
 authors: 
 - Sickboy