feh-bin 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12f43b8f3478cbe44da84b86aedbbba2777cc505095841d3b81862c53df40d32
-  data.tar.gz: e06d68f95ad4bdc8675fc2dc9a4b46349c556a01fd0119907954c351a3b451a3
+  metadata.gz: 74bef714ca93f4872ed31bbcab86aebf0ce0cbb9a21737e5db97163a232b5a7c
+  data.tar.gz: 9e4da872f92c073dc081f2225f5c0e873a5845641f823e453925a4c9e8b0ff19
 SHA512:
-  metadata.gz: 5933e1059ebe9af2e92b33d6102af96ceb45b6b8fb639b041d8a7f38c7017057a278ae9164e04729c7c0866fdc8b575709980c8b5b13b21acaacd94f10003195
-  data.tar.gz: 95a60737d73dd0e0c26ef99a03310e436a656045b1da27f6148102db6d570f17a4c8f0b8f6ae1bda2c525b677a543f2dfa1e074be8e0ec0ff08c5ce7b7d037ca
+  metadata.gz: ac92ed5505d6d191209effa0013de9337cd59a7467896fce74303bea59bff67328fcf8bae9ff520afd7e4d9ccdf070979c0b0c57ddc826bec2eab588beccc6e3
+  data.tar.gz: 52d400fc11d3f0f2f5e3e190ddec725cb3930e645fbb760e6e36b56061d111f22a3f151640632769ee1b73a6d3ee646ea51a667dd0f5eaf795688072ee0351ef

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    feh-bin (0.1.2)
+    feh-bin (0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.11.3)
-    rake (10.5.0)
+    minitest (5.18.0)
+    rake (13.0.6)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler
   feh-bin!
-  minitest (~> 5.0)
-  rake (~> 10.0)
+  minitest
+  rake
 
 BUNDLED WITH
-   1.16.5
+   2.4.6

data/README.md

@@ -16,6 +16,12 @@ To convert `a.bin` to `a.bin.lz`, and `b.bin.lz` to `b.bin`:
 $ feh_bin_lz a.bin b.bin.lz
 ```
 
+If it takes too long to compress a file, try adding `-s` anywhere:
+
+```
+$ feh_bin_lz -s very_large_file.bin
+```
+
 ## Library example
 
 ```ruby
@@ -28,6 +34,15 @@ end
 
 ## Changelog
 
+### V0.2.0
+
+- Fix `<internal:pack>:8: warning: unknown pack directive '<' in '<l'` message
+- Allow use of Bundler 2.x
+
+### V0.1.4
+
+- Added command line option `-s` to `feh_bin_lz` which skips LZ11 compression
+
 ### V0.1.3
 
 - Added read support for non-LZ11-compressed .bin.lz files

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/feh-bin.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extra_rdoc_files = ['README.md']
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "bundler", "~> 2"
+  spec.add_development_dependency "rake", "~> 13"
+  spec.add_development_dependency "minitest", "~> 5"
 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.2.0"
   end
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feh-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Quinton Miller
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
 description: Functions to compress and decompress binary asset files from Fire Emblem
   Heroes
 email:
@@ -80,7 +80,7 @@ homepage: https://github.com/HertzDevil/feh-bin
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,9 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
 summary: Conversion routines for Fire Emblem Heroes asset files
 test_files: []