feh-bin 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12f43b8f3478cbe44da84b86aedbbba2777cc505095841d3b81862c53df40d32
-  data.tar.gz: e06d68f95ad4bdc8675fc2dc9a4b46349c556a01fd0119907954c351a3b451a3
+  metadata.gz: edd6d24993fac460bb3802e6e0b5bbf89eba157f95578fcddefc1978c10252de
+  data.tar.gz: 6533e94d5ccac6f450d9d30af5030e176db4b0e07469b08f7b46461d687afbab
 SHA512:
-  metadata.gz: 5933e1059ebe9af2e92b33d6102af96ceb45b6b8fb639b041d8a7f38c7017057a278ae9164e04729c7c0866fdc8b575709980c8b5b13b21acaacd94f10003195
-  data.tar.gz: 95a60737d73dd0e0c26ef99a03310e436a656045b1da27f6148102db6d570f17a4c8f0b8f6ae1bda2c525b677a543f2dfa1e074be8e0ec0ff08c5ce7b7d037ca
+  metadata.gz: 559d591883a1f7eff863a5f1a0e156486c6003a341b9394d0763068f4a03486cac4fba1ed095615dad4acda308231fa66bbc503185c4599c04ecf4efd91db220
+  data.tar.gz: 403236754926a1ff5addb2bcf06f67f00da021d7101dba6e3da0b1db135cbc49d0dc961f0807a0280d4fc2282da51f642bc375b6abfd800467d34ee563ec5033

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    feh-bin (0.1.2)
+    feh-bin (0.1.4)
 
 GEM
   remote: https://rubygems.org/
@@ -19,4 +19,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.16.5
+   1.16.6

data/bin/feh_bin_lz

@@ -3,13 +3,27 @@
 require 'feh/bin'
 
 DESC = "Fire Emblem Heroes assets converter
-Usage: #{File.basename(__FILE__)} <files>...
+Usage: #{File.basename(__FILE__)} [OPTION] <files>...
 
 Files ending in .bin.lz are converted to .bin; all other files are converted
-into .bin.lz."
+into .bin.lz.
+
+Options:
+  -s     Only encrypt files, do not compress using LZ11"
 
 abort DESC if ARGV.empty? || ARGV.include?('-?') || ARGV.include?('--help')
 
+$no_compress = false
+
+ARGV.select {|opt| opt.start_with? '-'}.each do |opt|
+  case opt
+  when '-s'
+    $no_compress = true
+  end
+end
+
+ARGV.reject! {|opt| opt.start_with? '-'}
+
 ARGV.each do |fname|
   begin
     buf = IO.binread(fname)
@@ -24,7 +38,7 @@ ARGV.each do |fname|
       outname = File.expand_path(
         File.basename(fname, '.*') + '.bin.lz', File.dirname(fname))
       puts "Compressing #{fname} -> #{outname}..."
-      res = Feh::Bin.compress(buf)
+      res = Feh::Bin.compress(buf, $no_compress)
       raise RuntimeError, res.to_s if res.is_a?(Symbol)
       IO.binwrite(outname, res.pack('c*'))
     end

data/lib/feh/bin.rb

@@ -17,13 +17,18 @@ module Feh
 
     # Compresses data into a .bin.lz file.
     # @param buf [Array<Integer>, String] content of the data to compress
+    # @param no_compress [Boolean] true if LZ11 is not used to compress the data
     # @return [Array<Integer>] content of the .bin.lz file
     # @return [Symbol] error code if the input is not a valid data buffer
-    def self.compress(buf)
+    def self.compress(buf, no_compress = false)
       buf = buf.bytes if buf.is_a?(String)
-      buf2 = LZ11.new(buf).compress
-      return buf2 if buf2.is_a?(Symbol)
-      write_bin_lz(buf2, buf.size)
+      if no_compress
+        write_bin_lz04(buf, buf.size)
+      else
+        buf2 = LZ11.new(buf).compress
+        return buf2 if buf2.is_a?(Symbol)
+        write_bin_lz(buf2, buf.size)
+      end
     end
 
     # Unpacks a Fire Emblem Heroes .bin.lz file.
@@ -35,7 +40,7 @@ module Feh
       header = buf.shift(4)
       xorseed = header[1] | (header[2] << 8) | (header[3] << 16)
       if (header.first & 0xFF) == 0x17 && (buf.first & 0xFF) == 0x11
-        xorkey = [0x8083 * xorseed].pack('<I').bytes
+        xorkey = [0x8083 * xorseed].pack('<l').bytes
         (4...buf.size).step(4).each do |i|
           4.times {|j| buf[i + j] ^= xorkey[j]}
           4.times {|j| xorkey[j] ^= buf[i + j]}
@@ -56,7 +61,7 @@ module Feh
       header = buf.shift(4)
       xorseed = header[1] | (header[2] << 8) | (header[3] << 16)
       if header.first == 0x04 && xorseed == buf.size
-        xorkey = [0x8083 * xorseed].pack('<I').bytes
+        xorkey = [0x8083 * xorseed].pack('<l').bytes
         (0...buf.size).step(4).each do |i|
           4.times {|j| buf[i + j] ^= xorkey[j]}
           4.times {|j| xorkey[j] ^= buf[i + j]}
@@ -75,13 +80,31 @@ module Feh
       bytes = bytes.bytes if bytes.is_a?(String)
       bytes += [0] * ((-bytes.size) % 4)
       xorseed = bytes.size if xorseed.nil?
-      header = [xorseed * 0x100 + 0x17].pack('<I').bytes
-      xorkey = [0x8083 * xorseed].pack('<I').bytes
+      header = [xorseed * 0x100 + 0x17].pack('<l').bytes
+      xorkey = [0x8083 * xorseed].pack('<l').bytes
       4.times {|j| bytes[4 + j] ^= xorkey[j]}
       (8...bytes.size).step(4).each do |i|
         4.times {|j| bytes[i + j] ^= bytes[i - 4 + j]}
       end
       header + bytes
     end
+
+    # Packs a Fire Emblem Heroes .bin.lz file.
+    # Used for files that are XOR-encrypted for FEH but not LZ11-compressed.
+    # @param bytes [Array<Integer>, String] content of an archive
+    # @param xorseed [Integer, nil] optional XOR encryption value
+    # @return [Array<Integer>] content of the packed .bin.lz file
+    def self.write_bin_lz04(bytes, xorseed = nil)
+      bytes = bytes.bytes if bytes.is_a?(String)
+      bytes += [0] * ((-bytes.size) % 4)
+      xorseed = bytes.size if xorseed.nil?
+      header = [xorseed * 0x100 + 0x04].pack('<l').bytes
+      xorkey = [0x8083 * xorseed].pack('<l').bytes
+      4.times {|j| bytes[j] ^= xorkey[j]}
+      (4...bytes.size).step(4).each do |i|
+        4.times {|j| bytes[i + j] ^= bytes[i - 4 + j]}
+      end
+      header + bytes
+    end
   end
 end

data/lib/feh/bin/array_ostream.rb

@@ -5,7 +5,6 @@ require 'forwardable'
 module Feh module Bin
   # Single-pass output array stream that writes little-endian integers.
   class ArrayOStream
-
     # @return [Array<Integer>] the stream content
     def buf
       @buf.dup

data/lib/feh/bin/version.rb

@@ -1,6 +1,6 @@
 module Feh
   module Bin
     # Version number.
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feh-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Quinton Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler