openra 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cfff6bc6fcdee2c6e36d65bef3937bcf2aa4198e1ebdd0a8ec32e582722a1b4
-  data.tar.gz: 79223a7df569fc9281761e77e0ce53c28665b24cf37216bdf39264e873f64b37
+  metadata.gz: c3636042a779c88135640420729bddffea4af5f7be68ce85f215a01c09b42c24
+  data.tar.gz: 5762e992a1d242bc8b02ae1f07bc4a6628f28f9cb77d30001aa5b39fd645c0c7
 SHA512:
-  metadata.gz: 64c38c423dd054f8dd4df6e71240329d28fd1fb2c301eb13a9ebf3022f8594d11e0b93666d8cd934127f354fdc53bb71c450f0e9a06cd37b9649759eaa52c47e
-  data.tar.gz: 3ce0518fc30b657d975ebc40993321e0b3692747301f21f227eaf1b35df4325206924bbf7bd804a22d51846f9e8888721fcec274dc9015acc25bd4858c65c153
+  metadata.gz: 47d3f9b58ce7c8132ef1c25f053a30cd016dfa4c7adc13fba47647996b491050ebf73a3b7836378f9c42d93fb797a08acb09b626f3f85507f018b8e50e2d857d
+  data.tar.gz: c9b9bf3d3782942c5348eb4ef347de4f65d5ecb9183217b4015692eec02905183e17ee416f6496e103c99fed61a59a8ff44143e57ef2f715aa51ae21cdbb0465

data/CHANGELOG.md

@@ -1,12 +1,20 @@
 ## Unreleased
 
-[Compare v1.8.1...HEAD](https://github.com/AMHOL/openra-ruby/compare/v1.8.1...HEAD)
+[Compare v1.8.2...HEAD](https://github.com/AMHOL/openra-ruby/compare/v1.8.2...HEAD)
+
+## v1.8.2
+
+### Fixes
+
+* [core] Fix encoding issues again ([AMHOL](https://github.com/AMHOL))
+
+[Compare v1.8.1...v1.8.2](https://github.com/AMHOL/openra-ruby/compare/v1.8.1...v1.8.2)
 
 ## v1.8.1
 
 ### Updates
 
-* [replay-data] Update support powers to include game time and target positions
+* [replay-data] Update support powers to include game time and target positions ([AMHOL](https://github.com/AMHOL))
 
 [Compare v1.8.0...v1.8.1](https://github.com/AMHOL/openra-ruby/compare/v1.8.0...v1.8.1)
 
@@ -14,7 +22,7 @@
 
 ### Added
 
-* [replay-data] Add support_powers with usage counts to output
+* [replay-data] Add support_powers with usage counts to output ([AMHOL](https://github.com/AMHOL))
 
 [Compare v1.7.0...v1.8.0](https://github.com/AMHOL/openra-ruby/compare/v1.7.0...v1.8.0)
 

data/lib/openra/cli.rb

@@ -7,6 +7,7 @@ require 'dry/cli'
 require 'openra/version'
 require 'openra/constants'
 require 'openra/replays'
+require 'openra/cli/utils'
 require 'openra/cli/commands/formatters'
 require 'openra/cli/commands/detect_production_macros'
 require 'openra/cli/commands/replay_data'

data/lib/openra/cli/commands/detect_production_macros.rb

@@ -26,7 +26,7 @@ module Openra
               ) unless game_started
             when 'StartProduction'
               commands[order.client_index.to_s] << {
-                target: order.target,
+                target: utf8(order.target),
                 msec: order.frame * sync_info.global_settings.frametime_multiplier
               }
             end
@@ -40,7 +40,7 @@ module Openra
 
               {
                 index: player.index,
-                name: player.name,
+                name: utf8(player.name),
                 team: player.team,
                 outcome: player.outcome,
                 production_stats: production_stats,

data/lib/openra/cli/commands/replay_data.rb

@@ -4,6 +4,8 @@ module Openra
   class CLI
     module Commands
       class ReplayData < Dry::CLI::Command
+        include CLI::Utils
+
         desc 'Output replay data to stdout'
 
         argument :replay, required: true, desc: 'Path of the replay file to read data from'
@@ -18,7 +20,7 @@ module Openra
             version: replay.metadata.version,
             server_name: nil,
             map: {
-              name: replay.metadata.map_name,
+              name: utf8(replay.metadata.map_name),
               hash: replay.metadata.map_hash
             },
             game: {
@@ -56,7 +58,7 @@ module Openra
 
                 {
                   index: client.index,
-                  name: client.name,
+                  name: utf8(client.name),
                   preferred_color: client.preferred_color,
                   color: client.color,
                   spawn: {
@@ -102,7 +104,7 @@ module Openra
                 Openra::YAML.load(order.target)
               ).clients
             when *support_powers.keys
-              key = support_powers.fetch(order.command.force_encoding('UTF-8'))
+              key = support_powers.fetch(utf8(order.command))
               client_hash = data[:clients].find do |candidate|
                 candidate[:index] == order.client_index.to_s
               end
@@ -119,7 +121,7 @@ module Openra
               end
 
               client_hash[:build] << {
-                structure: order.target,
+                structure: utf8(order.target),
                 game_time: time(order.frame * sync_info.global_settings.frametime_multiplier),
                 placement: order.target_pos.to_i
               }
@@ -127,40 +129,27 @@ module Openra
               data[:chat] << {
                 channel: 'server',
                 name: nil,
-                message: order.target
+                message: utf8(order.target)
               }
             when 'Chat'
               data[:chat] << {
                 channel: 'global',
-                name: client.name,
-                message: order.target
+                name: utf8(client.name),
+                message: utf8(order.target)
               }
             when 'TeamChat'
               data[:chat] << {
                 channel: client.team,
-                name: client.name,
-                message: order.target
+                name: utf8(client.name),
+                message: utf8(order.target)
               }
             end
           end
 
-          data[:server_name] = sync_info.global_settings.server_name
+          data[:server_name] = utf8(sync_info.global_settings.server_name)
 
           puts FORMATTERS.fetch(options[:format]).call(data)
         end
-
-        private
-
-        def time(msec)
-          sec = msec / 1000
-          mm, ss = sec.divmod(60)
-          hh, mm = mm.divmod(60)
-
-          {
-            formatted: '%02d:%02d:%02d' % [hh, mm, ss],
-            msec: msec.to_i
-          }
-        end
       end
     end
   end

data/lib/openra/cli/utils.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Openra
+  class CLI
+    module Utils
+      def utf8(string)
+        string.force_encoding('UTF-8').to_s
+      end
+
+      def time(msec)
+        sec = msec / 1000
+        mm, ss = sec.divmod(60)
+        hh, mm = mm.divmod(60)
+
+        {
+          formatted: '%02d:%02d:%02d' % [hh, mm, ss],
+          msec: msec.to_i
+        }
+      end
+    end
+  end
+end

data/lib/openra/replays/order.rb

@@ -42,9 +42,7 @@ module Openra
       uint32 :extra_data, onlyif: HAS_EXTRA_DATA
 
       def target
-        target = standard? ? standard_order_target : immediate_order_target
-
-        Types::UTF8String.(target)
+        standard? ? standard_order_target : immediate_order_target
       end
 
       def type

data/lib/openra/struct/client.rb

@@ -11,7 +11,7 @@ module Openra
         attribute :color, Types::Strict::String.meta(from: 'Color')
         attribute :faction_name, Types::Strict::String.meta(from: 'Faction')
         attribute :spawn_point, Types::Strict::String.meta(from: 'SpawnPoint')
-        attribute :name, Types::UTF8String.meta(from: 'Name')
+        attribute :name, Types::Strict::String.meta(from: 'Name')
         attribute :ip, Types::Strict::String.meta(from: 'IpAddress')
         attribute :state, Types::Strict::String.meta(from: 'State')
         attribute :team, Types::Strict::String.meta(from: 'Team')

data/lib/openra/struct/global_settings.rb

@@ -6,7 +6,7 @@ module Openra
       transform_types(&:omittable)
 
       define do
-        attribute :server_name, Types::UTF8String.meta(from: 'ServerName')
+        attribute :server_name, Types::Strict::String.meta(from: 'ServerName')
         attribute :map_hash, Types::Strict::String.meta(from: 'Map')
         attribute :timestep, Types::Params::Integer.meta(from: 'Timestep')
         attribute :order_latency, Types::Params::Integer.meta(

data/lib/openra/struct/metadata.rb

@@ -9,7 +9,7 @@ module Openra
         attribute :mod, Types::Strict::String.meta(from: 'Mod')
         attribute :version, Types::Strict::String.meta(from: 'Version')
         attribute :map_hash, Types::Strict::String.meta(from: 'MapUid')
-        attribute :map_name, Types::UTF8String.meta(from: 'MapTitle')
+        attribute :map_name, Types::Strict::String.meta(from: 'MapTitle')
         attribute :start_time, Types::Timestamp.meta(from: 'StartTimeUtc')
         attribute :end_time, Types::Timestamp.meta(from: 'EndTimeUtc')
         attribute :players, Types::Strict::Array.of(Player).meta(sequence: 'Player')

data/lib/openra/struct/player.rb

@@ -5,7 +5,7 @@ module Openra
     class Player < Openra::Struct
       define do
         attribute :index, Types::Strict::String.meta(from: 'ClientIndex')
-        attribute :name, Types::UTF8String.meta(from: 'Name')
+        attribute :name, Types::Strict::String.meta(from: 'Name')
         attribute :is_human, Types::Params::Bool.meta(from: 'IsHuman')
         attribute :is_bot, Types::Params::Bool.meta(from: 'IsBot')
         attribute :faction_name, Types::Strict::String.meta(from: 'FactionName')

data/lib/openra/types.rb

@@ -9,9 +9,5 @@ module Openra
     Timestamp = Constructor(Time) do |input|
       ::DateTime.strptime(input, '%Y-%m-%d %H-%M-%S').to_time
     end
-
-    UTF8String = Types::String.constructor do |input|
-      input.force_encoding('UTF-8')
-    end
   end
 end

data/lib/openra/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Openra
-  VERSION = '1.8.1'.freeze
+  VERSION = '1.8.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openra
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Andy Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-11 00:00:00.000000000 Z
+date: 2020-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -179,6 +179,7 @@ files:
 - lib/openra/cli/commands/formatters.rb
 - lib/openra/cli/commands/replay_data.rb
 - lib/openra/cli/commands/version.rb
+- lib/openra/cli/utils.rb
 - lib/openra/constants.rb
 - lib/openra/replays.rb
 - lib/openra/replays/file.rb