wowlog 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74586fc9615b447c898db824ac81cf0ad1a76057
-  data.tar.gz: e28e236d49b273fef2536ae38aba233b642e43ee
+  metadata.gz: e7dab1672cfbe4a0a6da2116c1915bf7bc0cb3cf
+  data.tar.gz: 0cb21dccd07d8c24f6b66dc538c40b86af4347e8
 SHA512:
-  metadata.gz: 8c46f7077f4e540585fd8871d3b70ac77a07cebafd4c24ec2d713150cb8aa15cd88d82054b3b6bea48c9b3bf78b13b6aed3a2b6c25ccb0b3759758f25682c420
-  data.tar.gz: 3fd6d1735b83edb8f0163839390e9d11e787e0081bf256bfb64620da927cfa4f506a5dafe236006990970ab8f3ce5fe600e9907d14d0e765cb8e27c1e4e0cd5c
+  metadata.gz: 6af583d926a497ce38534948b0185e6950b15e6c4951d210dbbf18bc9951d5a6b9898758b07f927e32d077e2bf4aac0e99aa16d12cdb78ab19923874be12c47a
+  data.tar.gz: c17b025e15de54ff7dd4b4f3bfc8b72135d24719ae7690aa60cff04d84c973aaafed0f0b2ee8f578c052078dcfa1dd290750607efb0ce81935e6647a9411c100

data/ChangeLog

@@ -0,0 +1,12 @@
+2014-09-14 Masayoshi Mizutani <muret@haeena.net>
+	* v0.2.0 Release
+	* wl_extract_encount: Changed output message format
+	* wl_extract_encount: Added "-o" option to specify output directory
+	* wl_extract_encount: Added "-m" option to output as Msgpack encode
+	* wowlog.rb: Fixed to parse a log line that has double quatation
+
+2014-07-26 Masayoshi Mizutani <muret@haeena.net>
+	* v0.1.2 Release
+
+2014-07-13 Masayoshi Mizutani <muret@haeena.net>
+	* v0.1.1 Release

data/bin/wl_extract_encount

@@ -26,35 +26,76 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 require 'wowlog'
 require 'pp'
+require 'time'
+require 'optparse'
+require 'msgpack'
 
+out_encode = false
+out_dir = './'
 psr = Wowlog::Parser.new
 
-File.open(ARGV[0], 'r') { |fd|
-  out_fd = nil
-  fname = nil
-  fd.each { |line|
-    ev = psr.parse_line(line)
-
-    if ev['event'] == 'ENCOUNTER_START'
-      enc_name = ev['encounterName'].gsub(/\s/, '_')
-      ts = ev['timestamp'].to_i
-      fname = "WowCombatLog_#{ts}_#{enc_name}_#{ev['groupSize']}man.txt"
-      out_fd = File.open(fname, "w")
-      puts "Open: #{fname}"
-    end
-
-    if !(out_fd.nil?)
-      out_fd.write(line)
-    end
-
-    if ev['event'] == 'ENCOUNTER_END'
-      puts "Close: #{fname}"
-      out_fd.close
-      out_fd = nil
-    end
-  }
-}
+optpsr = OptionParser.new
+optpsr.on('-m', 'output as msgpack encode') { |v| out_encode = v }
+optpsr.on('-o VAL', 'output directory') { |val| out_dir = val }
+argv = optpsr.parse(ARGV)
+
+argv.each do |log_file|
+  File.open(log_file, 'r') { |fd|
+    out_fd = nil
+    fname = nil
+    STDOUT.sync = true
+    ev_count = nil
+    base_ts = nil
+
+    fd.each { |line|
+      ev = psr.parse_line(line)
+
+      if ev['event'] == 'ENCOUNTER_START'
+        # Set counting paramters.
+        ev_count = 0
+        base_ts = ev['timestamp']
+
+        # Covert timestamp to YYYYMMDD_HHMMSS format.
+        enc_name = ev['encounterName'].gsub(/\s/, '_')
+        dt = Time.at(ev['timestamp']).to_s.split(/\s/)
+        dt_s = [dt[0].split('-').join(''), dt[1].split(':').join('')].join('_')
 
+        # Open file, selecting extension by encoding.
+        ext = (out_encode) ? 'msg' : 'txt'
+        fname = "WoWCombatLog_#{dt_s}_#{enc_name}_#{ev['groupSize']}man.#{ext}"
+        fpath = File.join(out_dir, fname)
+        out_fd = File.open(fpath, (out_encode ? 'wb' : 'w'))
+        print "Extracting #{fpath}... "
+      end
+
+      # Count up.
+      ev_count += 1 unless ev_count.nil?
+
+      unless out_fd.nil?
+        if out_encode
+          out_fd.write(ev.to_msgpack)
+        else
+          out_fd.write(line)
+        end
+      end
+
+      # Closing combat file with ENCOUNTER_END event.
+      if ev['event'] == 'ENCOUNTER_END'
+        unless ev_count.nil?
+          duration = ev['timestamp'] - base_ts
+          puts "done (%d events, %d seconds)" % [ev_count, duration]
+        else
+          puts "done (no ENCOUNTER_START event)"
+        end
+
+        # Reset counter and file parameters.
+        ev_count = nil
+        base_ts = nil
+        out_fd.close
+        out_fd = nil
+      end
+    }
+  }
+end

data/lib/wowlog.rb

@@ -468,6 +468,7 @@ module Wowlog
 
       # rebuild CSV part
       csv_txt = terms[2..-1].join(' ')
+      csv_txt.gsub!('\\"', '""')
       cols = CSV.parse(csv_txt)[0]
 
       # parse CSV part

data/lib/wowlog/version.rb

@@ -1,3 +1,3 @@
 module Wowlog
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wowlog
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Masayoshi Mizutani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-26 00:00:00.000000000 Z
+date: 2014-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,6 +64,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ChangeLog
 - Gemfile
 - LICENSE.txt
 - README.md