six-updater-web 0.23.1 → 0.23.2

data/Rakefile

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

@@ -18,6 +18,12 @@ class MainController < ApplicationController
     @inweb = @system_setting.inweb
     @queryserver = Queryserver.new
 
+    if params[:kill]
+      procs = params[:kill].split(",")
+      procs.each { |entry| Six::Appmanager.kill(entry.to_i); @msg << "Process killed: #{entry}" }  #  @msg << "Process to be killed: #{entry}";
+      sleep 1 
+    end
+
     if @system_setting.synchronized_at
       ok = false if @system_setting.synchronized_at > 30.minutes.ago
     end
@@ -269,10 +275,7 @@ class MainController < ApplicationController
       end
     end
 
-    procs = setting.processes
-    unless procs.empty?
-      @error << "<b>WARNING:</b> There seem to be open arma processes: #{setting.real_exe} - Pids: #{procs}"
-    end
+    @procs = setting.processes
 
     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
@@ -304,6 +307,7 @@ class MainController < ApplicationController
       end
     end
 
+    @setting_used = setting
     case params["commit"].downcase
       when "edit preset"
         redirect_to "/sixconfigs/edit/#{preset.id}"
@@ -350,10 +354,9 @@ class MainController < ApplicationController
         @msg << "Saved six-updater.yml!"
         @msg << "<b>A window should open displaying the update process progress</b>"
 
-      when "app manager"
-        #setting.processes.each { |entry| @msg << "Process to be killed: #{entry}" }
-        #setting.kill!
-        @pm = true
+      when "stop game"
+        setting.kill!.each { |entry| @msg << "Process killed: #{entry}" }
+        sleep 1
 
       when "read mods"
         Mod.read_modfolders(setting)
@@ -366,19 +369,6 @@ class MainController < ApplicationController
     act(setting, preset, action, server)
   end
 
-  def pm
-    @setting = Appsetting.find(params[:setting])
-    @msg = []
-    if params[:kill_all]
-      @setting.processes.each { |entry| @msg << "Process to be killed: #{entry}" }
-      @setting.kill!
-    end
-    if params[:kill]
-      procs = params[:kill].split(",")
-      procs.each { |entry| @msg << "Process to be killed: #{entry}"; Six::Appmanager.kill(entry) }
-    end
-  end
-
   def fetch
     @system_setting = SystemSetting.singleton
     setting = nil

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

@@ -261,8 +261,12 @@ class Appsetting < ActiveRecord::Base
     File.basename(ex)
   end
 
+  def full_path
+    File.dirname(File.join(self.real_path, self.real_exe)).gsub("\\", "/")
+  end
+
   def processes
-    Six::Appmanager.find_process(process_name, self.real_path)
+    Six::Appmanager.find_process(self.process_name, self.full_path)
   end
 
   def read_logfile
@@ -270,7 +274,7 @@ class Appsetting < ActiveRecord::Base
   end
 
   def kill!
-    Six::Appmanager.kill_by_name(process_name, self.real_path)
+    Six::Appmanager.kill_by_name(self.process_name, self.full_path)
   end
 
   def rpt

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

@@ -51,7 +51,7 @@
            
           = submit_tag "Save"
            
-          = submit_tag "App Manager"
+          = submit_tag "Stop game"
            
           = submit_tag "Edit Userconfig"
         %p

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

@@ -1,7 +1,9 @@
-Process Manager
+Warning - Open processes
+=# link_to "Kill all", "/main/pm/?setting=#{@setting_used.id}&kill_all=true"
 %br
-= link_to "Kill all", "/main/pm/?setting=#{@setting.id}&kill_all=true"
-- @setting.processes.each do |p|
-  = p
-  = link_to "Kill", "/main/pm/?setting=#{@setting.id}&kill=#{p}"
-  %br
+%lu
+  - @procs.each do |p|
+    %li
+      = p
+      \-
+      = link_to "Kill", "/main/?kill=#{p}"

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

@@ -13,43 +13,43 @@
         %br
         #{params[:commit]}
       - if @msg.size > 0
-        %br
         %div{:class => "green"}
           %ul
             - @msg.each do |m|
               %li= m
       - if @error.size > 0
-        %br
         %div{:class => "red"}
           %ul
             - @error.each do |e|
               %li= e
+      - if @procs.size > 0
+        %div{:class => "red"}
+          = render :partial => "main/pm"
 %table{ :border => 1, :cellpadding => "5", :width => "100%"}
   %tr
     %td
-      - if (@check.size + @skip.size + @install.size + @disabled.size + @special.size) > 0
-        - if @check.size > 0
-          %b To be checked
-          %br
-          = render :partial => "check", :locals => {:mods => @check}
-          %br
-        - if @skip.size > 0
-          %b To be skipped
-          %br
-          = render :partial => "check", :locals => {:mods => @skip}
-          %br
-        - if @install.size > 0
-          %b Not installed
-          %br
-          = render :partial => "check", :locals => {:mods => @install}
-          %br
-        - if @special.size > 0
-          %b Special (Hover over modname to see why)
-          %br
-          = render :partial => "check", :locals => {:mods => @special}
-          %br
-        - if @disabled.size > 0
-          %b Disabled
-          %br
-          = render :partial => "check", :locals => {:mods => @disabled}
-          %br
+      - if @check.size > 0
+        %b To be checked
+        %br
+        = render :partial => "check", :locals => {:mods => @check}
+        %br
+      - if @skip.size > 0
+        %b To be skipped
+        %br
+        = render :partial => "check", :locals => {:mods => @skip}
+        %br
+      - if @install.size > 0
+        %b Not installed
+        %br
+        = render :partial => "check", :locals => {:mods => @install}
+        %br
+      - if @special.size > 0
+        %b Special (Hover over modname to see why)
+        %br
+        = render :partial => "check", :locals => {:mods => @special}
+        %br
+      - if @disabled.size > 0
+        %b Disabled
+        %br
+        = render :partial => "check", :locals => {:mods => @disabled}
+        %br

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

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

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

@@ -49,7 +49,10 @@ module Six
     # TODO: Kill by ... multiple properties. gamefolder, etc.
 
     def kill_by_name(name, path = nil)
-      find_process(name, path).each { |process| kill(process) }
+      procs = find_process(name, path)
+      logger.debug "Procs: #{procs}"
+      procs.each { |process| kill(process) }
+      procs
     end
 
     def find_process(name, path)
@@ -66,6 +69,7 @@ module Six
                 reg = /([0-9]*)$/
                 line[reg]
                 pid = $1
+                next if pid.nil?
                 line.sub!(reg, "")
                 line.strip!
                 line[/^([\w ]*\.\w*)[ ]*(.*)/]
@@ -74,13 +78,14 @@ module Six
 
                 case image.downcase
                   when name.downcase
+                    pid = pid.to_i
+                    next unless pid > 0
                     unless path && !full.nil?
                       pids << pid
                       next
                     end
-                    logger.info File.join(path, name).sub("/", "\\").downcase
-                    logger.info full.downcase
-                    if File.join(path, name).sub("/", "\\").downcase == full.downcase
+                    logger.debug "Full: #{full.downcase}"
+                    if File.join(path, name).gsub("/", "\\").downcase == full.downcase
                       pids << pid
                     end
                 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 23
-  - 1
-  version: 0.23.1
+  - 2
+  version: 0.23.2
 platform: ruby
 authors: 
 - Sickboy