six-updater-web 0.19.5 → 0.19.6

data/Rakefile

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

@@ -12,6 +12,7 @@ class AppsettingsController < ApplicationController
       :params,
       :sixconfigs,
       :beta,
+      :server,
       :type,
 #      :created_at,
       :updated_at
@@ -22,7 +23,7 @@ class AppsettingsController < ApplicationController
 
     config.list.sorting = { :name => :asc }
 
-    [:name, :exe, :path, :modpath, :logpath, :params, :beta].each do |column|
+    [:name, :exe, :path, :modpath, :logpath, :params, :beta, :server].each do |column|
       config.columns[column].inplace_edit = true
     end
   end

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

@@ -192,7 +192,7 @@ class MainController < ApplicationController
     end
 
     if preset
-      @msg << "Using preset: #{preset.name}"
+      @msg << "Using preset: <a href='/sixconfigs/edit/#{preset.id}' title='#{preset.mods.map{|e| e.name}.join(", ")}'>#{preset.name}</a>"
     else
       @msg << "No preset selected!"
       act(setting, preset, action, server)
@@ -201,21 +201,21 @@ class MainController < ApplicationController
 
     unless params["all"]
       if server
-        @msg << "Override server: #{server.name}"
+        @msg << "Override server: <a href='/queryservers/edit/#{queryserver.id}' title='#{queryserver.mods.map{|e| e.name}.join(", ")}'>#{queryserver.to_label}</a>"
       else
         if preset.server
           server = preset.server
-          @msg << "Preset server: #{server.name}"
+          @msg << "Preset server: <a href='/servers/edit/#{server.id}' title='#{server.mods.map{|e| e.name}.join(", ")}'>#{server.to_label}"
         end
       end
     end
 
     if setting
-      @msg << "Override settings profile: #{setting.name}"
+      @msg << "Override settings profile: <a href='/appsettings/edit/#{setting.id}' title='#{setting.real_exe} #{setting.real_params}'>#{setting.label}</a>"
     else
       if preset.appsetting
         setting = preset.appsetting
-        @msg << "Preset settings profile: #{setting.name}"
+        @msg << "Preset settings profile: <a href='/appsettings/edit/#{setting.id}' title='#{setting.real_exe} #{setting.real_params}'>#{setting.label}</a>"
       end
     end
 

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

@@ -1,7 +1,4 @@
 class Appsetting < ActiveRecord::Base
-  # FIXME: This should be done automatically
-  include Six::Appmanager::Appsetting
-
   has_many :sixconfigs
   six_guid
 
@@ -20,6 +17,9 @@ class Appsetting < ActiveRecord::Base
   DEFAULT_EXE_PATH = ""
   DEFAULT_BETA_EXE = "arma2.exe"
   DEFAULT_BETA_EXE_PATH = "beta"
+  DEFAULT_SERVER_EXE = "arma2server.exe"
+  DEFAULT_SERVER_EXE_PATH = DEFAULT_EXE_PATH
+
   # TODO: Auto beta mod even?
   DEFAULT_PARAMS = "-showScriptErrors -noSplash -noFilePatching"
   DEFAULT_MODS_PARAM = "-mod=" # TODO
@@ -49,6 +49,14 @@ class Appsetting < ActiveRecord::Base
     hash
   end
 
+  def label
+    ar = []
+    return self.name unless self.beta || self.server
+    ar << "Beta" if self.beta
+    ar << "Server" if self.server
+    "#{self.name} (#{ar.join(", ")})"
+  end
+
   def self.label
     #self.to_s.sub("Appsetting", "")
     self::FRIENDLY_NAME
@@ -58,7 +66,107 @@ class Appsetting < ActiveRecord::Base
     self.to_s.sub("Appsetting", "")
   end
 
+  def get_exe
+    edition = self.detect_edition
+    if self.server
+      edition::DEFAULT_SERVER_EXE_PATH.size == 0 ? edition::DEFAULT_SERVER_EXE : "#{edition::DEFAULT_SERVER_EXE_PATH}/#{edition::DEFAULT_SERVER_EXE}"
+    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
+    end
+  end
+
+  def path_by_registry
+    self.class::DEFAULT_PATH
+  end
+
+  def real_exe
+    if self.exe.nil?
+      self.get_exe
+    else
+      self.exe
+    end
+  end
+
+  def real_params
+    if self.params.nil?
+      self.detect_edition::DEFAULT_PARAMS
+    else
+      self.params
+    end
+  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
+  end
+
+  def real_path
+    if self.path.nil?
+      self.path_by_registry
+    else
+      self.path
+    end
+  end
+
+  def real_modpath
+    if self.modpath.nil?
+      self.real_path
+    else
+      self.modpath
+    end
+  end
+
+  def process_name
+    if self.exe
+      if self.exe[FOLDER]
+        $2
+      else
+        self.exe
+      end
+    else
+      self.get_exe
+    end
+  end
+
+  def processes
+    Six::Appmanager.find_process(process_name)
+  end
+
+  def read_logfile
+    Six::Appmanager.read_logfile logfile unless logfile.nil?
+  end
+
+  def kill!
+    Six::Appmanager.kill_by_name(process_name)
+  end
+
+  def rpt
+    process_name[/(.*)\./]
+    "#{$1}.rpt"
+  end
+
+  def logfile
+    if FileTest.directory? real_logpath
+      File.join(real_logpath, rpt) if FileTest.exist?(File.join(real_logpath, rpt))
+    else
+      nil
+    end
+  end
+
   def detect_edition
+    # TODO: Read the appsetting.exe to figure out an edition, as a static setting by the user?
     return self.class if self.class::SPECIFIC
     return self.class unless self.real_path
     game = nil

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

@@ -5,6 +5,9 @@ class Arma2OaAppsetting < Arma2Appsetting
   DEFAULT_EXE = "arma2oa.exe"
   DEFAULT_BETA_EXE = "arma2oa.exe"
   DEFAULT_BETA_EXE_PATH = "expansion/beta"
+  DEFAULT_SERVER_EXE = "arma2oaserver.exe"
+  DEFAULT_SERVER_EXE_PATH = DEFAULT_EXE_PATH
+
   REGKEYS = {"Arma2Oa" => ['SOFTWARE\\Bohemia Interactive Studio\\ArmA 2 OA', 'MAIN']}
 
   FAMILY = Hash.new
@@ -14,5 +17,4 @@ class Arma2OaAppsetting < Arma2Appsetting
 #    return self.class unless self.real_path
 #    self.detect_edition
 #  end
-
 end

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

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

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

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

data/lib/six-updater-web/db/migrate/20100520101656_add_server_to_appsettings.rb

@@ -0,0 +1,9 @@
+class AddServerToAppsettings < ActiveRecord::Migration
+  def self.up
+    add_column :appsettings, :server, :boolean
+  end
+
+  def self.down
+    remove_column :appsettings, :server
+  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 => 20100520101655) do
+ActiveRecord::Schema.define(:version => 20100520101656) do
 
   create_table "actions", :id => false, :force => true do |t|
     t.string   "id",         :limit => 36, :null => false
@@ -31,6 +31,7 @@ ActiveRecord::Schema.define(:version => 20100520101655) do
     t.string   "modpath"
     t.string   "type",                      :default => "Appsetting"
     t.boolean  "beta"
+    t.boolean  "server"
   end
 
   create_table "categories", :id => false, :force => true do |t|

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

@@ -17,18 +17,6 @@ case RUBY_PLATFORM
 end
 
 module Six
-  module Bla
-    # Prepared
-    class << self
-      attr_accessor :process
-
-      def process
-        begin
-          @process rescue nil
-        end
-      end
-    end
-  end
   module Appmanager
     FOLDER = /(.*)\/(.*)/
 
@@ -136,98 +124,6 @@ module Six
         'Error while reading logfile!'
       end
     end
-
-    module Appsetting
-      def path_by_registry
-        self.class::DEFAULT_PATH
-      end
-
-      def real_exe
-        if exe.nil?
-          if self.beta
-            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.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
-        end
-      end
-
-      def real_params
-        if params.nil?
-          self.detect_edition::DEFAULT_PARAMS
-        else
-          params
-        end
-      end
-
-      def real_logpath
-        if logpath.nil?
-          case RUBY_PLATFORM
-            when /-mingw32$/, /-mswin32$/
-              "#{File.join(ENV['USERPROFILE'], 'appdata', 'local', 'arma 2')}"
-            else
-              nil
-          end
-        else
-          logpath
-        end
-      end
-
-      def real_path
-        if path.nil?
-          path_by_registry
-        else
-          self.path
-        end
-      end
-
-      def real_modpath
-        if self.modpath.nil?
-          self.real_path
-        else
-          self.modpath
-        end
-      end
-
-      def process_name
-        if exe
-          if exe[FOLDER]
-            $2
-          else
-            exe
-          end
-        else
-          'arma2.exe'
-        end
-      end
-
-      def processes
-        Six::Appmanager.find_process(process_name)
-      end
-
-      def read_logfile
-        Six::Appmanager.read_logfile logfile unless logfile.nil?
-      end
-
-      def kill!
-        Six::Appmanager.kill_by_name(process_name)
-      end
-
-      def rpt
-        process_name[/(.*)\./]
-        "#{$1}.rpt"
-      end
-
-      def logfile
-        if FileTest.directory? real_logpath
-          File.join(real_logpath, rpt) if FileTest.exist?(File.join(real_logpath, rpt))
-        else
-          nil
-        end
-      end
-    end
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 19
-  - 5
-  version: 0.19.5
+  - 6
+  version: 0.19.6
 platform: ruby
 authors: 
 - Sickboy
@@ -254,6 +254,7 @@ files:
 - 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/migrate/20100520101656_add_server_to_appsettings.rb
 - lib/six-updater-web/db/schema.rb
 - lib/six-updater-web/doc/README_FOR_APP
 - lib/six-updater-web/init.rb