kaitai-struct-visualizer 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 606cb8d727e8b560aa87474311d25b831e3f81f3
-  data.tar.gz: 87445c8ed759fb11c471ded3e7c99ca86e6352ce
+  metadata.gz: d14808a034e6e74e58395601dcfdeec2cf874d69
+  data.tar.gz: 75e679c69ed1ee921fe0c9aa2448157bd19dc6e1
 SHA512:
-  metadata.gz: ffc2d4c17e093427ef1aa181e8a1b013edfe7a96c860c3047750d8c2373d52f7da506104a8ac55c6fe227dc06fd93d4177ffe56239a5e912569f66599f0a9b07
-  data.tar.gz: e614e0fc75eef49ea7dd59146e37226edf63a6e1be97d19028d03b1cb805aa04769dea0ba9f985cfe47f0b5b74fc6162e9217ca9e4b81fed20149d5dcb6f6f0b
+  metadata.gz: f49dccf89740812c59b12e8eb41067cbe5705ef7ec7e3a210d33087c4c8b2b0863c860db0a43ee38f9dd926ee67e3819ae401e2a4b14f17a8ed160b6699f1415
+  data.tar.gz: 2224037570682309e1ce9db6b9245869f5382b71150705caf3bfd802c7a3727dff7aacfcb1cc196d225795bc60ad5214e07b06dc94169a3f41717c9c8c8e7414

data/kaitai-struct-visualizer.gemspec

@@ -33,5 +33,5 @@ EOF
   s.add_development_dependency 'rake', '~> 10'
 #  s.add_development_dependency 'rspec', '~> 3'
 
-  s.add_dependency 'kaitai-struct', "~> #{s.version}"
+  s.add_dependency 'kaitai-struct', "~> 0.4"
 }

data/lib/kaitai/struct/visualizer/hex_viewer.rb

@@ -55,7 +55,7 @@ class HexViewer
     c = nil
     loop {
       @ui.goto(0, @max_scr_ln + 1)
-      printf "%06x (%d, %d)", @addr, @cur_x, @cur_y
+      printf "%08x (%d, %d)", @addr, @cur_x, @cur_y
 
       @ui.goto(col_to_col_char(@cur_x), row_to_scr(@cur_y))
       c = @ui.read_char_mapped
@@ -114,6 +114,13 @@ class HexViewer
           @cur_x = PER_LINE - 1
         end
         clamp_cursor
+      when 'w'
+        fn = @ui.input_str('Write buffer to file', 'Filename')
+        File.open(fn, 'w') { |out|
+          out.write(@buf)
+        }
+        @ui.clear
+        redraw
       when 'q'
         @tree.do_exit if @tree
         return
@@ -137,21 +144,21 @@ class HexViewer
   PER_LINE = 16
   PER_GROUP = 4
   PAGE_ROWS = 20
-  FMT = "%06x: %-#{PER_LINE * 3}s| %-#{PER_LINE}s\n"
+  FMT = "%08x: %-#{PER_LINE * 3}s| %-#{PER_LINE}s\n"
 
   def self.line_width
-    #6 + 2 + 3 * PER_LINE + 2 + PER_LINE
-    10 + 4 * PER_LINE
+    #8 + 2 + 3 * PER_LINE + 2 + PER_LINE
+    12 + 4 * PER_LINE
   end
 
   def col_to_col_hex(c)
-    #6 + 2 + 3 * c
-    @shift_x + 8 + 3 * c
+    #8 + 2 + 3 * c
+    @shift_x + 10 + 3 * c
   end
 
   def col_to_col_char(c)
-    #6 + 2 + 3 * PER_LINE + 2
-    @shift_x + 10 + 3 * PER_LINE + c
+    #8 + 2 + 3 * PER_LINE + 2
+    @shift_x + 12 + 3 * PER_LINE + c
   end
 
   def row_to_scr(r)

data/lib/kaitai/struct/visualizer/node.rb

@@ -40,6 +40,7 @@ class Node
   def openable?
     not (
       @value.is_a?(Fixnum) or
+      @value.is_a?(Bignum) or
       @value.is_a?(String) or
       @value.is_a?(Symbol) or
       @value === true or
@@ -84,7 +85,7 @@ class Node
 
     pos = 2 * level + 4 + @id.length
 
-    if @value.is_a?(Fixnum)
+    if @value.is_a?(Fixnum) or @value.is_a?(Bignum)
       print " = #{@value}"
     elsif @value.is_a?(Symbol)
       print " = #{@value}"
@@ -95,9 +96,11 @@ class Node
       max_len = @tree.tree_width - pos
       case @str_mode
       when :str
-        s = @value[0, max_len]
+        v = @value.encode('UTF-8')
+        s = v[0, max_len]
       when :str_esc
-        s = @value.inspect[0, max_len]
+        v = @value.encode('UTF-8')
+        s = v.inspect[0, max_len]
       when :hex
         s = first_n_bytes_dump(@value, max_len / 3 + 1)
       else
@@ -159,7 +162,7 @@ class Node
       @value = @parent.value.send(@value_method)
     end
 
-    if @value.is_a?(Fixnum) or @value.is_a?(String) or @value.is_a?(Symbol)
+    if @value.is_a?(Fixnum) or @value.is_a?(Bignum) or @value.is_a?(String) or @value.is_a?(Symbol)
       # do nothing else
     elsif @value.is_a?(Array)
       clean_id = @id[0] == '@' ? @id[1..-1] : @id

data/lib/kaitai/struct/visualizer/version.rb

@@ -1,7 +1,7 @@
 module Kaitai
   module Struct
     module Visualizer
-      VERSION = '0.3'
+      VERSION = '0.4'
     end
   end
 end

data/lib/kaitai/tui.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 require 'io/console'
+require 'readline'
 
 module Kaitai
 
@@ -141,6 +142,16 @@ class TUI
     }
   end
 
+  def input_str(header, msg)
+    top_y = @rows / 2 - 5
+    draw_rectangle(10, top_y, @cols - 20, 10)
+    goto(@cols / 2 - (header.length / 2) - 1, top_y)
+    print ' ', header, ' '
+
+    goto(11, top_y + 1)
+    Readline.readline('', false)
+  end
+
   def draw_rectangle(x, y, w, h, charset = DOUBLE_CHARSET)
     goto(x, y)
     print charset[CHAR_TL]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaitai-struct-visualizer
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Mikhail Yakshin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 description: |
   Kaitai Struct is a declarative language used for describe various binary data structures, laid out in files or in memory: i.e. binary file formats, network stream packet formats, etc.