demo-reader 0.0.2 → 0.1.0

data/lib/demo-reader.rb

@@ -1,15 +1,17 @@
 require "demo_reader_warsow"
+require "demo_reader_defrag"
 
 
 class DemoReader
 
 
-  # tries to parse the given demo file in order to detect a warsow demo
+  # tries to parse the given demo file in order to detect first a warsow,
+  # then a defrag demo
   #
-  # @returns an instance of DemoReaderWarsow or nil on failure
+  # @returns an instance of DemoReaderWarsow or DemoReaderDefrag or nil on failure
   #
   def self.parse(filename)
-    try_warsow(filename)
+    try_warsow(filename) || try_defrag(filename)
   end
 
 
@@ -21,5 +23,11 @@ class DemoReader
     demo.valid ? demo : nil
   end
 
+  def self.try_defrag(filename)
+    demo = DemoReaderDefrag.new(filename)
+
+    demo.valid ? demo : nil
+  end
+
 end
 

data/lib/demo_reader_defrag.rb

@@ -0,0 +1,106 @@
+require 'yaml'
+require 'ext/dm68/dm68'
+
+class DemoReaderDefrag
+  attr_reader :filename, :version, :mapname, :time, :playernames, :scoreboards, :gamemode, :player, :basegamedir, :gamedir, :valid
+
+
+
+  def initialize(filename)
+    @filename = filename
+
+    @version = -1
+    @mapname = nil
+    @time = nil
+    @time_in_msec = nil
+    @playernames = []
+    @scoreboards = []
+    @gamemode = nil
+    @player = nil
+    @basegamedir = nil
+    @gamedir = nil
+    @valid = false
+    @raw = nil
+
+    self.init()
+  end
+
+
+
+  def init
+    out = DM68.parse_file(@filename)
+    @raw = YAML.load(out)
+
+    raise out unless @raw
+
+    @version = @raw['server_info']['protocol'].to_i
+    @mapname = @raw['server_info']['mapname'].downcase
+
+    # @playernames = []
+    @scoreboards = @raw['prints']
+    @basegamedir = @raw['server_info']['gamename']
+    @gamedir = @raw['system_info']['fs_game']
+
+    if @raw['server_info']['defrag_vers'].to_i > 0
+      @gamemode = @raw['server_info']['df_promode'].to_i.zero? ? 'vq3' : 'cpm'
+      @time = extract_time(@raw['prints'])
+      @player = extract_player(@raw['prints'])
+      @playernames << @player # just support one player atm
+    end
+
+    @valid = true
+  end
+
+
+
+  def time_in_msec
+    return @time_in_msec unless @time_in_msec.nil?
+
+    # time str to int
+    if @time.kind_of? String
+      min, sec, msec = @time.scan(/^([0-9]+):([0-9]+)\.([0-9]+)$/).flatten.map { |x| x.to_i }
+      @time_in_msec = msec + sec * 1000 + min * 60 * 1000
+    end
+  end
+
+
+
+  protected
+
+  # extract player from server prints
+  # supports only one player atm otherwise raises an exception
+  #
+  def extract_player(prints)
+    players = prints.inject([]) do |arr,p|
+      arr << $1 if p =~ /^(.+)\^7 reached the finish line/
+      arr << $1 if p =~ /^Time performed by (.+)\^7 :/
+      arr
+    end
+
+    raise "Not only one player was found #{players.inspect}." if players.length != 1
+
+    players.first
+  end
+
+  # extract time from server prints
+  # supports only one time atm otherwise raises an exception
+  #
+  def extract_time(prints)
+    times = prints.inject([]) do |arr,p|
+      arr << $1 if p =~ /(\^[0-9]+:[\^:0-9]+)/
+      arr
+    end
+
+    raise "Not only one time was found #{times.inspect}." if times.length != 1
+
+    time = plain_text(times.first)
+
+    time = "0:#{time}" if time.count(":") < 2
+    "%02d:%02d.%03d" % time.split(":").map(&:to_i)
+  end
+
+  def plain_text(text)
+    text.gsub(/\^\d/, '')
+  end
+end
+

data/lib/demo_reader_warsow.rb

@@ -61,7 +61,7 @@ class DemoReaderWarsow
 
 
     # detect scoreboard
-    #
+
     regex = /scb \"([^\"]+)/
     matchdata = regex.match(content)
 
@@ -73,7 +73,7 @@ class DemoReaderWarsow
 
 
     # detect game mode
-    #
+
     if @version == 11
       @gamemode = gamemode_wd11(content)
     else
@@ -100,7 +100,6 @@ class DemoReaderWarsow
 
 
     # detect time by sent message string with time from server
-    #
     if ['race', 'unknown'].include?(@gamemode)
       matches = []
       regex = /(server record|race finished)(?:!.*(?:current|times\^7 ))?:[0-9:\. ]* (\d+):(\d+)\.(\d+)/im
@@ -120,7 +119,6 @@ class DemoReaderWarsow
 
 
     #detect all player names
-    #
     matches = []
     regex = /cs ([0-9]+) \"\\name\\([^\0]*)\\hand/
     rest_content = content
@@ -146,7 +144,7 @@ class DemoReaderWarsow
 
 
     # detect player
-    #
+
     playernames = @playernames.compact.sort.uniq
     if playernames.length == 1
       @player = playernames.first

data/test/demo_reader_defrag_dm_68_cpm_test.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/helper'
+
+class DemoReaderDefragDm68CpmTest < Test::Unit::TestCase
+
+  version = 68
+  gamemode = "cpm"
+
+  [
+    %w(pornchronostar_mdf.cpm_00.49.216_tyaz.germany pornchronostar 00:49.216 *tyaz*),
+    %w(puremotion_df.cpm_00.10.600_eS-Rody.russia puremotion 00:10.600 ^2eS-Rody)
+  ].each do |entry|
+
+    file, map, time, player = entry
+
+    define_method "test_warsow_wd#{version}_demo_#{file.gsub(/[^a-z_0-9]/, "_")}" do
+      demo = DemoReader.parse("test/fixtures/defrag/dm_#{version}/#{gamemode}/#{file}.dm_#{version}")
+
+      assert demo.valid
+      assert_equal gamemode, demo.gamemode
+      assert_equal version, demo.version
+      assert_equal map, demo.mapname
+      assert_equal player, demo.player
+      assert_equal time, demo.time
+    end
+
+  end
+
+end
+

data/test/demo_reader_defrag_dm_68_vq3_test.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/helper'
+
+class DemoReaderDefragDm68Vq3Test < Test::Unit::TestCase
+
+  version = 68
+  gamemode = "vq3"
+
+  [
+    %w(runkull2_df.vq3_01.05.904_XunderBIRD.Germany runkull2 01:05.904 ^2XunderBIRD),
+    %w(un-dead029_df.vq3_00.16.912_uN-DeaD!WiNTeR.ru un-dead029 00:16.912 ^2uN-DeaD!WiNTeR)
+  ].each do |entry|
+
+    file, map, time, player = entry
+
+    define_method "test_warsow_wd#{version}_demo_#{file.gsub(/[^a-z_0-9]/, "_")}" do
+      demo = DemoReader.parse("test/fixtures/defrag/dm_#{version}/#{gamemode}/#{file}.dm_#{version}")
+
+      assert demo.valid
+      assert_equal gamemode, demo.gamemode
+      assert_equal version, demo.version
+      assert_equal map, demo.mapname
+      assert_equal player, demo.player
+      assert_equal time, demo.time
+    end
+
+  end
+
+end
+

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: demo-reader
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  hash: 27
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - aekym
@@ -9,16 +15,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 +01:00
+date: 2010-08-03 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
-description: A library to read warsow demo files (.wd8, .wd9, .wd10, .wd11 files)
+description: A library to read warsow demo files (.wd8, .wd9, .wd10, .wd11 files) and q3 demo files (*.dm68)
 email: me@aekym.com
 executables: []
 
-extensions: []
-
+extensions: 
+- ext/dm68/extconf.rb
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
@@ -29,11 +35,31 @@ files:
 - Rakefile
 - VERSION
 - demo-reader.gemspec
+- ext/dm68/README.txt
+- ext/dm68/common.c
+- ext/dm68/common.h
+- ext/dm68/dm68.c
+- ext/dm68/dump.c
+- ext/dm68/extconf.rb
+- ext/dm68/huff.c
+- ext/dm68/huff.h
+- ext/dm68/main.c
+- ext/dm68/main.h
+- ext/dm68/msg.c
+- ext/dm68/msg.h
+- ext/dm68/parse.c
 - lib/demo-reader.rb
+- lib/demo_reader_defrag.rb
 - lib/demo_reader_warsow.rb
+- test/demo_reader_defrag_dm_68_cpm_test.rb
+- test/demo_reader_defrag_dm_68_vq3_test.rb
 - test/demo_reader_test.rb
 - test/demo_reader_warsow_wd10_race_test.rb
 - test/demo_reader_warsow_wd11_race_test.rb
+- test/fixtures/defrag/dm_68/cpm/pornchronostar_mdf.cpm_00.49.216_tyaz.germany.dm_68
+- test/fixtures/defrag/dm_68/cpm/puremotion_df.cpm_00.10.600_eS-Rody.russia.dm_68
+- test/fixtures/defrag/dm_68/vq3/runkull2_df.vq3_01.05.904_XunderBIRD.Germany.dm_68
+- test/fixtures/defrag/dm_68/vq3/un-dead029_df.vq3_00.16.912_uN-DeaD!WiNTeR.ru.dm_68
 - test/fixtures/warsow/wd10/racesow_0.42.b2/dinirun2_racesow_0.42.b2.wd10
 - test/fixtures/warsow/wd10/racesow_local/boris.wd10
 - test/fixtures/warsow/wd10/racesow_local/die11.7.wd10
@@ -65,25 +91,33 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A library to read warsow demo files
+summary: A library to read warsow and q3 demo files
 test_files: 
+- test/demo_reader_defrag_dm_68_cpm_test.rb
+- test/demo_reader_defrag_dm_68_vq3_test.rb
 - test/demo_reader_test.rb
 - test/demo_reader_warsow_wd10_race_test.rb
 - test/demo_reader_warsow_wd11_race_test.rb