comic_walker 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fe84087441847fad172320a68b0a4849d5ccb0f
-  data.tar.gz: ad4627cd74295d5e64c457d74729cd379dedb10f
+  metadata.gz: cb14c85698eca69d903464c619f9eaa5819d22dc
+  data.tar.gz: 5f34fa556f6f77abba057de04548a780b7ba28d5
 SHA512:
-  metadata.gz: 7ca5b14ea61e4a6118ee906b64e7dff21b95ec07b9c9e70827b765d6952fb8d824973bb1ba50ffe8ed918a40030d2f625d29621d41a69d2380cadc43d4bedbcf
-  data.tar.gz: 62076faf1ff081f17c5f42e5e9cba25949ad523eb87c3e2b54fda226524cfdd7b9e4be0bd6db98670776eca38666ea4a63c8b9c576c05020650989c1ca68a14c
+  metadata.gz: d83cd4e18c92cda33bef1b18fb6dc4d0d47b6750f28552099f923fe6b910366f6d3ad792137922152e20fcacf783ed1f690441030465408bb144eab6e6b6dd8c
+  data.tar.gz: ceb400b3e83e4471ae29e113db4270565e234125be3b8dc4e4f48e60bc33e4cfb09bc9b1203eb117f519d5e87712ba4337f126fa465961ff6ec680d2e09db048

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4.0 (2015-12-19)
+- Fix save command for site renewal
+    - https://github.com/eagletmt/comic_walker/issues/6
+
 # 0.3.0 (2014-05-12)
 - Download configuration_pack and images directly
     - Drop jar file download

data/comic_walker.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable"
   spec.add_dependency "http-cookie"
   spec.add_dependency "net-http-persistent"
-  spec.add_dependency "retryable"
+  spec.add_dependency "retryable", ">= 2.0.0"
   spec.add_dependency "rmagick"
   spec.add_dependency "thor"
 end

data/lib/comic_walker/client.rb

@@ -31,10 +31,15 @@ module ComicWalker
     end
 
     def get_u1(cid)
-      uri = Addressable::URI.parse("http://comic-walker.com/viewer/?cid=#{cid}")
+      uri = Addressable::URI.parse("http://comic-walker.com/viewer/?tw=2&dlcl=ja&cid=#{cid}")
       Net::HTTP.start(uri.host, 80) do |http|
         res = http.get(uri.request_uri)
-        Addressable::URI.unescape(HTTP::Cookie.cookie_value_to_hash(res['set-cookie'])['u1'])
+        if set_cookie = res['set-cookie']
+          u1 = HTTP::Cookie.cookie_value_to_hash(set_cookie)['u1']
+          if u1
+            Addressable::URI.unescape(u1)
+          end
+        end
       end
     end
 

data/lib/comic_walker/client/license.rb

@@ -43,6 +43,10 @@ module ComicWalker
       def get_jpeg(file)
         get(url_prefix + file + '/0.jpeg').body
       end
+
+      def get_dat(file)
+        get(url_prefix + file + '/0.dat').body
+      end
     end
   end
 end

data/lib/comic_walker/content_downloader.rb

@@ -13,7 +13,11 @@ module ComicWalker
         dat_path = Pathname.new(file).join('0.dat')
         img_fname = dat_path.parent.basename.sub_ext('.jpg')
         img_path = img_dir.join(sprintf('%03d_%s', i, img_fname))
-        decoder.decode(file, dat_path, img_path, license.get_jpeg(file))
+        if decoder.has_keys?
+          decoder.decode_b64(file, dat_path, img_path, license.get_dat(file))
+        else
+          decoder.decode(file, dat_path, img_path, license.get_jpeg(file))
+        end
         puts "#{dat_path} -> #{img_path}"
       end
     end

data/lib/comic_walker/item_decoder.rb

@@ -6,6 +6,15 @@ module ComicWalker
     attr_reader :pages
 
     def initialize(configuration_pack)
+      fname = '0.dat'
+      ct = configuration_pack['ct']
+      st = configuration_pack['st']
+      et = configuration_pack['et']
+      if ct && st && et
+        @key1 = (ct + st + fname).unpack('C*')
+        @key2 = (ct + fname + et).unpack('C*')
+        @key3 = (fname + st + et).unpack('C*')
+      end
       @pages = []
       configuration_pack['configuration']['contents'].each do |content|
         pages[content['index']-1] = content['file']
@@ -16,6 +25,23 @@ module ComicWalker
       end
     end
 
+    def has_keys?
+      !!@key1
+    end
+
+    def decode_b64(file, dat_path, img_path, b64data)
+      bs = 128
+      hs = 1024
+      blob = Unknown.finish(
+        @key1, hs,
+        Unknown.decrypt(
+          @key2, bs,
+          Unknown.prepare(@key3, Base64.decode64(b64data).unpack('C*'))
+        )
+      ).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

data/lib/comic_walker/item_decoder/unknown.rb

@@ -5,6 +5,47 @@ module ComicWalker
     module Unknown
       module_function
 
+      # @param [Array<Fixnum>] key
+      # @param [Array<Fixnum>] data Encrypted data
+      # @return [Array<Fixnum>]
+      def prepare(key, data)
+        s = Cipher.gen_rc4_table(key)
+        data.map.with_index do |b, i|
+          b ^ s[i % 256]
+        end
+      end
+
+      # @param [Array<Fixnum>] key
+      # @param [Integer] bsize block size?
+      # @param [Array<Fixnum>] data Encrypted data
+      # @return [Array<Fixnum>] Chunked decrypted data
+      def decrypt(key, bsize, data)
+        s = []
+        0.step(data.size-1, bsize) do |i|
+          s << data[i]
+        end
+
+        c = Cipher.decrypt_rc4(key, s)
+        # s.size == c.size
+
+        0.step(data.size-1, bsize) do |i|
+          data[i] = c.shift
+        end
+        data
+      end
+
+      # @param [Array<Fixnum>] key
+      # @param [Integer] hsize header size?
+      # @param [Array<Fixnum>] data Encrypted data
+      # @return [Array<Fixnum>] data
+      def finish(key, hsize, data)
+        hsize = [hsize, data.size].min
+        Cipher.decrypt_rc4(key, data.slice(0, hsize)).each.with_index do |x, i|
+          data[i] = x
+        end
+        data
+      end
+
       # Calculate moves.
       # @param [Integer] width Width of the image
       # @param [Integer] height Height of the image

data/lib/comic_walker/v1/client.rb

@@ -26,7 +26,7 @@ module ComicWalker
 
       def create_session
         on_exception = lambda { |exception| create_user }
-        retryable(tries: 2, on: UnknownDeviceError, sleep: 0, exception_cb: on_exception) do
+        Retryable.retryable(tries: 2, on: UnknownDeviceError, sleep: 0, exception_cb: on_exception) do
           res = post('/user_sessions/create', {
             DID: @uuid,
             PIN: @uuid,
@@ -66,7 +66,7 @@ module ComicWalker
         }.merge(params)
 
         on_exception = lambda { |exception| create_session }
-        retryable(tries: 2, on: NoValidSessionError, sleep: 0, exception_cb: on_exception) do
+        Retryable.retryable(tries: 2, on: NoValidSessionError, sleep: 0, exception_cb: on_exception) do
           res = get('/v1/contents', params)
           case res.body
           when 'NoValidSessionError'

data/lib/comic_walker/version.rb

@@ -1,5 +1,5 @@
 module ComicWalker
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 
   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.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Client library for ComicWalker