R3EXS 1.0.4 → 1.1.0

data/lib/R3EXS/json_rvdata2.rb

@@ -1,105 +1,116 @@
-# frozen_string_literal: true
-
-require 'zlib'
-require_relative 'utils'
-require_relative 'RGSS3_R3EXS'
-
-module R3EXS
-
-    # 将 Ruby 源码读取压缩后序列化到输出目录
-    #
-    # @param target_dir [String] 目标目录
-    # @param output_dir [String] 输出目录
-    #
-    # @raise [ScriptsDirError] Scripts 目录不存在
-    # @raise [ScriptsInfoPathError] Scripts_info.json 文件不存在
-    #
-    # @return [void]
-    def R3EXS.rb_scripts(target_dir, output_dir)
-        FileUtils.mkdir(output_dir) unless Dir.exist?(output_dir)
-        scripts_array         = []
-        full_dir              = File.join(target_dir, 'Scripts')
-        script_info_file_path = File.join(full_dir, 'Scripts_info.json')
-
-        Dir.exist?(full_dir) or raise ScriptsDirError.new(full_dir), "Scripts directory not found: #{full_dir}"
-        File.exist?(script_info_file_path) or raise ScriptsInfoPathError.new(script_info_file_path), "Scripts_info.json not found: #{script_info_file_path}"
-
-        print "#{Utils::ESCAPE}#{Utils::YELLOW_COLOR}Reading from #{Utils::RESET_COLOR}#{script_info_file_path}...\r" if $global_options[:verbose]
-        scripts_info_array = Oj.load_file(script_info_file_path)
-
-        scripts_info_array.each do |script_info|
-            index            = script_info[:index]
-            script_file_path = File.join(full_dir, "#{format('%03d', index)}.rb")
-            print "#{Utils::ESCAPE}#{Utils::YELLOW_COLOR}Reading from #{Utils::RESET_COLOR}#{script_file_path}...\r" if $global_options[:verbose]
-            scripts_array << [114514, script_info[:name], Zlib::Deflate.deflate(File.read(script_file_path, mode: "r"))]
-        end
-        Utils.object_rvdata2(scripts_array, File.join(output_dir, 'Scripts.rvdata2'))
-    end
-
-    # 将指定目录下的所有JSON文件转换为 rvdata2 文件
-    #
-    # @param [String] target_dir 目标目录
-    # @param [String] output_dir 输出目录
-    # @param [String] original_dir 原始 rvdata2 文件目录
-    # @param [Boolean] complete 是否完全转换
-    # @param [Boolean] with_scripts 是否转换Scripts
-    #
-    # @raise [RPGJsonFileError] json 文件不是 RPG 模块中的对象
-    # @raise [R3EXSJsonFileError] json 文件不是 R3EXS 模块中的对象
-    # @raise [Rvdata2FileError] 原始 rvdata2 文件可能损坏
-    # @raise [JsonDirError] target_dir 不存在
-    # @raise [Rvdata2DirError] original_dir 不存在
-    # @raise [ScriptsDirError] Scripts 目录不存在
-    # @raise [ScriptsInfoPathError] Scripts_info.json 文件不存在
-    #
-    # @return [void]
-    def R3EXS.json_rvdata2(target_dir, output_dir, original_dir, complete, with_scripts)
-        FileUtils.mkdir(output_dir) unless Dir.exist?(output_dir)
-
-        if complete
-            Utils.all_json_files(target_dir, :RPG) do |object, file_basename|
-                file_path = File.join(output_dir, "#{file_basename}.rvdata2")
-                print "#{Utils::ESCAPE}#{Utils::MAGENTA_COLOR}Serializing to #{Utils::RESET_COLOR}#{file_path}...\n" if $global_options[:verbose]
-                Utils.object_rvdata2(object, file_path)
-                print "#{Utils::ESCAPE}#{Utils::GREEN_COLOR}Serialized #{Utils::RESET_COLOR}#{file_basename}\n" if $global_options[:verbose]
-            end
-        else
-            # 检查 original_dir 是否存在
-            Dir.exist?(original_dir) or raise Rvdata2DirError.new(original_dir), "Original rvdata2 directory not found: #{original_dir}"
-            Utils.all_json_files(target_dir, :R3EXS) do |object, file_basename|
-
-                original_file_path = File.join(original_dir, file_basename + '.rvdata2')
-                print "#{Utils::ESCAPE}#{Utils::BLUE_COLOR}Reading and Deserializing #{Utils::RESET_COLOR}#{original_file_path}...\r" if $global_options[:verbose]
-                original_object = File.open(original_file_path, 'rb') { |file| Marshal.load(file) }
-
-                # 这里的类型检查要用紧凑模式，因为 rvdata2 文件中可能存在 nil 元素，必须忽略
-                begin
-                    Utils.check_type(original_object, file_basename, true, :RPG)
-                rescue RPGTypeError
-                    raise Rvdata2FileError.new(original_file_path), "Invalid rvdata2 file: #{original_file_path}"
-                end
-
-                file_path = File.join(output_dir, "#{file_basename}.rvdata2")
-                print "#{Utils::ESCAPE}#{Utils::MAGENTA_COLOR}Serializing to #{Utils::RESET_COLOR}#{file_path}...\n" if $global_options[:verbose]
-
-                # 根据是否为数组进行不同的处理
-                if object.is_a?(Array)
-                    object.each do |obj|
-                        obj.inject_to(original_object[obj.index])
-                    end
-                else
-                    object.inject_to(original_object)
-                end
-                Utils.object_rvdata2(original_object, file_path)
-                print "#{Utils::ESCAPE}#{Utils::GREEN_COLOR}Serialized #{Utils::RESET_COLOR}#{file_basename}\n" if $global_options[:verbose]
-            end
-        end
-
-        if with_scripts
-            print "#{Utils::ESCAPE}#{Utils::MAGENTA_COLOR}Serializing to #{Utils::RESET_COLOR}#{File.join(output_dir, 'Scripts.rvdata2')}...\r" if $global_options[:verbose]
-            rb_scripts(target_dir, output_dir)
-            print "#{Utils::ESCAPE}#{Utils::GREEN_COLOR}Serialized #{Utils::RESET_COLOR}Scripts\n" if $global_options[:verbose]
-        end
-    end
-
+# frozen_string_literal: true
+
+require 'zlib'
+require_relative 'utils'
+require_relative 'RGSS3_R3EXS'
+
+module R3EXS
+
+    # 将指定目录下的所有JSON文件转换为 rvdata2 文件
+    #
+    # @param [Pathname] target_dir 目标目录
+    # @param [Pathname] output_dir 输出目录
+    # @param [Pathname] original_dir 原始 rvdata2 文件目录
+    # @param [Boolean] complete 是否完全转换
+    # @param [Boolean] with_scripts 是否转换Scripts
+    #
+    # @raise [RPGJsonFileError] json 文件不是 RPG 模块中的对象
+    # @raise [R3EXSJsonFileError] json 文件不是 R3EXS 模块中的对象
+    # @raise [Rvdata2FileError] 原始 rvdata2 文件可能损坏
+    # @raise [JsonDirError] target_dir 不存在
+    # @raise [Rvdata2DirError] original_dir 不存在
+    # @raise [ScriptsInfoPathError] Scripts_info.json 文件不存在
+    #
+    # @return [void]
+    def R3EXS.json_rvdata2(target_dir, output_dir, original_dir, complete, with_scripts)
+        # 处理常规的 JSON 文件
+        Utils.all_json_files(target_dir, (complete) ? :RPG : :R3EXS) do |object, file_basename, parent_relative_dir|
+            output_file_path = output_dir.join(parent_relative_dir, "#{file_basename}.rvdata2")
+            if complete
+                print "#{Utils::ESCAPE}#{Utils::MAGENTA_COLOR}Serializing to #{Utils::RESET_COLOR}#{output_file_path}...\r" if $global_options[:verbose]
+                Utils.object_rvdata2(object, output_file_path)
+            else
+                # 检查 original_dir 是否存在
+                original_dir.exist? or raise Rvdata2DirError.new(original_dir.to_s), "Original rvdata2 directory not found: #{original_dir}"
+                original_file_path = original_dir.join(parent_relative_dir, "#{file_basename}.rvdata2")
+                print "#{Utils::ESCAPE}#{Utils::BLUE_COLOR}Reading and Deserializing #{Utils::RESET_COLOR}#{original_file_path}...\r" if $global_options[:verbose]
+                original_object = Marshal.load(original_file_path.binread)
+
+                # 这里的类型检查要用紧凑模式，因为 rvdata2 文件中可能存在 nil 元素，必须忽略
+                begin
+                    Utils.check_type(original_object, file_basename, true, :RPG)
+                rescue RPGTypeError
+                    raise Rvdata2FileError.new(original_file_path.to_s), "Invalid rvdata2 file: #{original_file_path}"
+                end
+
+                print "#{Utils::ESCAPE}#{Utils::MAGENTA_COLOR}Serializing to #{Utils::RESET_COLOR}#{output_file_path}...\r" if $global_options[:verbose]
+
+                # 根据是否为数组进行不同的处理
+                if object.is_a?(Array)
+                    object.each do |obj|
+                        obj.inject_to(original_object[obj.index])
+                    end
+                else
+                    object.inject_to(original_object)
+                end
+                Utils.object_rvdata2(original_object, output_file_path)
+            end
+            print "#{Utils::ESCAPE}#{Utils::GREEN_COLOR}Serialized #{Utils::RESET_COLOR}#{output_file_path}\n" if $global_options[:verbose]
+        end
+
+        # 处理 CommonEvent_\d{5}.json 文件
+        Utils.all_commonevent_json_files(target_dir, (complete) ? :RPG : :R3EXS) do |commonevents, _, parent_relative_dir|
+            output_file_path = output_dir.join(parent_relative_dir.parent, 'CommonEvents.rvdata2')
+            if complete
+                print "#{Utils::ESCAPE}#{Utils::MAGENTA_COLOR}Serializing to #{Utils::RESET_COLOR}#{output_file_path}...\r" if $global_options[:verbose]
+                Utils.object_rvdata2(commonevents, output_file_path)
+            else
+                # 检查 original_dir 是否存在
+                original_dir.exist? or raise Rvdata2DirError.new(original_dir.to_s), "Original rvdata2 directory not found: #{original_dir}"
+                original_file_path = original_dir.join(parent_relative_dir.parent, 'CommonEvents.rvdata2')
+                print "#{Utils::ESCAPE}#{Utils::BLUE_COLOR}Reading and Deserializing #{Utils::RESET_COLOR}#{original_file_path}...\r" if $global_options[:verbose]
+                original_object = Marshal.load(original_file_path.binread)
+
+                # 这里的类型检查要用紧凑模式，因为 rvdata2 文件中可能存在 nil 元素，必须忽略
+                begin
+                    Utils.check_type(original_object, 'CommonEvents', true, :RPG)
+                rescue RPGTypeError
+                    raise Rvdata2FileError.new(original_file_path.to_s), "Invalid rvdata2 file: #{original_file_path}"
+                end
+
+                print "#{Utils::ESCAPE}#{Utils::MAGENTA_COLOR}Serializing to #{Utils::RESET_COLOR}#{output_file_path}...\r" if $global_options[:verbose]
+
+                commonevents.each do |commonevent|
+                    commonevent.inject_to(original_object[commonevent.index])
+                end
+
+                Utils.object_rvdata2(original_object, output_file_path)
+            end
+            print "#{Utils::ESCAPE}#{Utils::GREEN_COLOR}Serialized #{Utils::RESET_COLOR}#{output_file_path}\n" if $global_options[:verbose]
+        end
+
+        # 处理 \d{5}.rb 文件
+        if with_scripts
+            Utils.all_rb_files(target_dir) do |scripts, _, parent_relative_dir|
+                output_file_path      = output_dir.join(parent_relative_dir.parent, 'Scripts.rvdata2')
+                script_info_file_path = target_dir.join(parent_relative_dir, 'Scripts_info.json')
+                script_info_file_path.exist? or raise ScriptsInfoPathError.new(script_info_file_path.to_s), "Scripts_info.json not found: #{script_info_file_path}"
+
+                print "#{Utils::ESCAPE}#{Utils::MAGENTA_COLOR}Serializing to #{Utils::RESET_COLOR}#{output_file_path}...\r" if $global_options[:verbose]
+
+                print "#{Utils::ESCAPE}#{Utils::YELLOW_COLOR}Reading from #{Utils::RESET_COLOR}#{script_info_file_path}...\r" if $global_options[:verbose]
+                scripts_info_array = Oj.load_file(script_info_file_path.to_s)
+
+                output_scripts_array = []
+                scripts_info_array.each do |script_info|
+                    index  = script_info[:index]
+                    script = scripts[index]
+                    output_scripts_array << [114514, script_info[:name], Zlib::Deflate.deflate(script)]
+                end
+                Utils.object_rvdata2(output_scripts_array, output_file_path)
+                print "#{Utils::ESCAPE}#{Utils::GREEN_COLOR}Serialized #{Utils::RESET_COLOR}#{output_file_path}\n" if $global_options[:verbose]
+            end
+        end
+    end
+
 end

data/lib/R3EXS/rvdata2_json.rb

@@ -8,32 +8,63 @@ module R3EXS
 
     # 将 Script 对象数组序列化为 Ruby 源码
     #
-    # @param scripts [Array<Array>] 待转换的 Script 对象数组
-    # @param output_dir [String] 输出目录
+    # @param scripts [Array<Object>] 待转换的 Script 对象数组
+    # @param output_dir [Pathname] 输出目录
     # @return [void]
     def R3EXS.scripts_rb(scripts, output_dir)
-        FileUtils.mkdir(output_dir) unless Dir.exist?(output_dir)
-        full_dir = File.join(output_dir, 'Scripts')
-        FileUtils.mkdir(full_dir) unless Dir.exist?(full_dir)
+        output_dir.mkpath unless output_dir.exist?
+        full_dir = output_dir.join('Scripts')
+        full_dir.mkdir unless full_dir.exist?
 
         scripts_info_array = []
         scripts.each_with_index do |script, index|
             next if script.nil?
             scripts_info_array << { index: index, name: script[1] }
-            script_file_path = File.join(full_dir, "#{format('%03d', index)}.rb")
+            script_file_path = full_dir.join("#{format('%03d', index)}.rb")
             print "#{Utils::ESCAPE}#{Utils::MAGENTA_COLOR}Serializing to #{Utils::RESET_COLOR}#{script_file_path}...\r" if $global_options[:verbose]
-            File.write(script_file_path, Zlib::Inflate.inflate(script[2]).encode(universal_newline: true), mode: 'w')
+            script_file_path.write(Zlib::Inflate.inflate(script[2]).encode(universal_newline: true))
+            print "#{Utils::ESCAPE}#{Utils::GREEN_COLOR}Serialized #{Utils::RESET_COLOR}#{script_file_path}\n" if $global_options[:verbose]
         end
 
-        script_info_file_path = File.join(full_dir, 'Scripts_info.json')
+        script_info_file_path = full_dir.join('Scripts_info.json')
         print "#{Utils::ESCAPE}#{Utils::MAGENTA_COLOR}Serializing to #{Utils::RESET_COLOR}#{script_info_file_path}\r" if $global_options[:verbose]
         Utils.object_json(scripts_info_array, script_info_file_path)
+        print "#{Utils::ESCAPE}#{Utils::GREEN_COLOR}Serialized #{Utils::RESET_COLOR}#{script_info_file_path}\n" if $global_options[:verbose]
+    end
+
+    # 将 CommonEvents 对象数组序列化为分开的 JSON 文件
+    #
+    # @param commonevents [Array<Object>] 待转换的 CommonEvents 对象数组
+    # @param output_dir [Pathname] 输出目录
+    # @param complete [Boolean] 是否序列化所有内容
+    # @param with_notes [Boolean] 是否包含备注
+    # @return [void]
+    def R3EXS.commonevents_json(commonevents, output_dir, complete, with_notes)
+        full_dir = output_dir.join('CommonEvents')
+
+        if complete
+            commonevents.each_with_index do |commonevent, index|
+                commonevent_file_path = full_dir.join("#{format('CommonEvent_%05d', index)}.json")
+                print "#{Utils::ESCAPE}#{Utils::MAGENTA_COLOR}Serializing to #{Utils::RESET_COLOR}#{commonevent_file_path}...\r" if $global_options[:verbose]
+                Utils.object_json(commonevent, commonevent_file_path)
+                print "#{Utils::ESCAPE}#{Utils::GREEN_COLOR}Serialized #{Utils::RESET_COLOR}#{commonevent_file_path}\n" if $global_options[:verbose]
+            end
+        else
+            commonevents = Utils.rpg_r3exs(commonevents, 'CommonEvents', with_notes)
+            commonevents.each do |commonevent|
+                index                 = commonevent.index
+                commonevent_file_path = full_dir.join("#{format('CommonEvent_%05d', index)}.json")
+                print "#{Utils::ESCAPE}#{Utils::MAGENTA_COLOR}Serializing to #{Utils::RESET_COLOR}#{commonevent_file_path}...\r" if $global_options[:verbose]
+                Utils.object_json(commonevent, commonevent_file_path)
+                print "#{Utils::ESCAPE}#{Utils::GREEN_COLOR}Serialized #{Utils::RESET_COLOR}#{commonevent_file_path}\n" if $global_options[:verbose]
+            end
+        end
     end
 
     # 将指定目录下的所有 rvdata2 文件序列化为 JSON 格式
     #
-    # @param target_dir [String] 目标目录
-    # @param output_dir [String] 输出目录
+    # @param target_dir [Pathname] 目标目录
+    # @param output_dir [Pathname] 输出目录
     # @param complete [Boolean] 是否序列化所有内容
     # @param with_scripts [Boolean] 是否包含脚本
     # @param with_notes [Boolean] 是否包含备注
@@ -43,21 +74,20 @@ module R3EXS
     #
     # @return [void]
     def R3EXS.rvdata2_json(target_dir, output_dir, complete, with_scripts, with_notes)
-        FileUtils.mkdir(output_dir) unless Dir.exist?(output_dir)
-        Utils.all_rvdata2_files(target_dir) do |object, file_basename|
+        Utils.all_rvdata2_files(target_dir) do |object, file_basename, parent_relative_dir|
             if file_basename == 'Scripts'
-                next unless with_scripts
-                scripts_rb(object, output_dir)
-                print "#{Utils::ESCAPE}#{Utils::GREEN_COLOR}Serialized #{Utils::RESET_COLOR}#{file_basename}\n" if $global_options[:verbose]
+                scripts_rb(object, output_dir.join(parent_relative_dir)) if with_scripts
+            elsif file_basename == 'CommonEvents'
+                commonevents_json(object, output_dir.join(parent_relative_dir), complete, with_notes)
             else
-                file_path = File.join(output_dir, "#{file_basename}.json")
+                file_path = output_dir.join(parent_relative_dir, "#{file_basename}.json")
                 print "#{Utils::ESCAPE}#{Utils::MAGENTA_COLOR}Serializing to #{Utils::RESET_COLOR}#{file_path}...\r" if $global_options[:verbose]
                 if complete
                     Utils.object_json(object, file_path)
                 else
                     Utils.object_json(Utils.rpg_r3exs(object, file_basename, with_notes), file_path)
                 end
-                print "#{Utils::ESCAPE}#{Utils::GREEN_COLOR}Serialized #{Utils::RESET_COLOR}#{file_basename}\n" if $global_options[:verbose]
+                print "#{Utils::ESCAPE}#{Utils::GREEN_COLOR}Serialized #{Utils::RESET_COLOR}#{file_path}\n" if $global_options[:verbose]
             end
         end
     end