demo-reader 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/demo-reader.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{demo-reader}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["aekym"]
-  s.date = %q{2010-11-01}
+  s.date = %q{2010-12-19}
   s.description = %q{A library to read warsow demo files (.wd8, .wd9, .wd10, .wd11 files) and q3 demo files (*.dm68)}
   s.email = %q{me@aekym.com}
   s.extensions = ["ext/dm68/extconf.rb"]
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
      "lib/demo_reader_warsow.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/cyfio-df_mdf.vq3_06.25.832_rlxmini.CountryHere.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",

data/lib/demo_reader_defrag.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'dm68'
+require 'active_support/core_ext/object'
 
 class DemoReaderDefrag
   attr_reader :filename, :version, :mapname, :time, :playernames, :scoreboards, :game, :gamemode, :player, :basegamedir, :gamedir, :valid
@@ -37,15 +38,17 @@ class DemoReaderDefrag
     @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'])
+
+      time_hint = extract_time_from_filename(@filename)
+      @time = extract_time(@raw['prints'], time_hint)
+
+      @player = extract_player(@raw['prints'], @time)
       @playernames << @player # just support one player atm
     end
 
@@ -68,40 +71,71 @@ class DemoReaderDefrag
 
   protected
 
+  def guessable_time(time)
+    time = time.sub(/^[0:\.]*/, "") # remove empty min, sec, etc
+    parts = time.split(/\.|:/).map(&:to_i)
+
+    format_str = case parts.size
+    when 3 then "%d:%02d:%03d"
+    when 2 then "%02d:%03d"
+    end
+
+    format_str % parts
+  end
+
   # extract player from server prints
   # supports only one player atm otherwise raises an exception
   #
-  def extract_player(prints)
+  def extract_player(prints, time)
+    time = guessable_time(time)
+
     players = prints.inject([]) do |arr,p|
-      arr << $1 if p =~ /^(.+)\^7 reached the finish line/
-      arr << $1 if p =~ /^Time performed by (.+)\^7 :/
+      arr << $1 if p =~ /^(.+)\^7 reached the finish line in \^\d#{time}/
+      arr << $1 if p =~ /^Time performed by (.+)\^7 : \^\d#{time}/
       arr
     end
 
-    raise "Not only one player was found #{players.inspect}." if players.length != 1
+    raise "No player was found." if players.empty?
+    raise "Not only one player was found #{players.inspect}." if players.size > 1
 
     players.first
   end
 
+
+  def extract_time_from_filename(filename)
+    $1 if File.basename(filename) =~ /(\d{2}\.\d{2}\.\d{3})/
+  end
+
   # extract time from server prints
   # supports only one time atm otherwise raises an exception
   #
-  def extract_time(prints)
+  def extract_time(prints, time_hint)
     times = prints.inject([]) do |arr,p|
-      arr << $1 if p =~ /(\^[0-9]+:[\^:0-9]+)/
+      arr << normalize_time(plain_text($1)) if p =~ /(\^[0-9]+:[\^:0-9]+)/
       arr
     end
 
-    raise "Not only one time was found #{times.inspect}." if times.length != 1
+    raise "No time was found." if times.empty?
+    return times.first if times.one?
 
-    time = plain_text(times.first)
+    # multiple times found
+    # try to guess time by hint
+    #
+    time_hint = normalize_time(time_hint) if time_hint.present?
+    return time_hint if times.member?(time_hint)
 
-    time = "0:#{time}" if time.count(":") < 2
-    "%02d:%02d.%03d" % time.split(":").map(&:to_i)
+    raise "Not only one time was found #{times.inspect}."
   end
 
   def plain_text(text)
     text.gsub(/\^\d/, '')
   end
+
+  def normalize_time(time_str)
+    parts = time_str.split(/\.|:/)
+    parts.unshift(0) if parts.size < 3
+
+    "%02d:%02d.%03d" % parts.map(&:to_i)
+  end
 end
 

data/test/unit/demo_reader_defrag_dm_68_cpm_test.rb

@@ -15,7 +15,7 @@ class DemoReaderDefragDm68CpmTest < Test::Unit::TestCase
 
     file, map, time, player = entry
 
-    define_method "test_warsow_wd#{version}_demo_#{file.gsub(/[^a-z_0-9]/, "_")}" do
+    define_method "test_defrag_dm_#{version}_demo_#{file.gsub(/[^a-z_0-9]/, "_")}" do
       demo = DemoReader.parse("test/fixtures/defrag/dm_#{version}/#{gamemode}/#{file}.dm_#{version}")
 
       assert demo.valid

data/test/unit/demo_reader_defrag_dm_68_vq3_test.rb

@@ -9,12 +9,13 @@ class DemoReaderDefragDm68Vq3Test < Test::Unit::TestCase
 
   [
     %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)
+    %w(un-dead029_df.vq3_00.16.912_uN-DeaD!WiNTeR.ru un-dead029 00:16.912 ^2uN-DeaD!WiNTeR),
+    %w(cyfio-df_mdf.vq3_06.25.832_rlxmini.CountryHere cyfio-df 06:25.832 r^1l^7x^0|^7m^1i^7n^1i)
   ].each do |entry|
 
     file, map, time, player = entry
 
-    define_method "test_warsow_wd#{version}_demo_#{file.gsub(/[^a-z_0-9]/, "_")}" do
+    define_method "test_defrag_dm_#{version}_demo_#{file.gsub(/[^a-z_0-9]/, "_")}" do
       demo = DemoReader.parse("test/fixtures/defrag/dm_#{version}/#{gamemode}/#{file}.dm_#{version}")
 
       assert demo.valid

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: demo-reader
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - aekym
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 +01:00
+date: 2010-12-19 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -53,6 +53,7 @@ files:
 - lib/demo_reader_warsow.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/cyfio-df_mdf.vq3_06.25.832_rlxmini.CountryHere.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