comic_walker 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc332a43582cb967395943b6013f0ab99fcf5fdd
-  data.tar.gz: 6069256b1d66ef11fadea09a3244b8d71ccc1511
+  metadata.gz: 31c86d5ee6917c1d2443b444ad0af64ea30312b7
+  data.tar.gz: ad9a19cdaba4cc3ef9e78caaf4283e1024e25e1e
 SHA512:
-  metadata.gz: 102121a8021d81e8e198bac79376c903d28519ae1809cac411cc0aad7f675f29d6030d5800576b4b59a363009e8ae5f5c2e93055b26b3314e065abdb3f140f47
-  data.tar.gz: acd044111e10b6f6e4268432b5bc5bc66da3670499bfb911389def51acd682c4267b4f82a26705e94513b98b665293f3600bb099993d07ca367ccc964e4788ac
+  metadata.gz: 484678c62454decd50c4153b0f3b9f2ab5e018f4cf08d26ffa61196a3d3132968a1c6cf09df458aef884a179874936c90e4d3a5fdadcb18989eaee0b83d56034
+  data.tar.gz: 0265eec741fde6d0d8a647d4023ab5578e66d3e6917341295fa5fe53c8d414606965a12225da895d2dedb9bdad3c688555b2be4cf54f4d16c5358e368de2ccce

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.2.2 (2014-05-11)
+- Fix image fetch errors for recent comics
+
 # 0.2.1 (2014-04-19)
 - Take account of dummy width and height (#2)
 

data/README.md

@@ -1,5 +1,6 @@
 # ComicWalker
 [![Gem Version](https://badge.fury.io/rb/comic_walker.svg)](http://badge.fury.io/rb/comic_walker)
+[![Code Climate](https://codeclimate.com/github/eagletmt/comic_walker.png)](https://codeclimate.com/github/eagletmt/comic_walker)
 
 Client library for [ComicWalker](http://comic-walker.com/).
 

data/lib/comic_walker/cli.rb

@@ -101,11 +101,15 @@ module ComicWalker
         img_dir = Pathname.new(title).join(cid).tap(&:mkpath)
         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))
+
+          if data = items[dat_path.to_s]
+            decoder.decode_b64(file, dat_path, img_path, data)
+          else
+            decoder.decode(file, dat_path, img_path, license.get_jpeg(file))
+          end
           puts "#{dat_path} -> #{img_path}"
-          decoder.decode(file, dat_path, img_path, data)
         end
       end
     end

data/lib/comic_walker/client/license.rb

@@ -15,11 +15,15 @@ module ComicWalker
       end
 
       def jar_url
-        agreement['url_prefix'] + agreement['jar_file_name']
+        url_prefix + agreement['jar_file_name']
       end
 
       def info_url
-        agreement['url_prefix'] + agreement['info_file_name']
+        url_prefix + agreement['info_file_name']
+      end
+
+      def url_prefix
+        agreement['url_prefix']
       end
 
       def key
@@ -41,6 +45,13 @@ module ComicWalker
         end
         JSON.parse(body)
       end
+
+      def get_jpeg(file)
+        uri = Addressable::URI.parse(url_prefix + file + '/0.jpeg')
+        Net::HTTP.start(uri.host) do |http|
+          http.get(uri.request_uri).body
+        end
+      end
     end
   end
 end

data/lib/comic_walker/item_decoder.rb

@@ -5,11 +5,15 @@ module ComicWalker
   class ItemDecoder
     attr_reader :pages
 
+    DEFAULT_CT = '20000101000000'
+    DEFAULT_ST = '20000101000000'
+    DEFAULT_ET = '99991231235959'
+
     def initialize(configuration_pack)
       fname = '0.dat'
-      ct = configuration_pack['ct']
-      st = configuration_pack['st']
-      et = configuration_pack['et']
+      ct = configuration_pack['ct'] || DEFAULT_CT
+      st = configuration_pack['st'] || DEFAULT_ST
+      et = configuration_pack['et'] || DEFAULT_ET
       @key1 = (ct + st + fname).unpack('C*')
       @key2 = (ct + fname + et).unpack('C*')
       @key3 = (fname + st + et).unpack('C*')
@@ -23,7 +27,7 @@ module ComicWalker
       end
     end
 
-    def decode(file, dat_path, img_path, b64data)
+    def decode_b64(file, dat_path, img_path, b64data)
       bs = 128
       hs = 1024
       blob = Unknown.finish(@key1, hs,
@@ -33,7 +37,10 @@ module ComicWalker
           )
         )
       ).pack('C*')
+      decode(file, dat_path, img_path, blob)
+    end
 
+    def decode(file, dat_path, img_path, blob)
       src = Magick::Image.from_blob(blob).first
       width = src.columns
       height = src.rows

data/lib/comic_walker/version.rb

@@ -1,5 +1,5 @@
 module ComicWalker
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 
-  VIEWER_VERSION = "1.0.2_2014-03-20"
+  VIEWER_VERSION = "1.0.5_2014-04-11"
 end

metadata

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