kag-gather 1.4.13 → 1.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjI5MjRkMGYwMjkwYWZlMjBiMjUyNGYwZTEwYTQ3OTY1NDVmZjQ5OA==
+    MmIxMGZmM2M3M2FmNjRjOTMyODQ4ZDFlMzRiYjEzZTZkYjQwM2NhMQ==
   data.tar.gz: !binary |-
-    NzZmMjRkZTNkYzY1NmJiYmRiMDEzMDk1ZTIxOGU4ZTNiNmM2YTAwMA==
+    NmRjYWFhMzM2NTY3ZTI3ZmQ0MjZkOGMxM2VhN2E4M2Y0MjY3YTkxNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWQ3ZDQzNTc2Y2U1ZmVjZjAyZjNiZTc5YzllNjI3MmZiODZlNDdhMzc3ZTc2
-    NWMyM2JhZjg1Nzk1ZTA1N2VkZWNmNTJmZWRlZjJiMTFmZDA1ZWJkNDIwNjll
-    NDI0Nzk3NzJiZWZkNDE3YzJkYTcyMGUyNDE2YWJjZWMyNDU3Zjc=
+    YTdmZmY3ZGUzZTc0Mzg4MjMyM2M4Y2RmYjcwNjgyOThlNWIwMmRhOTZlOGU0
+    NWNhZGVhN2E0OWJjNWQ1MDRiYTk2MWQ2YjkxOTRjNjFhYTgzMTk2OWRlNjY0
+    MjYxMGJhN2ZhNjk1N2Q1YWQ1YWIyYjBhOTJjYmI5NWIxNDJmY2U=
   data.tar.gz: !binary |-
-    ZjM3NDEwYmNiMGI1ODMwYjNlZDQyNzJkZThiYjgzMzhhOWM0YmVjOWM2OWQw
-    Y2EzZWFmZjljMjM2MmExMjMyYWFkMTBmOGNhMWE4MjczNGEwNTcwMmNjMWM2
-    MGQzY2M2NzEzYjU2ZWUxMmE3OTI3Y2VlNWY4ZTRlOTgzYTBmMDM=
+    MDVlOWU3NDA0YTRhYWNhOTFhYWZhZTViYThhMjEzYWQxZjBkOGQxM2JmZWY1
+    Mzk4YmZkZjc2MGYwZDhjMzg0MzdmZTJjYTk2ZTFkODUxYmQwYjU5ZmRkNDI0
+    Nzc4NDY3MjQwNDA1ODA0ZDU5Y2VlODI0YjliMWE0NDZiN2I2ZWY=

data/lib/kag/bot/bot.rb

@@ -8,6 +8,7 @@ require 'kag/irc/plugin'
 require 'kag/bot/plugin'
 require 'kag/user/plugin'
 require 'kag/help/plugin'
+require 'kag/stats/plugin'
 require 'commands/help'
 
 module KAG
@@ -32,7 +33,8 @@ module KAG
               KAG::Bans::Plugin,
               KAG::IRC::Plugin,
               KAG::User::Plugin,
-              KAG::Help::Plugin
+              KAG::Help::Plugin,
+              KAG::Stats::Plugin
             ]
             if config[:sasl]
               c.sasl.username = config[:sasl][:username]

data/lib/kag/gather/match.rb

@@ -4,6 +4,7 @@ require 'symboltable'
 require 'kag/config'
 require 'kag/gather/team'
 require 'kag/user/user'
+require 'kag/stats/main'
 
 module KAG
   module Gather
@@ -65,6 +66,7 @@ module KAG
         self[:subs_needed] = []
         setup_teams
         restart_map
+        KAG::Stats::Main.add_stat(:matches_started)
       end
 
       def text_for_match_start
@@ -109,6 +111,8 @@ module KAG
 
       def cease
         if self.server
+          self.archive
+          KAG::Stats::Main.add_stat(:matches_completed)
           if self.server.has_rcon?
             self.teams.each do |team|
               team.kick_all
@@ -155,6 +159,7 @@ module KAG
         if needs_sub?
           placement = self[:subs_needed].shift
           KAG::User::User.add_stat(user,:substitutions)
+          KAG::Stats::Main.add_stat(:substitutions_done)
         end
         placement
       end
@@ -164,6 +169,35 @@ module KAG
           puts msg
         end
       end
+
+      def archive
+        match = self.dup
+        match[:server] = self.server[:key]
+        ts = []
+        match.teams.each do |team|
+          ts << {:players => team.teammates,:color => team[:color],:name => team[:name]}
+        end
+        match[:teams] = ts
+        match.delete(:players)
+        match.delete(:bot) if match.key?(:bot)
+
+        unless File.exists?("data/matches.json")
+          File.open("data/matches.json","w") {|f| f.write("{}") }
+        end
+
+        data = Hash.new
+        d = ::IO.read("data/matches.json")
+        if d and !d.empty?
+          data = Hash.new
+          data.merge!(JSON.parse(d))
+        end
+
+        data[Time.now.to_s] = match
+        File.open("data/matches.json","w") do |f|
+          f.write(data.to_json)
+        end
+        true
+      end
     end
   end
 end

data/lib/kag/gather/plugin.rb

@@ -75,6 +75,7 @@ module KAG
       def add(m)
         unless is_banned?(m.user)
           KAG::User::User.add_stat(m.user,:adds)
+          KAG::Stats::Main.add_stat(:adds)
           add_user_to_queue(m,m.user)
         end
       end
@@ -89,6 +90,7 @@ module KAG
             send_channels_msg "#{m.user.authname} has left the match at #{match.server[:key]}! You can sub in by typing !sub"
           elsif @queue.has_player?(m.user)
             KAG::User::User.add_stat(m.user,:rems)
+            KAG::Stats::Main.add_stat(:rems)
             unless remove_user_from_queue(m.user)
               debug "#{m.user.authname} is not in the queue."
             end

data/lib/kag/stats/main.rb

@@ -0,0 +1,60 @@
+module KAG
+  module Stats
+    class Main < Hash
+      include Singleton
+
+      def initialize(hash=nil)
+        super
+        self.merge!(self._load)
+      end
+
+      def _load
+        unless File.exists?("data/index.json")
+          return {}
+        end
+        f = ::IO.read("data/index.json")
+        if f and !f.empty?
+          SymbolTable.new(JSON.parse(f))
+        else
+          SymbolTable.new
+        end
+      end
+
+      def reload
+        puts "Reloading stats.main file..."
+        self.merge!(self._load)
+      end
+
+      # Sets the value of the given +key+ to +val+.
+      def store(key, val)
+        super(key,val)
+        self.save
+      end
+
+      def save
+        File.open("data/index.json","w") do |f|
+          f.write(self.to_json)
+        end
+      end
+
+      def self.add_stat(stat,increment = 1)
+        stat = stat.to_sym
+        s = KAG::Stats::Main.instance
+        s[stat] = 0 unless s[stat]
+        s[stat] = s[stat].to_i + increment.to_i
+        s.save
+      end
+
+      def self.subtract_stat(stat,decrement = 1)
+        stat = stat.to_sym
+        s = KAG::Stats::Main.instance
+        if s[stat]
+          s[stat] = s[stat].to_i - decrement.to_i
+        else
+          s[stat] = 0
+        end
+        s.save
+      end
+    end
+  end
+end

data/lib/kag/stats/plugin.rb

@@ -0,0 +1,21 @@
+require 'cinch'
+require 'kag/common'
+require 'commands/help'
+require 'kag/user/user'
+require 'kag/stats/main'
+
+module KAG
+  module Stats
+    class Plugin
+      include Cinch::Plugin
+      include Cinch::Commands
+      include KAG::Common
+
+      command :stats,{},
+        summary: "Get the gather-wide stats"
+      def stats(m)
+        reply m,KAG::Stats::Main.instance.to_s
+      end
+    end
+  end
+end

data/lib/kag/user/user.rb

@@ -23,7 +23,7 @@ module KAG
       end
 
       def save
-        File.open("data/#{self.authname}.json","w") do |f|
+        File.open("data/user/#{self.authname}.json","w") do |f|
           f.write(self.to_json)
         end
       end
@@ -57,11 +57,11 @@ module KAG
       def _load
         return {} unless self[:authname]
 
-        unless File.exists?("data/#{self[:authname]}.json")
-          File.open("data/#{self[:authname]}.json","w") {|f| f.write("{}") }
+        unless File.exists?("data/user/#{self[:authname]}.json")
+          File.open("data/user/#{self[:authname]}.json","w") {|f| f.write("{}") }
         end
 
-        f = ::IO.read("data/#{self[:authname]}.json")
+        f = ::IO.read("data/user/#{self[:authname]}.json")
         if f and !f.empty?
           SymbolTable.new(JSON.parse(f))
         else

data/lib/kag/version.rb

@@ -1,5 +1,5 @@
 module KAG
-  VERSION = '1.4.13'
+  VERSION = '1.5.0'
   def self.version
     VERSION
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kag-gather
 version: !ruby/object:Gem::Version
-  version: 1.4.13
+  version: 1.5.0
 platform: ruby
 authors:
 - Shaun McCormick
@@ -135,6 +135,8 @@ files:
 - lib/kag/help/plugin.rb
 - lib/kag/irc/plugin.rb
 - lib/kag/server.rb
+- lib/kag/stats/main.rb
+- lib/kag/stats/plugin.rb
 - lib/kag/user/plugin.rb
 - lib/kag/user/user.rb
 - lib/kag/version.rb