rvpacker-txt 1.8.1 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d199295537aa63985fd91781ab16f369f2143e7dc31a60647800896ea554d499
-  data.tar.gz: 1e9875616671881fad934714622fe57f4a9f9a0c9fa8719e29b33e7e82cb9b94
+  metadata.gz: d5ce1335835077b4b76bf730aa575ea20154820b5b559f7d61380c79411b7e38
+  data.tar.gz: 0c3541e70ccd8e19a0b76bbc664dab7a4b577b9f6aea1c7cfa40347b4ddc7740
 SHA512:
-  metadata.gz: d5d3dcb0546223e2934632d15e0e3afb1c551ef68179a92a23d607ac2d575119948cd4e0dfff61f44f12b2dc7d0974e5ea9805c90a09a3192ca0a2e253d1e439
-  data.tar.gz: 971573cb4d854c8b4ca31825c86ed948a8577b73a21ccf30c8f9257c9d2e86eb44a01c2e3b51089941a0c357c94af0bd758c41309f708b2f7cfd5c6850374fd0
+  metadata.gz: 2d2fe0d75f34329cf4d81c7b8dea7d10c7cd428e0a95940d076cc3c792bfe5038df069ed2736a067defa80548baf96b541b6b457a51f4637d96279a7f90bec36
+  data.tar.gz: 7dc34c760e8d68817446552bd9930c3900ebe43bfac68bec9a5fa68ff23edceef0c6adcce353ea1f0554343994fbb6184f19fe0cf783dfca02d38e61dc938725

data/lib/read.rb

@@ -26,7 +26,7 @@ def self.extract_quoted_strings(string)
         stripped = line.strip
 
         next if stripped[0] == '#' ||
-            !stripped.match?(/["']/) ||
+            (!in_quotes && !stripped.match?(/["']/)) ||
             stripped.start_with?(/(Win|Lose)|_Fanfare/) ||
             stripped.match?(/eval\(/)
 
@@ -35,8 +35,6 @@ def self.extract_quoted_strings(string)
 
         next if skip_block
 
-        buffer.push('\#') if in_quotes
-
         line.each_char do |char|
             if %w[' "].include?(char)
                 unless quote_type.nil? || char == quote_type
@@ -51,7 +49,16 @@ def self.extract_quoted_strings(string)
                 next
             end
 
-            buffer.push(char) if in_quotes
+            if in_quotes
+                if char == "\r"
+                    next
+                elsif char == "\n"
+                    buffer.push('\#')
+                    next
+                end
+
+                buffer.push(char)
+            end
         end
     end
 
@@ -68,8 +75,9 @@ def self.parse_parameter(code, parameter, game_type)
             when 401, 405
                 case game_type
                     when 'lisa'
-                        match = parameter.scan(/^(\\et\[[0-9]+\]|\\nbt)/)
-                        parameter = parameter.slice((match[0].length)..) unless match.empty?
+                        match = parameter.scan(/^\\et\[[0-9]+\]/)
+                        match = parameter.scan(/^\\nbt/) if match.empty?
+                        parameter = parameter[match[0].length..] unless match.empty?
                     else
                         nil
                 end
@@ -86,23 +94,14 @@ def self.parse_parameter(code, parameter, game_type)
 end
 
 # @param [String] variable
-# @param [String] game_type
+# @param [String] _game_type
 # @return [String]
-def self.parse_variable(variable, game_type)
-    unless game_type.nil?
-        lines_count = variable.count("\n")
-
-        if lines_count.positive?
-            variable = variable.gsub(/\r?\n/, '\#')
-
-            case game_type
-                when 'lisa'
-                    return nil unless variable.split('\#').all? { |line| line.match?(/^<.*>\.?$/) || line.empty? }
-                else
-                    nil
-            end
-        end
-    end
+def self.parse_variable(variable, _game_type)
+    variable = variable.gsub(/\r?\n/, '\#') if variable.count("\n").positive?
+    return nil if variable.split('\#').all? { |line| line.strip.match?(/(^#? ?<.*>\.?$)|^$/) }
+    return nil if variable.match?(/^[+-]?[0-9]*$/) ||
+        variable.match?(/---/) ||
+        variable.match?(/restrict eval/)
 
     variable
 end
@@ -349,11 +348,12 @@ def self.read_other(other_files_paths, output_path, logging, game_type, processi
                         unless allowed_codes.include?(code)
                             if in_sequence
                                 joined = line.join('\#').strip
+                                parsed = parse_parameter(401, joined, game_type)
 
-                                other_translation_map.insert_at_index(other_lines.length, joined, '') if inner_processing_type == :append &&
-                                    !other_translation_map.include?(joined)
+                                other_translation_map.insert_at_index(other_lines.length, parsed, '') if inner_processing_type == :append &&
+                                    !other_translation_map.include?(parsed)
 
-                                other_lines.add(joined)
+                                other_lines.add(parsed)
 
                                 line.clear
                                 in_sequence = false

data/lib/write.rb

@@ -80,7 +80,8 @@ def self.get_parameter_translated(code, parameter, hashmap, game_type)
             when 401, 405
                 case game_type
                     when 'lisa'
-                        match = parameter.scan(/^(\\et\[[0-9]+\]|\\nbt)/)
+                        match = parameter.scan(/^\\et\[[0-9]+\]/)
+                        match = parameter.scan(/^\\nbt/) if match.empty?
 
                         unless match.empty?
                             lisa_start = match[0]
@@ -98,6 +99,7 @@ def self.get_parameter_translated(code, parameter, hashmap, game_type)
         end
 
         gotten = hashmap[parameter]
+        return nil if gotten.nil?
 
         case game_type
             when 'lisa'

data/rvpacker-txt.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
     spec.name = 'rvpacker-txt'
-    spec.version = '1.8.1'
+    spec.version = '1.8.3'
     spec.authors = ['Howard Jeng', 'Andrew Kesterson', 'Solistra', 'Darkness9724', 'savannstm']
     spec.email = ['savannstm@gmail.com']
     spec.summary = 'Reads or writes RPG Maker XP/VX/VXAce game text to .txt files'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rvpacker-txt
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.3
 platform: ruby
 authors:
 - Howard Jeng