comic_walker 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e501759d14c46245526e2b8cbff03a38b9f390f9
-  data.tar.gz: a1eccbbfd4a9f823614adc8c1adf8b6a98bebc5b
+  metadata.gz: 6a5cddb9273f468c064ce300cbe66a9ca1f87680
+  data.tar.gz: a2f75342e60753047ab80894a5e4f52281a41396
 SHA512:
-  metadata.gz: 1fe26f0cc27ad11cda330ff55e502e27b4a09a71a9f1c264026042765a0a311e68cec060b1e555fb9a5e58ca44319c8baa75e6e863e81fddf0adcfb37d0f6eed
-  data.tar.gz: 2d2393961e1859b017c960e29deed845913df53c98472382785418ccd9b51cf04675e17570f2c95d439efec7f1af9d6557651b0d0417e4a7220daae1660c24df
+  metadata.gz: 3002a2c97d87584ef29cc9c620d23abb58095a2df5234058d6b5daef8287ce0a76ec5ed53c46d12f6934e858b59333818b955f25348089362ef425917267f713
+  data.tar.gz: f7fa296b48bd74e0781458e753d90405e7c884540429e7378be8f49b29ebe3832b676e8c26c1d723da8aeaa622e10febdbf0fba0554a63aac97585546a5142d3

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# 0.2.0 (2014-04-13)
+- Rename to `save` subcommand.
+- Add `contents` subcommand.
+- Add `save-all` subcommand.
+- Ignore JSON::ParserError from EndLayerDecoder.
+
+# 0.1.0 (2014-03-30)
+- Initial release.

data/README.md

@@ -1,4 +1,5 @@
 # ComicWalker
+[![Gem Version](https://badge.fury.io/rb/comic_walker.svg)](http://badge.fury.io/rb/comic_walker)
 
 Client library for [ComicWalker](http://comic-walker.com/).
 
@@ -21,44 +22,24 @@ Or install it yourself as:
 ### CLI
 
 ```
-% comic-walker KDCW_KS04000001010001_68
+% comic-walker save KDCW_KS04000001010001_68
 item/xhtml/p-cover.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/000_p-cover.jpg
 item/xhtml/p-001.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/001_p-001.jpg
 item/xhtml/p-002.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/002_p-002.jpg
 item/xhtml/p-white.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/003_p-white.jpg
 item/xhtml/p-004.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/004_p-004.jpg
-item/xhtml/p-005.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/005_p-005.jpg
-item/xhtml/p-006.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/006_p-006.jpg
-item/xhtml/p-007.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/007_p-007.jpg
-item/xhtml/p-008.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/008_p-008.jpg
-item/xhtml/p-009.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/009_p-009.jpg
-item/xhtml/p-010.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/010_p-010.jpg
-item/xhtml/p-011.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/011_p-011.jpg
-item/xhtml/p-012.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/012_p-012.jpg
-item/xhtml/p-013.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/013_p-013.jpg
-item/xhtml/p-014.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/014_p-014.jpg
-item/xhtml/p-015.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/015_p-015.jpg
-item/xhtml/p-016.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/016_p-016.jpg
-item/xhtml/p-017.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/017_p-017.jpg
-item/xhtml/p-018.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/018_p-018.jpg
-item/xhtml/p-019.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/019_p-019.jpg
-item/xhtml/p-020.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/020_p-020.jpg
-item/xhtml/p-021.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/021_p-021.jpg
-item/xhtml/p-022.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/022_p-022.jpg
-item/xhtml/p-023.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/023_p-023.jpg
-item/xhtml/p-024.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/024_p-024.jpg
-item/xhtml/p-025.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/025_p-025.jpg
-item/xhtml/p-026.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/026_p-026.jpg
-item/xhtml/p-027.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/027_p-027.jpg
-item/xhtml/p-028.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/028_p-028.jpg
-item/xhtml/p-029.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/029_p-029.jpg
-item/xhtml/p-030.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/030_p-030.jpg
-item/xhtml/p-031.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/031_p-031.jpg
-item/xhtml/p-032.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/032_p-032.jpg
-item/xhtml/p-033.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/033_p-033.jpg
-item/xhtml/p-034.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/034_p-034.jpg
-item/xhtml/p-035.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/035_p-035.jpg
-item/xhtml/p-036.xhtml/0.dat -> Ｆａｔｅ／ｋａｌｅｉｄ　ｌｉｎｅｒ　プリズマ☆イリヤ　ドライ！！/KDCW_KS04000001010001_68/036_p-036.jpg
+(snip)
+```
+
+```
+% comic-walker contents
+冴えない彼女の育てかた http://comic-walker.com/contents/detail/KDCW_FS02000006010000_68
+  Updated: 2014-03-24 13:39:24
+  Deliver: 2014-03-24 13:35:00 - 2064-03-12 17:54:00
+  Episodes:
+    第1話 http://comic-walker.com/viewer/?cid=KDCW_FS02000006010001_68
+  Next: 2014-04-01 00:00:00
+(snip)
 ```
 
 ## Contributing

data/bin/comic-walker

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 require 'comic_walker/cli'
 
-ComicWalker::CLI.new.run(ARGV)
+ComicWalker::CLI.start(ARGV)

data/comic_walker.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "http-cookie"
   spec.add_dependency "rmagick"
   spec.add_dependency "rubyzip"
+  spec.add_dependency "thor"
 end

data/lib/comic_walker/cli.rb

@@ -1,19 +1,77 @@
 require 'json'
 require 'pathname'
 require 'pp'
+require 'thor'
+require 'yaml'
 require 'comic_walker/client'
 require 'comic_walker/end_layer_decoder'
 require 'comic_walker/item_decoder'
+require 'comic_walker/v1/client'
 
 module ComicWalker
-  class CLI
-    def run(cids)
+  class CLI < Thor
+    package_name 'comic_walker'
+
+    CONFIG_DIR = Pathname.new(ENV['HOME']).join('.comic-walker')
+    CONFIG_PATH = CONFIG_DIR.join('config.yml')
+    COOKIE_PATH = CONFIG_DIR.join('cookie.yml')
+
+    desc 'save CID1 CID2...', 'Save contents'
+    def save(*cids)
       client = Client.new
       cids.each do |cid|
         save_content(client, cid)
       end
     end
 
+    desc 'save-all CID1 CID2...', 'Save all sub-contents'
+    def save_all(*parent_cids)
+      jar = HTTP::CookieJar.new
+      load_cookies(jar)
+      child_cids = find_sub_contents(V1::Client.new(jar, load_uuid), parent_cids)
+      save_cookies(jar)
+      save(*child_cids)
+    end
+
+    desc 'contents', 'List contents'
+    option :page,
+      desc: 'Page',
+      aliases: :p,
+      type: :numeric
+    option :per_page,
+      desc: 'Per page',
+      type: :numeric
+    def contents
+      jar = HTTP::CookieJar.new
+      load_cookies(jar)
+      client = V1::Client.new(jar, load_uuid)
+      json = client.start do
+        client.contents(per_page: options[:per_page], page: options[:page])
+      end
+      save_cookies(jar)
+
+      json['contents'].sort_by { |content| Time.parse(content['updated_at']) }.reverse_each do |content|
+        next unless content.has_key?('sub_contents')
+        puts "#{content['name']} http://comic-walker.com/contents/detail/#{content['content_id']}"
+        puts "  Updated: #{format_time(content['updated_at'])}"
+        puts "  Deliver: #{format_time(content['deliver_start_date'])} - #{format_time(content['deliver_stop_date'])}"
+        tags = content['tags']
+        puts "  Episodes:"
+        tags['visible_episodes'].each_key do |episode|
+          _, desc, cid = *episode.split('|')
+          puts "    #{desc} http://comic-walker.com/viewer/?cid=#{cid}"
+        end
+        if next_issue = tags['publication_date_of_next_issue']
+          next_issue = format_time(next_issue.keys.first)
+        else
+          next_issue = 'UNKNOWN'
+        end
+        puts "  Next: #{next_issue}"
+      end
+    end
+
+    private
+
     def save_content(client, cid)
       license = client.get_license(cid)
       info = license.get_info.first
@@ -33,7 +91,11 @@ module ComicWalker
               pages[content['index']-1] = content['file']
             end
           when /end_layer\.json/
-            pp EndLayerDecoder.new(license.key).decode(zip.read)
+            begin
+              pp EndLayerDecoder.new(license.key).decode(zip.read)
+            rescue JSON::ParserError
+              $stderr.puts "WARNING: #{cid}: Could not decode end_layer.json.enc"
+            end
           when %r{\Aitem/}
             items[entry.name] = zip.read
           end
@@ -50,5 +112,61 @@ module ComicWalker
         end
       end
     end
+
+    def load_cookies(jar)
+      if COOKIE_PATH.readable?
+        jar.load(COOKIE_PATH.to_s, session: true)
+      end
+    end
+
+    def save_cookies(jar)
+      CONFIG_DIR.mkpath
+      jar.save(COOKIE_PATH.to_s, session: true)
+    end
+
+    def load_uuid
+      CONFIG_DIR.mkpath
+      yaml = CONFIG_PATH.readable? && YAML.load_file(CONFIG_PATH.to_s)
+      uuid = yaml && yaml['uuid']
+      unless uuid
+        require 'securerandom'
+        uuid = SecureRandom.uuid.upcase
+        CONFIG_PATH.open('w') do |f|
+          YAML.dump({uuid: uuid}, f)
+        end
+      end
+      uuid
+    end
+
+    def format_time(str)
+      Time.parse(str).strftime('%F %X')
+    end
+
+    def find_sub_contents(client, parent_cids)
+      page = 1
+      per_page = 200
+      child_cids = {}
+      client.start do
+        until child_cids.size == parent_cids do
+          json = client.contents(page: page, per_page: per_page)
+          contents = json['contents']
+          if contents.empty?
+            break
+          end
+          contents.each do |c|
+            if parent_cids.include?(c['content_id'])
+              child_cids[c['content_id']] = c['sub_contents']
+            end
+          end
+          page += 1
+        end
+      end
+      parent_cids.each do |cid|
+        unless child_cids.has_key?(cid)
+          $stderr.puts "No such content: #{cid}"
+        end
+      end
+      child_cids.values.flatten
+    end
   end
 end

data/lib/comic_walker/client.rb

@@ -11,9 +11,21 @@ module ComicWalker
       @bid = '000000000000000000000NFBR'
     end
 
+    class Error < StandardError
+      attr_reader :code, :reason
+      def initialize(code, reason)
+        super("#{code}: #{reason}")
+        @code = code
+        @reason = reason
+      end
+    end
+
     def get_license(cid)
       u1 = get_u1(cid)
       json = get_li(cid, u1)
+      if error = json['error']
+        raise Error.new(error['code'], error['message'])
+      end
       license_b64 = json['license']
       License.new(JSON.parse(Cipher.decrypt_license(@bid, u1, license_b64)))
     end

data/lib/comic_walker/v1/client.rb

@@ -0,0 +1,126 @@
+require 'addressable/uri'
+require 'http-cookie'
+require 'json'
+require 'net/http'
+
+module ComicWalker
+  module V1
+    class Client
+      BASE_URI = Addressable::URI.parse("https://cnts.comic-walker.com")
+
+      def initialize(jar, uuid)
+        @https = Net::HTTP.new(BASE_URI.host, 443)
+        @https.use_ssl = true
+        @https.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        @jar = jar
+        @uuid = uuid
+      end
+
+      def start(&block)
+        @https.start do
+          block.call
+        end
+      end
+
+      AID = 'KDCWI_JP'
+      AVER = '1.2.0'
+
+      class UnknownDeviceError < StandardError
+      end
+      class NoValidSessionError < StandardError
+      end
+
+      def create_session
+        retried = 0
+        begin
+          res = post('/user_sessions/create', {
+            DID: @uuid,
+            PIN: @uuid,
+            AID: AID,
+            AVER: AVER,
+          })
+          case res.body
+          when 'UnknownDeviceError'
+            raise UnknownDeviceError.new
+          when 'ValidSessionExistsError'
+            nil
+          else
+            JSON.parse(res.body)
+          end
+        rescue UnknownDeviceError => e
+          if retried == 0
+            retried += 1
+            create_user
+            retry
+          else
+            raise e
+          end
+        end
+      end
+
+      def create_user
+        post('/users/create', {
+          DID: @uuid,
+          PIN: @uuid,
+          AID: AID,
+          AVER: AVER,
+        })
+      end
+
+      def contents(params = {})
+        retried = 0
+        params = {
+          AID: AID,
+          AVER: AVER,
+          W: '320',
+          H: '480',
+          FORMATS: 'epub_pdf_fixedlayout',
+          include_hidden: 1,
+          include_meta: 1,
+          languages: 'ja',
+        }.merge(params)
+
+        begin
+          res = get('/v1/contents', params)
+          case res.body
+          when 'NoValidSessionError'
+            raise NoValidSessionError.new
+          else
+            JSON.parse(res.body)
+          end
+        rescue NoValidSessionError => e
+          if retried == 0
+            retried += 1
+            create_session
+            retry
+          else
+            raise e
+          end
+        end
+      end
+
+      private
+
+      def get(path, params = {})
+        uri = BASE_URI.join(path)
+        uri.query_values = params
+        req = Net::HTTP::Get.new(uri.request_uri)
+        request_with_cookie(uri, req)
+      end
+
+      def post(path, params = {})
+        uri = BASE_URI.join(path)
+        req = Net::HTTP::Post.new(uri.request_uri)
+        req.set_form_data(params)
+        request_with_cookie(uri, req)
+      end
+
+      def request_with_cookie(uri, req)
+        req['cookie'] = HTTP::Cookie.cookie_value(@jar.cookies(uri.to_s))
+        @https.request(req).tap do |res|
+          @jar.parse(res['set-cookie'], uri.to_s)
+        end
+      end
+    end
+  end
+end

data/lib/comic_walker/version.rb

@@ -1,5 +1,5 @@
 module ComicWalker
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 
   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.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Client library for ComicWalker
 email:
 - eagletmt@gmail.com
@@ -117,6 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -131,6 +146,7 @@ files:
 - lib/comic_walker/end_layer_decoder.rb
 - lib/comic_walker/item_decoder.rb
 - lib/comic_walker/item_decoder/unknown.rb
+- lib/comic_walker/v1/client.rb
 - lib/comic_walker/version.rb
 homepage: https://github.com/eagletmt/comic_walker
 licenses: