modsvaskr 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a5763808fa45e04cd82bcaf607b12729ca43b5c2a40b8e3476abb3f012154e2
-  data.tar.gz: 428994ca324ac277fcfcb3e76f2c0a88ee6f8a53d0e862fbdbf7b6abca5323ed
+  metadata.gz: ec8a78a2351a1b75ce524ec43bc394f32af0ca8f9f8bdcb503227ef61c67a835
+  data.tar.gz: 1368b7d37845214a577ce3c90a74d771921c82dd9b6e2b29ea7290c7087c503a
 SHA512:
-  metadata.gz: 629deb5ebde244b3d4eee1d0195aa6c8e84a96282a6968fc99e95a878e911d98bb3d50dd9538ede549163225e54bec1a92e3ac6c5befdca6dc15d3b4bc7c925b
-  data.tar.gz: 62f17178509041879839df331bcb6db369484159d6b13fe4a2c542ea70878a8571294dd006f68ae92ed0150f65b53daad8c10fbcd1563e2ea07796fedf5c7dff
+  metadata.gz: 7fcdfcb6474e23a2194c368c8eb77af05b83d8c3ded3f34d9a11ecd7e8decf0bfd33d4d2c07edd2ac0f2ce865004ce8a7b5c0fe4a205a5efb82745d2d8a38d25
+  data.tar.gz: cf8b50f20f69992e5830472809bdb356293f3b5d5e5c3410b4a3b996bab5234932162836f5fecf0d563af24ad9fad8cc92cc9dbb186a1458642053c662e82201

data/lib/modsvaskr/encoding.rb

@@ -0,0 +1,29 @@
+module Modsvaskr
+
+  module Encoding
+
+    # Convert a string to UTF-8
+    #
+    # Parameters::
+    # * *str* (String): The string to convert
+    # Result::
+    # * String: The converted string
+    def self.to_utf8(str)
+      orig_encoding = str.encoding
+      encoding = nil
+      begin
+        encoding = %w[
+          UTF-8
+          Windows-1252
+          ISO-8859-1
+        ].find { |search_encoding| str.force_encoding(search_encoding).valid_encoding? }
+      ensure
+        str.force_encoding(orig_encoding)
+      end
+      raise "Unknown encoding for string #{str[0..127].inspect}" if encoding.nil?
+      str.encode('UTF-8', encoding)
+    end
+
+  end
+
+end

data/lib/modsvaskr/tests_suites/exterior_cell.rb

@@ -26,7 +26,7 @@ module Modsvaskr
         # Hash< String, Hash< String, Array<[Integer, Integer]> > >
         exterior_cells = {}
         @game.xedit.run_script('DumpInfo', only_once: true)
-        CSV.read("#{@game.xedit.install_path}/Edit Scripts/Modsvaskr_ExportedDumpInfo.csv", encoding: 'windows-1251:utf-8').each do |row|
+        @game.xedit.parse_csv('Modsvaskr_ExportedDumpInfo') do |row|
           esp_name, record_type = row[0..1]
           if record_type.downcase == 'cell'
             cell_type, cell_name, cell_x, cell_y = row[3..6]
@@ -45,7 +45,7 @@ module Modsvaskr
         # Test only exterior cells that have been changed by mods, and make sure we test the minimum, knowing that each cell loaded in game tests 5x5 cells around
         vanilla_esps = @game.game_esps
         vanilla_exterior_cells = vanilla_esps.inject({}) do |merged_worldspaces, esp_name|
-          merged_worldspaces.merge(exterior_cells[esp_name]) do |worldspace, ext_cells1, ext_cells2|
+          merged_worldspaces.merge(exterior_cells[esp_name] || {}) do |worldspace, ext_cells1, ext_cells2|
             (ext_cells1 + ext_cells2).sort.uniq
           end
         end
@@ -87,7 +87,7 @@ module Modsvaskr
                   slice(*(candidate_cell_x - delta_cells..candidate_cell_x + delta_cells)).
                   inject(0) { |sum_cells, (_cur_cell_x, cur_cell_ys)| sum_cells + cur_cell_ys.slice(*(candidate_cell_y - delta_cells..candidate_cell_y + delta_cells)).size }
                 if best_cell_score.nil? || nbr_tested_cells > best_cell_score
-                  nbr_tested_cells = best_cell_score
+                  best_cell_score = nbr_tested_cells
                   best_cell_x = candidate_cell_x
                   best_cell_y = candidate_cell_y
                 end

data/lib/modsvaskr/tests_suites/interior_cell.rb

@@ -26,7 +26,7 @@ module Modsvaskr
         # Hash< String, Array<String> >
         interior_cells = {}
         @game.xedit.run_script('DumpInfo', only_once: true)
-        CSV.read("#{@game.xedit.install_path}/Edit Scripts/Modsvaskr_ExportedDumpInfo.csv", encoding: 'windows-1251:utf-8').each do |row|
+        @game.xedit.parse_csv('Modsvaskr_ExportedDumpInfo') do |row|
           esp_name, record_type = row[0..1]
           if record_type.downcase == 'cell'
             cell_type, cell_name = row[3..4]
@@ -39,7 +39,7 @@ module Modsvaskr
         end
         # Test only interior cells that have been changed by mods
         vanilla_esps = @game.game_esps
-        vanilla_interior_cells = vanilla_esps.map { |esp_name| interior_cells[esp_name] }.flatten.sort.uniq
+        vanilla_interior_cells = vanilla_esps.map { |esp_name| interior_cells[esp_name] || [] }.flatten.sort.uniq
         Hash[interior_cells.
           map { |esp_name, esp_cells| vanilla_esps.include?(esp_name) ? [] : vanilla_interior_cells & esp_cells }.
           flatten.

data/lib/modsvaskr/tests_suites/npc.rb

@@ -24,7 +24,7 @@ module Modsvaskr
       def discover_tests
         tests = {}
         @game.xedit.run_script('DumpInfo', only_once: true)
-        CSV.read("#{@game.xedit.install_path}/Edit Scripts/Modsvaskr_ExportedDumpInfo.csv", encoding: 'windows-1251:utf-8').each do |row|
+        @game.xedit.parse_csv('Modsvaskr_ExportedDumpInfo') do |row|
           tests["#{row[0].downcase}/#{row[2].to_i(16)}"] = {
             name: "Take screenshot of #{row[0]} - #{row[3]}"
           } if row[1].downcase == 'npc_'

data/lib/modsvaskr/tests_suites/npc_head.rb

@@ -24,7 +24,7 @@ module Modsvaskr
       def discover_tests
         tests = {}
         @game.xedit.run_script('DumpInfo', only_once: true)
-        CSV.read("#{@game.xedit.install_path}/Edit Scripts/Modsvaskr_ExportedDumpInfo.csv", encoding: 'windows-1251:utf-8').each do |row|
+        @game.xedit.parse_csv('Modsvaskr_ExportedDumpInfo') do |row|
           tests["#{row[0].downcase}/#{row[2].to_i(16)}"] = {
             name: "Take head screenshot of #{row[0]} - #{row[3]}"
           } if row[1].downcase == 'npc_'

data/lib/modsvaskr/version.rb

@@ -1,5 +1,5 @@
 module Modsvaskr
 
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 
 end

data/lib/modsvaskr/xedit.rb

@@ -1,3 +1,4 @@
+require 'modsvaskr/encoding'
 require 'modsvaskr/run_cmd'
 
 module Modsvaskr
@@ -47,6 +48,17 @@ module Modsvaskr
       end
     end
 
+    # Parse a CSV that has been dumped by a previous run of xEdit
+    #
+    # Parameters::
+    # * *csv* (String): Name of the CSV file (from Edit Scripts), without .csv
+    # * *row_block* (Proc): Code called for each CSV row
+    #   Parameters::
+    #   * *row* (Array<String>): CSV row
+    def parse_csv(csv, &row_block)
+      CSV.parse(Encoding.to_utf8(File.read("#{install_path}/Edit Scripts/#{csv}.csv", mode: 'rb'))).each(&row_block)
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modsvaskr
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-20 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses_menu
@@ -104,6 +104,7 @@ extra_rdoc_files: []
 files:
 - bin/modsvaskr
 - lib/modsvaskr/config.rb
+- lib/modsvaskr/encoding.rb
 - lib/modsvaskr/game.rb
 - lib/modsvaskr/games/skyrim_se.rb
 - lib/modsvaskr/in_game_tests_runner.rb