csgolytics 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f2434f9ff05f83a8afa7b24dd8c6a1fdaf1a610
-  data.tar.gz: bf2d50e27143639aa79f24955de772318e055206
+  metadata.gz: cfd544cf0526a07af17ba94586c727afbe6bb06f
+  data.tar.gz: 663ab59eb8eaf0191bf5df3d7a1070bce65a2ca9
 SHA512:
-  metadata.gz: b873048397904601f22ed3357c37c1f405d59e45623c7c0d1ea81c16019a92eda289707afae038863275f987d206dffcb41dc9a2b96368954eeeaab42f6e3059
-  data.tar.gz: 6b8118e920da08db389bd40708986c85256a604c3d6800a98a9c714885fb76719b6686bab421ae1f78f1679a00f6bd081c1895955104fe9c30d005ac89cdc661
+  metadata.gz: 1bc1ea71feed714e6651e21c427860463c7ca96ed32aa66b3ba8b157167c6b63f467a565e51f5e8b47c13ac02cf2c1a1f562dcbd358f09a437b9df5bca61d317
+  data.tar.gz: d60ba7feace7cd6a53663fb6264a93f1c8be05378a790aff36f7e667052eb95b12b011e667182b3fbbd2d22a44b41963f1fc7c51996a45965819e565668ed8a9

data/bin/csgolytics-import

@@ -27,6 +27,10 @@ flag_parser = OptionParser.new do |opts|
     flags[:server_id] = val
   end
 
+  opts.on("--tee=PATH", "/path/to/output.log") do |val|
+    flags[:tee_file] = val
+  end
+
   opts.on("--eventql_host=HOST", "EventQL host") do |val|
     flags[:eventql_host] = val
   end
@@ -64,7 +68,7 @@ end
 
 unless File.directory?(flags[:logdir])
   $stderr.puts "ERROR: #{flags[:logdir]} is not a directory"
-  exit 1
+ exit 1
 end
 
 # init eventql client
@@ -84,7 +88,10 @@ schema_manager = CSGOLytics::SchemaManager.new(
 schema_manager.migrate!
 
 # start feed upload
-feed_upload = CSGOLytics::FeedUpload.new(db, flags[:server_id])
+feed_upload = CSGOLytics::FeedUpload.new(
+    db,
+    flags[:server_id],
+    flags[:tee_file])
 
 # start log reader
 log_reader = CSGOLytics::LogReader.new(flags[:logdir])

data/lib/csgolytics/feed_upload.rb

@@ -12,18 +12,24 @@ class CSGOLytics::FeedUpload
     "assist" => "csgo_assists"
   }
 
-  def initialize(db, server_id = nil)
+  def initialize(db, server_id = nil, tee_file = nil)
     @db = db
     @server_id = server_id
+    @tee_file = tee_file ? File.open(tee_file, "a+") : nil
     @log_parser = CSGOLytics::LogParser.new
   end
 
   def insert_logline(logline, event_id = nil)
+    if @tee_file
+      @tee_file.write(logline + "\n")
+    end
+
     ev = @log_parser.parse(logline)
     unless ev
       return
     end
 
+
     if event_id
       ev[:event_id] = event_id
     else

data/lib/csgolytics/log_parser.rb

@@ -20,8 +20,8 @@ private
 
     m = r.match(line)
     if m
-      attacker_coords = m[:attacker_coords].split
-      victim_coords = m[:victim_coords].split
+      attacker_coords = m[:attacker_coords].split.map(&:to_i)
+      victim_coords = m[:victim_coords].split.map(&:to_i)
 
       return {
         :event => "frag",
@@ -29,18 +29,19 @@ private
         :attacker_name => m[:attacker_name],
         :attacker_steamid => m[:attacker_steamid],
         :attacker_team => normalize_team(m[:attacker_team]),
-        :attacker_coords_x => attacker_coords[0].to_i,
-        :attacker_coords_y => attacker_coords[1].to_i,
-        :attacker_coords_z => attacker_coords[2].to_i,
+        :attacker_coords_x => attacker_coords[0],
+        :attacker_coords_y => attacker_coords[1],
+        :attacker_coords_z => attacker_coords[2],
         :victim_name => m[:victim_name],
         :victim_steamid => m[:victim_steamid],
         :victim_team => normalize_team(m[:victim_team]),
-        :victim_coords_x => victim_coords[0].to_i,
-        :victim_coords_y => victim_coords[1].to_i,
-        :victim_coords_z => victim_coords[2].to_i,
+        :victim_coords_x => victim_coords[0],
+        :victim_coords_y => victim_coords[1],
+        :victim_coords_z => victim_coords[2],
         :weapon => m[:weapon],
         :headshot => !!m[:headshot],
-        :penetrated => !!m[:penetrated]
+        :penetrated => !!m[:penetrated],
+        :distance => euclidean_distance(attacker_coords, victim_coords)
       }
     end
   end
@@ -76,4 +77,8 @@ private
     end
   end
 
+  def euclidean_distance(p1, p2)
+    Math.sqrt((p1[0] - p2[0]) ** 2 + (p1[1] - p2[1]) ** 2 + (p1[2] - p2[2]) ** 2)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csgolytics
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Paul Asmuth