demo-reader 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/demo-reader.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{demo-reader}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["aekym"]
@@ -42,7 +42,6 @@ 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.rb

@@ -10,8 +10,8 @@ class DemoReader
   #
   # @returns an instance of DemoReaderWarsow or DemoReaderDefrag or nil on failure
   #
-  def self.parse(filename)
-    try_warsow(filename) || try_defrag(filename)
+  def self.parse(filename, hint_for_time = nil)
+    try_warsow(filename) || try_defrag(filename, hint_for_time)
   end
 
 
@@ -23,8 +23,8 @@ class DemoReader
     demo.valid ? demo : nil
   end
 
-  def self.try_defrag(filename)
-    demo = DemoReaderDefrag.new(filename)
+  def self.try_defrag(filename, hint_for_time)
+    demo = DemoReaderDefrag.new(filename, hint_for_time)
 
     demo.valid ? demo : nil
   end

data/lib/demo_reader_defrag.rb

@@ -7,8 +7,9 @@ class DemoReaderDefrag
 
 
 
-  def initialize(filename)
+  def initialize(filename, hint_for_time = nil)
     @filename = filename
+    @hint_for_time = hint_for_time
 
     @game = "Defrag"
     @version = -1
@@ -45,7 +46,7 @@ class DemoReaderDefrag
     if @raw['server_info']['defrag_vers'].to_i > 0
       @gamemode = @raw['server_info']['df_promode'].to_i.zero? ? 'vq3' : 'cpm'
 
-      time_hint = extract_time_from_filename(@filename)
+      time_hint = extract_time_from_filename(@hint_for_time || @filename)
       @time = extract_time(@raw['prints'], time_hint)
 
       @player = extract_player(@raw['prints'], @time)
@@ -103,7 +104,8 @@ class DemoReaderDefrag
 
 
   def extract_time_from_filename(filename)
-    $1 if File.basename(filename) =~ /(\d{2}\.\d{2}\.\d{3})/
+    filename = File.basename(filename) if File.exists?(filename)
+    $1 if filename =~ /(\d{2}\.\d{2}\.\d{3})/
   end
 
   # extract time from server prints

data/test/unit/demo_reader_defrag_dm_68_cpm_test.rb

@@ -10,13 +10,15 @@ class DemoReaderDefragDm68CpmTest < Test::Unit::TestCase
 
   [
     %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)
+    %w(puremotion_df.cpm_00.10.600_eS-Rody.russia puremotion 00:10.600 ^2eS-Rody),
+    %w(mega_wood[mdf.cpm]_without_time_hint_\(kreator.Germany\) mega_wood 00:14.752 r^8l^7x^0|^7Kr^8e^7ator here is the time hint: 00.14.752)
   ].each do |entry|
 
     file, map, time, player = entry
+    time_hint = entry.last if entry.size > 4
 
     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}")
+      demo = DemoReader.parse("test/fixtures/defrag/dm_#{version}/#{gamemode}/#{file}.dm_#{version}", time_hint)
 
       assert demo.valid
       assert_equal game, demo.game

data/test/unit/demo_reader_defrag_dm_68_vq3_test.rb

@@ -10,7 +10,7 @@ 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(cyfio-df_mdf.vq3_06.25.832_rlxmini.CountryHere cyfio-df 06:25.832 r^1l^7x^0|^7m^1i^7n^1i)
+    %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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: demo-reader
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - aekym
@@ -53,7 +53,6 @@ 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