wolftrans 0.0.2 → 0.1.0

data/lib/wolftrans.rb

@@ -1,6 +1,9 @@
+require 'wolftrans/util.rb'
+
 require 'wolftrans/patch_text'
 require 'wolftrans/patch_data'
-require 'wolfrpg'
+
+require 'wolftrans/debug.rb'
 
 module WolfTrans
   class Patch
@@ -101,69 +104,6 @@ module WolfTrans
     end
   end
 
-  #####################
-  # Utility functions #
-
-  # Sanitize a path; i.e., standardize path separators remove trailing separator
-  def self.sanitize_path(path)
-    if File::ALT_SEPARATOR
-      path = path.gsub(File::ALT_SEPARATOR, '/')
-    end
-    path.sub(/\/$/, '')
-  end
-
-  # Get the name of a path case-insensitively
-  def self.join_path_nocase(parent, child)
-    child_case = Dir.entries(parent).select { |e| e.downcase == child }.first
-    return nil unless child_case
-    return "#{parent}/#{child_case}"
-  end
-
-  # Strip all leading/trailing whitespace, including fullwidth spaces
-  def self.full_strip(str)
-    str.strip.sub(/^\u{3000}*/, '').sub(/\u{3000}*$/, '')
-  end
-
-  # Escape a string for use as a path on the filesystem
-  # https://stackoverflow.com/questions/2270635/invalid-chars-filter-for-file-folder-name-ruby
-  def self.escape_path(path)
-    full_strip(path).gsub(/[\x00\/\\:\*\?\"<>\|]/, '_')
-  end
-
-  ###################
-  # Debug functions #
-  def self.grep(dir, needle)
-    Find.find(dir) do |path|
-      next if FileTest.directory? path
-
-      basename = File.basename(path)
-      basename_downcase = basename.downcase
-      basename_noext = File.basename(basename_downcase, '.*')
-      parent_path = File.dirname(path)
-      ext = File.extname(basename_downcase)
-
-      if ext.downcase == '.mps'
-        WolfRpg::Map.new(path).grep(needle)
-      elsif ext.downcase == '.project'
-        next if basename_downcase == 'sysdatabasebasic.project'
-        dat_filename = WolfTrans.join_path_nocase(parent_path, "#{basename_noext}.dat")
-        next if dat_filename == nil
-        WolfRpg::Database.new(path, dat_filename).grep(needle)
-      elsif basename_downcase == 'commonevent.dat'
-        WolfRpg::CommonEvents.new(path).grep(needle)
-      end
-    end
-  end
-
-  def self.grep_cid(dir, cid)
-    Find.find(dir) do |path|
-      next if FileTest.directory? path
-      if File.extname(path).downcase == '.mps'
-        WolfRpg::Map.new(path).grep_cid(cid)
-      end
-    end
-  end
-
   # Latest patch version format that can be read
   TXT_VERSION = Version.new(major: 1, minor: 0)
 end

data/lib/wolftrans/context.rb

@@ -146,11 +146,11 @@ module WolfTrans
       def initialize(db_name, type_index, type_name, datum_index, datum_name, field_index, field_name)
         @db_name = db_name
         @type_index = type_index
-        @type_name = WolfTrans.full_strip(type_name)
+        @type_name = Util.full_strip(type_name)
         @datum_index = datum_index
-        @datum_name = WolfTrans.full_strip(datum_name)
+        @datum_name = Util.full_strip(datum_name)
         @field_index = field_index
-        @field_name = WolfTrans.full_strip(field_name)
+        @field_name = Util.full_strip(field_name)
       end
 
       def eql?(other)

data/lib/wolftrans/debug.rb

@@ -0,0 +1,35 @@
+module WolfTrans
+  module Debug
+    def self.grep(dir, needle)
+      Find.find(dir) do |path|
+        next if FileTest.directory? path
+
+        basename = File.basename(path)
+        basename_downcase = basename.downcase
+        basename_noext = File.basename(basename_downcase, '.*')
+        parent_path = File.dirname(path)
+        ext = File.extname(basename_downcase)
+
+        if ext.downcase == '.mps'
+          WolfRpg::Map.new(path).grep(needle)
+        elsif ext.downcase == '.project'
+          next if basename_downcase == 'sysdatabasebasic.project'
+          dat_filename = WolfTrans.join_path_nocase(parent_path, "#{basename_noext}.dat")
+          next if dat_filename == nil
+          WolfRpg::Database.new(path, dat_filename).grep(needle)
+        elsif basename_downcase == 'commonevent.dat'
+          WolfRpg::CommonEvents.new(path).grep(needle)
+        end
+      end
+    end
+
+    def self.grep_cid(dir, cid)
+      Find.find(dir) do |path|
+        next if FileTest.directory? path
+        if File.extname(path).downcase == '.mps'
+          WolfRpg::Map.new(path).grep_cid(cid)
+        end
+      end
+    end
+  end
+end

data/lib/wolftrans/patch_data.rb

@@ -9,11 +9,11 @@ require 'find'
 module WolfTrans
   class Patch
     def load_data(game_dir)
-      @game_dir = WolfTrans.sanitize_path(game_dir)
+      @game_dir = Util.sanitize_path(game_dir)
       unless Dir.exist? @game_dir
         raise "could not find game folder '#{@game_dir}'"
       end
-      @game_data_dir = WolfTrans.join_path_nocase(@game_dir, 'data')
+      @game_data_dir = Util.join_path_nocase(@game_dir, 'data')
       if @game_data_dir == nil
         raise "could not find data folder in '#{@game_dir}'"
       end
@@ -39,7 +39,7 @@ module WolfTrans
               load_game_dat(filename)
             elsif extension == '.project'
               next if basename_downcase == 'sysdatabasebasic.project'
-              dat_filename = WolfTrans.join_path_nocase(parent_path, "#{basename_noext}.dat")
+              dat_filename = Util.join_path_nocase(parent_path, "#{basename_noext}.dat")
               next if dat_filename == nil
               load_game_database(filename, dat_filename)
             elsif basename_downcase == 'commonevent.dat'
@@ -53,7 +53,7 @@ module WolfTrans
     # Apply the patch to the files in the game path and write them to the
     # output directory
     def apply(out_dir)
-      out_dir = WolfTrans.sanitize_path(out_dir)
+      out_dir = Util.sanitize_path(out_dir)
       out_data_dir = "#{out_dir}/Data"
 
       # Clear out directory
@@ -116,6 +116,7 @@ module WolfTrans
         'MapChip',
         'Picture',
         'SystemFile',
+        'SystemGraphic',
       ].each do |dirname|
         copy_data_files(out_data_dir, dirname, ['png','jpg','jpeg','bmp'])
       end
@@ -182,24 +183,25 @@ module WolfTrans
     end
 
     def load_game_database(project_filename, dat_filename)
+      db_name = File.basename(project_filename, '.*')
       db = WolfRpg::Database.new(project_filename, dat_filename)
       db.types.each_with_index do |type, type_index|
         next if type.name.empty?
-        patch_filename = "dump/db/#{db.name}/#{WolfTrans.escape_path(type.name)}.txt"
+        patch_filename = "dump/db/#{db_name}/#{Util.escape_path(type.name)}.txt"
         type.data.each_with_index do |datum, datum_index|
           datum.each_translatable do |str, field|
-            context = Context::Database.from_data(db.name, type_index, type, datum_index, datum, field)
+            context = Context::Database.from_data(db_name, type_index, type, datum_index, datum, field)
             @strings[str][context] ||= Translation.new(patch_filename)
           end
         end
       end
-      @databases[db.name] = db
+      @databases[db_name] = db
     end
 
     def load_common_events(filename)
       @common_events = WolfRpg::CommonEvents.new(filename)
       @common_events.events.each do |event|
-        patch_filename = "dump/common/#{'%03d' % event.id}_#{WolfTrans.escape_path(event.name)}.txt"
+        patch_filename = "dump/common/#{'%03d' % event.id}_#{Util.escape_path(event.name)}.txt"
         event.commands.each_with_index do |command, cmd_index|
           strings_of_command(command) do |string|
             @strings[string][Context::CommonEvent.from_data(event, cmd_index, command)] ||=

data/lib/wolftrans/patch_text.rb

@@ -9,7 +9,7 @@ module WolfTrans
     ######################
     # Loading Patch data #
     def load_patch(patch_dir)
-      @patch_dir = WolfTrans.sanitize_path(patch_dir)
+      @patch_dir = Util.sanitize_path(patch_dir)
       @patch_assets_dir = "#{@patch_dir}/Assets"
       @patch_strings_dir = "#{@patch_dir}/Patch"
 
@@ -19,7 +19,7 @@ module WolfTrans
       end
 
       # Find data dir
-      @patch_data_dir = WolfTrans.join_path_nocase(@patch_assets_dir, 'data')
+      @patch_data_dir = Util.join_path_nocase(@patch_assets_dir, 'data')
 
       # Load blacklist
       @file_blacklist = []

data/lib/wolftrans/util.rb

@@ -0,0 +1,29 @@
+module WolfTrans
+  module Util
+    # Sanitize a path; i.e., standardize path separators remove trailing separator
+    def self.sanitize_path(path)
+      if File::ALT_SEPARATOR
+        path = path.gsub(File::ALT_SEPARATOR, '/')
+      end
+      path.sub(/\/$/, '')
+    end
+
+    # Get the name of a path case-insensitively
+    def self.join_path_nocase(parent, child)
+      child_case = Dir.entries(parent).select { |e| e.downcase == child }.first
+      return nil unless child_case
+      return "#{parent}/#{child_case}"
+    end
+
+    # Strip all leading/trailing whitespace, including fullwidth spaces
+    def self.full_strip(str)
+      str.strip.sub(/^\u{3000}*/, '').sub(/\u{3000}*$/, '')
+    end
+
+    # Escape a string for use as a path on the filesystem
+    # https://stackoverflow.com/questions/2270635/invalid-chars-filter-for-file-folder-name-ruby
+    def self.escape_path(path)
+      full_strip(path).gsub(/[\x00\/\\:\*\?\"<>\|]/, '_')
+    end
+  end
+end

data/lib/wolftrans/version.rb

@@ -0,0 +1,3 @@
+module WolfTrans
+  VERSION = '0.1.0'
+end

data/test/test_wolftrans.rb

@@ -27,8 +27,9 @@ Dir.entries(TEST_DIR).sort.each do |entry|
   Dir.mktmpdir do |tmpdir|
     patch_dir = "#{tmpdir}/patch"
     out_dir = "#{tmpdir}/out"
-    puts "==Attempting '#{entry}'"
+    puts "==Patching '#{entry}'"
     WolfTrans::Patch.new(path, patch_dir).apply(out_dir)
+    puts "==Running '#{entry}'"
     run_exe("#{out_dir}/Game.exe")
   end
 end

data/wolftrans.gemspec

@@ -1,14 +1,16 @@
-# coding: utf-8
+$:.unshift File.expand_path('../lib', __FILE__)
+
+require 'wolftrans/version'
+
 Gem::Specification.new do |s|
   s.name          = 'wolftrans'
-  s.version       = '0.0.2'
-  s.date          = '2015-09-14'
+  s.version       = WolfTrans::VERSION
   s.summary       = 'A utility to translate Wolf RPG Editor games'
   s.description   = s.summary
   s.authors       = ['Mathew Velasquez']
   s.email         = 'mathewvq@gmail.com'
   s.files         = `git ls-files -z`.split("\x0")
   s.executables   << 'wolftrans'
-  s.homepage      = 'http://mathew.link/'
+  s.homepage      = 'https://github.com/mathewv/wolftrans'
   s.license       = 'MPL'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wolftrans
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Mathew Velasquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies: []
 description: A utility to translate Wolf RPG Editor games
 email: mathewvq@gmail.com
@@ -25,17 +25,21 @@ files:
 - lib/wolfrpg/command.rb
 - lib/wolfrpg/common_events.rb
 - lib/wolfrpg/database.rb
+- lib/wolfrpg/debug.rb
+- lib/wolfrpg/filecoder.rb
 - lib/wolfrpg/game_dat.rb
-- lib/wolfrpg/io.rb
 - lib/wolfrpg/map.rb
 - lib/wolfrpg/route.rb
 - lib/wolftrans.rb
 - lib/wolftrans/context.rb
+- lib/wolftrans/debug.rb
 - lib/wolftrans/patch_data.rb
 - lib/wolftrans/patch_text.rb
+- lib/wolftrans/util.rb
+- lib/wolftrans/version.rb
 - test/test_wolftrans.rb
 - wolftrans.gemspec
-homepage: http://mathew.link/
+homepage: https://github.com/mathewv/wolftrans
 licenses:
 - MPL
 metadata: {}

data/lib/wolfrpg/io.rb

@@ -1,63 +0,0 @@
-module WolfRpg
-  module IO
-    ########
-    # Read #
-    def self.read(io, size)
-      io.readpartial(size)
-    end
-    def self.read_byte(io)
-      io.readpartial(1).unpack('C').first
-    end
-    def self.read_int(io)
-      io.readpartial(4).unpack('l<').first
-    end
-    def self.read_string(io)
-      size = read_int(io)
-      return '' if size == 0
-      str = io.readpartial(size - 1).encode(Encoding::UTF_8, Encoding::WINDOWS_31J)
-      raise "string not null-terminated" unless read_byte(io) == 0
-      return str
-    end
-    def self.verify(io, data)
-      got = io.readpartial(data.length)
-      if got != data
-        raise "could not verify magic data (expecting #{data.unpack('C*')}, got #{got.unpack('C*')})"
-      end
-    end
-    def self.dump(io, length)
-      length.times do |i|
-        print " %02x" % read_byte(io)
-      end
-      print "\n"
-    end
-    def self.dump_until(pattern)
-      escaped_pattern = Regexp.escape(pattern)
-      str = ''.force_encoding('BINARY')
-      until str =~ /#{escaped_pattern}\z/nm
-        str << io.readpartial(1)
-      end
-      str.gsub(/#{escaped_pattern}\z/nm, '').each_byte do |byte|
-        print " %02x" % byte
-      end
-      print "\n"
-    end
-
-    #########
-    # Write #
-    def self.write(io, data)
-      io.write(data)
-    end
-    def self.write_byte(io, data)
-      io.write(data.chr)
-    end
-    def self.write_int(io, data)
-      io.write([data].pack('l<'))
-    end
-    def self.write_string(io, data)
-      new_data = data.encode(Encoding::WINDOWS_31J, Encoding::UTF_8)
-      write_int(io, new_data.bytesize + 1)
-      io.write(new_data)
-      write_byte(io, 0)
-    end
-  end
-end