rmxp_extractor 1.8 → 1.9

data/lib/rmxp_extractor/data_import.rb

@@ -1,69 +1,74 @@
-module RMXPExtractor
-  def self.import(format)
-    STDERR.puts "No Data_JSON Directory!" unless Dir.exists? "./Data_#{format.upcase}"
-    exit 1 unless Dir.exists? "./Data_#{format.upcase}"
-
-    require "oj"
-    require "yaml"
-    require "ruby-progressbar"
-    require "fileutils"
-    require "pathname"
-    require "readline"
-    require_relative "classnames"
-    require_relative "script_handler"
-
-    if format == "ron"
-      puts "RON not supported for importing yet"
-      exit 1
-    end
-
-    window_size = 120
-    progress_format = "%a /%e |%B| %p%% %c/%C %r files/sec %t, currently processing: "
-    progress = ProgressBar.create(
-      format: progress_format,
-      starting_at: 0,
-      total: nil,
-      output: $stderr,
-      length: window_size,
-      title: "imported",
-      remainder_mark: "\e[0;30m█\e[0m",
-      progress_mark: "█",
-      unknown_progress_animation_steps: ["==>", ">==", "=>="],
-    )
-    Dir.mkdir "./Data" unless Dir.exists? "./Data"
-    paths = Pathname.glob(("./Data_#{format.upcase}/" + ("*" + ".#{format}")))
-    count = paths.size
-    progress.total = count
-    paths.each_with_index do |path, i|
-      name = path.basename(".#{format}")
-      progress.format = progress_format + name.to_s
-      file_contents = path.read(mode: "rb")
-      hash = case format
-        when "json"
-          Oj.load file_contents
-        when "yaml"
-          YAML.load file_contents
-        when "toml"
-          TomlRB.parse file_contents
-        when "rb"
-          eval file_contents # Yes, this SHOULD work. Is it bad? Yes.
-        end
-
-      warn "\n\e[33;1mWARNING: Incompatible version format in #{name.to_s}!\e[0m\n" if hash["version"] != VERSION
-
-      case name.to_s
-      when "xScripts", "Scripts"
-        RMXPExtractor.rpgscript("./", "./Scripts", "#{name.to_s}")
-        progress.increment
-        return
-      else
-        content = create_from_rmxp_serialize(hash["data"])
-      end
-
-      rxdata = File.open("./Data/" + name.sub_ext(".rxdata").to_s, "wb")
-      rxdata.puts Marshal.dump(content)
-
-      progress.increment
-    end
-  end
-end
+module RMXPExtractor
+  def self.import(format)
+    STDERR.puts "No Data_JSON Directory!" unless Dir.exists? "./Data_#{format.upcase}"
+    exit 1 unless Dir.exists? "./Data_#{format.upcase}"
+
+    require "oj"
+    require "yaml"
+    require "ruby-progressbar"
+    require "fileutils"
+    require "pathname"
+    require "readline"
+    require_relative "classnames"
+    require_relative "script_handler"
+
+    if format == "ron"
+      puts "RON not supported for importing yet"
+      exit 1
+    end
+
+    window_size = 120
+    progress_format = "%a /%e |%B| %p%% %c/%C %r files/sec %t, currently processing: "
+    progress = ProgressBar.create(
+      format: progress_format,
+      starting_at: 0,
+      total: nil,
+      output: $stderr,
+      length: window_size,
+      title: "imported",
+      remainder_mark: "\e[0;30m█\e[0m",
+      progress_mark: "█",
+      unknown_progress_animation_steps: ["==>", ">==", "=>="],
+    )
+    Dir.mkdir "./Data" unless Dir.exists? "./Data"
+    paths = Pathname.glob(("./Data_#{format.upcase}/" + ("*" + ".#{format}")))
+    count = paths.size
+    progress.total = count
+    paths.each_with_index do |path, i|
+      name = path.basename(".#{format}")
+      progress.format = progress_format + name.to_s
+      file_contents = path.read(mode: "rb")
+      hash = case format
+        when "json"
+          Oj.load file_contents
+        when "yaml"
+          YAML.load file_contents
+        when "rb"
+          eval file_contents # Yes, this SHOULD work. Is it bad? Yes.
+        end
+
+      warn "\n\e[33;1mWARNING: Incompatible version format in #{name.to_s}!\e[0m\n" if hash["version"] != VERSION
+
+      case name.to_s
+      when "xScripts", "Scripts"
+        RMXPExtractor.rpgscript("./", "./Scripts", "#{name.to_s}")
+        progress.increment
+        return
+      else
+        content = create_from_rmxp_serialize(hash["data"])
+      end
+
+      begin
+        dump = Marshal.dump(content)
+
+        rxdata = File.open("./Data/" + name.sub_ext(".rxdata").to_s, "wb")
+        rxdata.puts dump
+      rescue TypeError => e
+        puts "Failed to dump file #{path}.\n"
+        next
+      end
+
+      progress.increment
+    end
+  end
+end

data/lib/rmxp_extractor/ron.rb

@@ -1,144 +1,144 @@
-# This file handles rusty object notation.
-require_relative "classnames"
-
-$indent = 0
-
-class Object
-  def rmxp_serialize
-    $indent += 2
-    str = "#{self.class.name.split("::").last}(\n"
-    self.instance_variables.each { |var| str += "#{"  " * $indent}#{var.to_s.delete("@")}: #{self.instance_variable_get(var).rmxp_serialize},\n" }
-    $indent -= 2
-    str += "#{"  " * $indent})"
-    str
-  end
-end
-
-class Table
-  def rmxp_serialize
-    str = "Table#{@num_of_dimensions}(\n"
-    $indent += 2
-    str += "#{"  " * $indent}"
-    str += case @num_of_dimensions
-      when 1
-        "xsize: #{@xsize},\n"
-      when 2
-        "xsize: #{@xsize}, ysize: #{@ysize},\n"
-      when 3
-        "xsize: #{@xsize}, ysize: #{@ysize}, zsize: #{@zsize},\n"
-      end
-    str += "#{"  " * $indent}data: [\n"
-    $indent += 2
-    case @num_of_dimensions
-    when 1
-      str += "#{"  " * $indent}"
-      @elements.each_with_index do |e, index|
-        str += "#{e}, "
-        str += "\n#{"  " * $indent}" if (index + 1) % 8 == 0
-      end
-      str += "\n"
-    when 2
-      @elements.each do |y|
-        str += "  " * $indent
-        y.each { |e| str += "#{e}, " }
-        str += "\n"
-      end
-    when 3
-      @elements.each do |z|
-        z.each do |y|
-          str += "  " * $indent
-          y.each { |e| str += "#{e}, " }
-          str += "\n"
-        end
-        str += "\n"
-      end
-    end
-    $indent -= 2
-    str += "#{"  " * $indent}]\n"
-    $indent -= 2
-    str += "#{"  " * $indent})"
-    str
-  end
-end
-
-class Hash
-  def rmxp_serialize
-    str = "{\n"
-    $indent += 2
-    self.each { |key, value| str += "#{"  " * $indent}#{key.rmxp_serialize}: #{value.rmxp_serialize},\n" }
-    $indent -= 2
-    str += "#{"  " * $indent}}"
-    str
-  end
-end
-
-# BAD BAD
-class NilClass
-  def rmxp_serialize
-    "None"
-  end
-end
-
-class String
-  def rmxp_serialize
-    self.inspect
-  end
-end
-
-class Array
-  def rmxp_serialize
-    unless self.empty?
-      str = "[\n"
-      $indent += 2
-      self.each { |e| next unless e; str += "#{"  " * $indent}#{e.rmxp_serialize},\n" }
-      $indent -= 2
-      str += "#{"  " * $indent}]"
-    else
-      str = "[]"
-    end
-    str
-  end
-end
-
-module RPG
-  class EventCommand
-    def rmxp_serialize
-      str = "EventCommand(\n"
-      $indent += 2
-      str += "#{"  " * $indent}indent: #{@indent},\n"
-      str += "#{"  " * $indent}code: #{@code},\n"
-      str += "#{"  " * $indent}parameters: ["
-      if @parameters.empty?
-        str += "],\n"
-      else
-        $indent += 2
-        @parameters.each do |param|
-          str += "\n#{"  " * $indent}#{param.class.name.split("::").last}(#{param.rmxp_serialize}),"
-        end
-        $indent -= 2
-        str += "\n#{"  " * $indent}],\n"
-      end
-      $indent -= 2
-      str += "#{"  " * $indent})"
-      str
-    end
-  end
-
-  class MoveCommand
-    def rmxp_serialize
-      str = "MoveCommand(\n"
-      $indent += 2
-      str += "#{"  " * $indent}code: #{@code},\n"
-      str += "#{"  " * $indent}parameters: ["
-      $indent += 2
-      @parameters.each do |param|
-        str += "\n#{"  " * $indent}#{param.class.name.split("::").last}(#{param.rmxp_serialize}),"
-      end
-      $indent -= 2
-      str += "\n#{"  " * $indent}],\n"
-      $indent -= 2
-      str += "#{"  " * $indent})"
-      str
-    end
-  end
-end
+# This file handles rusty object notation.
+require_relative "classnames"
+
+$indent = 0
+
+class Object
+  def rmxp_serialize
+    $indent += 2
+    str = "#{self.class.name.split("::").last}(\n"
+    self.instance_variables.sort.each { |var| str += "#{"  " * $indent}#{var.to_s.delete("@")}: #{self.instance_variable_get(var).rmxp_serialize},\n" }
+    $indent -= 2
+    str += "#{"  " * $indent})"
+    str
+  end
+end
+
+class Table
+  def rmxp_serialize
+    str = "Table#{@num_of_dimensions}(\n"
+    $indent += 2
+    str += "#{"  " * $indent}"
+    str += case @num_of_dimensions
+      when 1
+        "xsize: #{@xsize},\n"
+      when 2
+        "xsize: #{@xsize}, ysize: #{@ysize},\n"
+      when 3
+        "xsize: #{@xsize}, ysize: #{@ysize}, zsize: #{@zsize},\n"
+      end
+    str += "#{"  " * $indent}data: [\n"
+    $indent += 2
+    case @num_of_dimensions
+    when 1
+      str += "#{"  " * $indent}"
+      @elements.each_with_index do |e, index|
+        str += "#{e}, "
+        str += "\n#{"  " * $indent}" if (index + 1) % 8 == 0
+      end
+      str += "\n"
+    when 2
+      @elements.each do |y|
+        str += "  " * $indent
+        y.each { |e| str += "#{e}, " }
+        str += "\n"
+      end
+    when 3
+      @elements.each do |z|
+        z.each do |y|
+          str += "  " * $indent
+          y.each { |e| str += "#{e}, " }
+          str += "\n"
+        end
+        str += "\n"
+      end
+    end
+    $indent -= 2
+    str += "#{"  " * $indent}]\n"
+    $indent -= 2
+    str += "#{"  " * $indent})"
+    str
+  end
+end
+
+class Hash
+  def rmxp_serialize
+    str = "{\n"
+    $indent += 2
+    self.sort.each { |key, value| str += "#{"  " * $indent}#{key.rmxp_serialize}: #{value.rmxp_serialize},\n" }
+    $indent -= 2
+    str += "#{"  " * $indent}}"
+    str
+  end
+end
+
+# BAD BAD
+class NilClass
+  def rmxp_serialize
+    "None"
+  end
+end
+
+class String
+  def rmxp_serialize
+    self.inspect
+  end
+end
+
+class Array
+  def rmxp_serialize
+    unless self.empty?
+      str = "[\n"
+      $indent += 2
+      self.each { |e| next unless e; str += "#{"  " * $indent}#{e.rmxp_serialize},\n" }
+      $indent -= 2
+      str += "#{"  " * $indent}]"
+    else
+      str = "[]"
+    end
+    str
+  end
+end
+
+module RPG
+  class EventCommand
+    def rmxp_serialize
+      str = "EventCommand(\n"
+      $indent += 2
+      str += "#{"  " * $indent}indent: #{@indent},\n"
+      str += "#{"  " * $indent}code: #{@code},\n"
+      str += "#{"  " * $indent}parameters: ["
+      if @parameters.empty?
+        str += "],\n"
+      else
+        $indent += 2
+        @parameters.each do |param|
+          str += "\n#{"  " * $indent}#{param.class.name.split("::").last}(#{param.rmxp_serialize}),"
+        end
+        $indent -= 2
+        str += "\n#{"  " * $indent}],\n"
+      end
+      $indent -= 2
+      str += "#{"  " * $indent})"
+      str
+    end
+  end
+
+  class MoveCommand
+    def rmxp_serialize
+      str = "MoveCommand(\n"
+      $indent += 2
+      str += "#{"  " * $indent}code: #{@code},\n"
+      str += "#{"  " * $indent}parameters: ["
+      $indent += 2
+      @parameters.each do |param|
+        str += "\n#{"  " * $indent}#{param.class.name.split("::").last}(#{param.rmxp_serialize}),"
+      end
+      $indent -= 2
+      str += "\n#{"  " * $indent}],\n"
+      $indent -= 2
+      str += "#{"  " * $indent})"
+      str
+    end
+  end
+end

data/lib/rmxp_extractor/script_handler.rb

@@ -1,85 +1,85 @@
-#!/usr/bin/ruby
-require "zlib"
-
-module RMXPExtractor
-  def self.rpgscript(game_dir, scripts_dir, script_name, extract = false)
-    # Determine version of game engine
-    game_data_dir = File.join(game_dir, "Data")
-    unless Dir.exist? game_data_dir
-      STDERR.puts "error: #{game_dir} does not have a Data subdirectory"
-      exit 1
-    end
-
-    target_path = File.join(game_data_dir, script_name)
-
-    # Generate path of script list
-    list_path = File.join(scripts_dir, "_scripts.txt")
-
-    if extract
-      # Make sure the script directory exists
-      Dir.mkdir(scripts_dir) unless Dir.exists? scripts_dir
-
-      # Keep track of names of scripts extracted so we can warn about duplicates
-      names = Hash.new(0)
-
-      # Read scripts
-      File.open(target_path, "rb") do |fin|
-        File.open(list_path, "w") do |flist|
-          Marshal.load(fin).each_with_index do |script, index|
-            name = script[1].strip
-            data = Zlib::Inflate.inflate(script[2]).rstrip
-              .gsub(/[ \t]*(?:$|\r\n?)/, "\n")
-
-            # Make sure this file doesn't already exist
-            if name.empty?
-              if data.empty? || data == "\n"
-                flist.puts
-                next
-              else
-                name = "UNTITLED"
-              end
-            end
-
-            names[name] += 1
-            if names[name] > 1
-              name << " (#{names[name]})"
-            end
-
-            if data.empty? || data == "\n"
-              # Treat this like a comment
-              flist.puts("# " + name)
-            else
-              # Write to file order list
-              flist.puts(name)
-
-              # Write script file
-              File.open(File.join(scripts_dir, name + ".rb"), "wb") do |fout|
-                fout.write(data)
-              end
-            end
-          end
-        end
-      end
-      #puts "#{target_path} extracted."
-    else
-      # Write scripts
-      scripts = []
-
-      IO.foreach(list_path) do |name|
-        name.strip!
-        next if name.empty? || name.start_with?("#")
-
-        data = File.read(File.join(scripts_dir, name + ".rb")).rstrip.gsub("\n", "\r\n")
-
-        script = Array.new(3)
-        script[0] = 0
-        script[1] = name
-        script[2] = Zlib.deflate(data)
-        scripts << script
-      end
-
-      File.open(target_path, "wb") { |f| f.write(Marshal.dump(scripts)) }
-      #puts "#{target_path} written."
-    end
-  end
-end
+#!/usr/bin/ruby
+require "zlib"
+
+module RMXPExtractor
+  def self.rpgscript(game_dir, scripts_dir, script_name, extract = false)
+    # Determine version of game engine
+    game_data_dir = File.join(game_dir, "Data")
+    unless Dir.exist? game_data_dir
+      STDERR.puts "error: #{game_dir} does not have a Data subdirectory"
+      exit 1
+    end
+
+    target_path = File.join(game_data_dir, script_name)
+
+    # Generate path of script list
+    list_path = File.join(scripts_dir, "_scripts.txt")
+
+    if extract
+      # Make sure the script directory exists
+      Dir.mkdir(scripts_dir) unless Dir.exists? scripts_dir
+
+      # Keep track of names of scripts extracted so we can warn about duplicates
+      names = Hash.new(0)
+
+      # Read scripts
+      File.open(target_path, "rb") do |fin|
+        File.open(list_path, "w") do |flist|
+          Marshal.load(fin).each_with_index do |script, index|
+            name = script[1].strip
+            data = Zlib::Inflate.inflate(script[2]).rstrip
+              .gsub(/[ \t]*(?:$|\r\n?)/, "\n")
+
+            # Make sure this file doesn't already exist
+            if name.empty?
+              if data.empty? || data == "\n"
+                flist.puts
+                next
+              else
+                name = "UNTITLED"
+              end
+            end
+
+            names[name] += 1
+            if names[name] > 1
+              name << " (#{names[name]})"
+            end
+
+            if data.empty? || data == "\n"
+              # Treat this like a comment
+              flist.puts("# " + name)
+            else
+              # Write to file order list
+              flist.puts(name)
+
+              # Write script file
+              File.open(File.join(scripts_dir, name + ".rb"), "wb") do |fout|
+                fout.write(data)
+              end
+            end
+          end
+        end
+      end
+      #puts "#{target_path} extracted."
+    else
+      # Write scripts
+      scripts = []
+
+      IO.foreach(list_path) do |name|
+        name.strip!
+        next if name.empty? || name.start_with?("#")
+
+        data = File.read(File.join(scripts_dir, name + ".rb")).rstrip.gsub("\n", "\r\n")
+
+        script = Array.new(3)
+        script[0] = 0
+        script[1] = name
+        script[2] = Zlib.deflate(data)
+        scripts << script
+      end
+
+      File.open(target_path, "wb") { |f| f.write(Marshal.dump(scripts)) }
+      #puts "#{target_path} written."
+    end
+  end
+end

data/lib/rmxp_extractor/version.rb

@@ -1,3 +1,3 @@
-module RMXPExtractor
-  VERSION = "1.8"
-end
+module RMXPExtractor
+  VERSION = "1.9"
+end