comic_walker 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a5cddb9273f468c064ce300cbe66a9ca1f87680
-  data.tar.gz: a2f75342e60753047ab80894a5e4f52281a41396
+  metadata.gz: bc332a43582cb967395943b6013f0ab99fcf5fdd
+  data.tar.gz: 6069256b1d66ef11fadea09a3244b8d71ccc1511
 SHA512:
-  metadata.gz: 3002a2c97d87584ef29cc9c620d23abb58095a2df5234058d6b5daef8287ce0a76ec5ed53c46d12f6934e858b59333818b955f25348089362ef425917267f713
-  data.tar.gz: f7fa296b48bd74e0781458e753d90405e7c884540429e7378be8f49b29ebe3832b676e8c26c1d723da8aeaa622e10febdbf0fba0554a63aac97585546a5142d3
+  metadata.gz: 102121a8021d81e8e198bac79376c903d28519ae1809cac411cc0aad7f675f29d6030d5800576b4b59a363009e8ae5f5c2e93055b26b3314e065abdb3f140f47
+  data.tar.gz: acd044111e10b6f6e4268432b5bc5bc66da3670499bfb911389def51acd682c4267b4f82a26705e94513b98b665293f3600bb099993d07ca367ccc964e4788ac

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.2.1 (2014-04-19)
+- Take account of dummy width and height (#2)
+
 # 0.2.0 (2014-04-13)
 - Rename to `save` subcommand.
 - Add `contents` subcommand.

data/lib/comic_walker/cli.rb

@@ -87,9 +87,6 @@ module ComicWalker
           when 'configuration_pack.json'
             config = JSON.parse(zip.read)
             decoder = ItemDecoder.new(config)
-            config['configuration']['contents'].each do |content|
-              pages[content['index']-1] = content['file']
-            end
           when /end_layer\.json/
             begin
               pp EndLayerDecoder.new(license.key).decode(zip.read)
@@ -102,13 +99,13 @@ module ComicWalker
         end
 
         img_dir = Pathname.new(title).join(cid).tap(&:mkpath)
-        pages.each.with_index do |file, i|
+        decoder.pages.each.with_index do |file, i|
           dat_path = Pathname.new(file).join('0.dat')
           data = items[dat_path.to_s]
           img_fname = dat_path.parent.basename.sub_ext('.jpg')
           img_path = img_dir.join(sprintf('%03d_%s', i, img_fname))
           puts "#{dat_path} -> #{img_path}"
-          decoder.decode(dat_path, img_path, data)
+          decoder.decode(file, dat_path, img_path, data)
         end
       end
     end

data/lib/comic_walker/item_decoder.rb

@@ -3,6 +3,8 @@ require 'comic_walker/item_decoder/unknown'
 
 module ComicWalker
   class ItemDecoder
+    attr_reader :pages
+
     def initialize(configuration_pack)
       fname = '0.dat'
       ct = configuration_pack['ct']
@@ -11,9 +13,17 @@ module ComicWalker
       @key1 = (ct + st + fname).unpack('C*')
       @key2 = (ct + fname + et).unpack('C*')
       @key3 = (fname + st + et).unpack('C*')
+      @pages = []
+      configuration_pack['configuration']['contents'].each do |content|
+        pages[content['index']-1] = content['file']
+      end
+      @file_info = {}
+      @pages.each do |file|
+        @file_info[file] = configuration_pack[file]
+      end
     end
 
-    def decode(dat_path, img_path, b64data)
+    def decode(file, dat_path, img_path, b64data)
       bs = 128
       hs = 1024
       blob = Unknown.finish(@key1, hs,
@@ -27,11 +37,14 @@ module ComicWalker
       src = Magick::Image.from_blob(blob).first
       width = src.columns
       height = src.rows
+      page_info = @file_info[file]['FileLinkInfo']['PageLinkInfoList'].first['Page']
+      dummy_height = page_info['DummyHeight']
+      dummy_width = page_info['DummyWidth']
       t = dat_path.sub_ext('').to_s.chars.inject(0) { |acc, c| acc + c.ord }
       pat = t%4 + 1
       moves = Unknown.calculate_moves(width, height, 64, 64, pat)
 
-      dst = Magick::Image.new(width, height)
+      dst = Magick::Image.new(width - dummy_width, height - dummy_height)
       dst.format = 'jpeg'
       moves.each do |move|
         crop = src.excerpt(move[:destX], move[:destY], move[:width], move[:height])

data/lib/comic_walker/version.rb

@@ -1,5 +1,5 @@
 module ComicWalker
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 
   VIEWER_VERSION = "1.0.2_2014-03-20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comic_walker
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler