six-updater-web 0.21.5 → 0.21.6

data/Rakefile

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

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

@@ -72,7 +72,8 @@ class Appsetting < ActiveRecord::Base
   end
 
   def get_exe
-    edition = self.detect_edition
+    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}"
@@ -209,9 +210,13 @@ class Appsetting < ActiveRecord::Base
 
   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 nil unless self.real_path
-    #return self.class unless self.real_path
+
+    return nil if self.real_path.nil?
+    return nil unless File.directory?(self.real_path)
+    if self.class::SPECIFIC
+      return self.class if File.exists?(File.join(self.real_path, self.real_exe))
+    end
+    #return self.class if self.class::SPECIFIC
     game = nil
     cond = nil
     ed = nil

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

@@ -1,7 +1,8 @@
 %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(", ")}" }
+      - 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(", ")}" }
       %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.21.5"
+  VERSION = "0.21.6"
   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
-  - 5
-  version: 0.21.5
+  - 6
+  version: 0.21.6
 platform: ruby
 authors: 
 - Sickboy