kindle_manager 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 065a28c7130f475f85b34e66fa86d22169a91ac5
-  data.tar.gz: e525336b3c853df970cff3e00e840fb3bc3a5111
+  metadata.gz: 4d0d0cbbeb7edce8852f3de2f76c624ce3471108
+  data.tar.gz: ce85a47e95df6d2cabcac0168c61350dd550b7b9
 SHA512:
-  metadata.gz: 4c922354219deb9a6ff7840d94c1a1891d0f5507c735e6a7135c22975ef87c4657297668619d21db3d813eb6c16c51bf5f3e125dc5d1f381e11bbb96976372f3
-  data.tar.gz: 2646eeb5c522ca77fd0c1ebb1c4ab815150c9f71fb622a0097e392cae609dc3990a629d798e500b797980b6dc19f1e35d32cbdfbfcfc32bb05fb08874b692b8c
+  metadata.gz: 82a79e14d3eaa9c53a8efe63b6374295bd08341a358575173cdd1efefa2497838d1004db517427b0a571fb2777b32264b0b3bcbf7c1e0f3bbc5e7fd2c5736858
+  data.tar.gz: 14720099a4849797df39e4e9a22a8063f01604475cc8f994a7581fe7d5bea9212fbe6fef88fab1677dde59eeb3362827e1c27cee2bc7b4fa911330f3b8732f0c

data/README.md

@@ -26,6 +26,12 @@ Or install it yourself as:
 
 Create _.env_ following the instructions of https://github.com/kyamaguchi/amazon_auth
 
+```
+amazon_auth
+
+vi .env
+```
+
 And `Dotenv.load` or `gem 'dotenv-rails'` may be required when you use this in your app.
 
 ### Run
@@ -37,7 +43,7 @@ bin/console
 In console
 
 ```
-client = KindleManager::Client.new
+client = KindleManager::Client.new(debug: true)
 client.fetch_kindle_list
 books = client.load_kindle_books
 

data/lib/kindle_manager/client.rb

@@ -5,6 +5,7 @@ module KindleManager
     def initialize(options = {})
       @debug = options.fetch(:debug, false)
       @limit = options.fetch(:limit, nil)
+      @options = options
       begin
         @client = AmazonAuth::Client.new
       rescue => e
@@ -19,22 +20,17 @@ module KindleManager
     end
 
     def store
-      # Create file store without session(session) by default
-      @store ||= KindleManager::FileStore.new(nil, latest: true)
-    end
-
-    def setup_file_store_with_session
-      @store = KindleManager::FileStore.new(session)
+      @store ||= KindleManager::FileStore.new(@options)
     end
 
     def fetch_kindle_list
       sign_in
-      setup_file_store_with_session
+      store.session = session
       go_to_kindle_management_page
       begin
         load_next_kindle_list
       rescue => e
-        byebug
+        byebug if defined?(Byebug)
         # retry ?
         puts e
       end
@@ -54,8 +50,16 @@ module KindleManager
     end
 
     def go_to_kindle_management_page
+      puts "Visiting kindle management page" if @debug
       wait_for_selector('#shopAllLinks', 5)
-      session.all('a').find{|e| e['href'] =~ %r{/gp/digital/fiona/manage/} }.click
+      3.times do
+        session.all('a').find{|e| e['href'] =~ %r{/gp/digital/fiona/manage/} }.click
+        wait_for_selector('.navHeader_myx', 5)
+        if session.first('.navHeader_myx')
+          puts "Page found '#{session.first('.navHeader_myx').text}'" if @debug
+          break
+        end
+      end
     end
 
     def load_next_kindle_list
@@ -65,21 +69,22 @@ module KindleManager
         if @limit && @limit < number_of_fetched_books
           break
         elsif has_more_button?
-          debug_print_page
+          snapshot_page
           @current_loop = 0
 
-          puts "Clicking 'Show More'"
+          puts "Clicking 'Show More'" if @debug
           session.execute_script "window.scrollBy(0,-800)"
           show_more_button.click
           sleep 1
           raise('Clicking of more button may have failed') if has_more_button?
         else
-          puts "Scrolling #{@current_loop}"
+          puts "Loading books with scrolling #{@current_loop+1}" if @debug
           session.execute_script "window.scrollBy(0,10000)"
         end
         sleep 5
         @current_loop += 1
       end
+      puts "Stopped loading" if @debug
       snapshot_page
     end
 
@@ -100,8 +105,11 @@ module KindleManager
     end
 
     def number_of_fetched_books
-      m = session.first('.contentCount_myx').text.match(/(\d+) - (\d+)/)
-      m.nil? ? nil : m[2].to_i
+      re = (AmazonInfo.domain =~ /\.jp\z/ ? /(\d+)〜(\d+)/ : /(\d+) - (\d+)/)
+      text = session.first('.contentCount_myx').text
+      m = text.match(re)
+      return m[2].to_i if m.present?
+      raise("Couldn't get the number of fetched books [#{text}]")
     end
 
     def loading?
@@ -110,13 +118,8 @@ module KindleManager
 
     def snapshot_page
       store.record_page
-      debug_print_page
-    end
-
-    def debug_print_page
       if @debug
-        puts Time.current.strftime("%Y-%m-%d %H:%M:%S")
-        puts "Loop: #{@current_loop}"
+        puts "Saving page" + Time.current.strftime("%Y-%m-%d %H:%M:%S")
         puts session.first('.contentCount_myx').text if session.first('.contentCount_myx')
         puts
       end

data/lib/kindle_manager/file_store.rb

@@ -1,12 +1,13 @@
 module KindleManager
   class FileStore
-    attr_accessor :dir_name
+    attr_accessor :dir_name, :session
 
-    def initialize(session, options = {})
+    def initialize(options = {})
       @dir_name = options.fetch(:dir_name) do
-        options[:latest] ? find_latest_dir_name : Time.current.strftime("%Y%m%d%H%M%S")
+        tmp_dir_name = options[:create] ? nil : find_latest_dir_name
+        tmp_dir_name.presence || Time.current.strftime("%Y%m%d%H%M%S")
       end
-      @session = session
+      @session = options.fetch(:session, nil)
     end
 
     def base_dir
@@ -48,7 +49,7 @@ module KindleManager
     end
 
     def find_latest_dir_name
-      self.class.list_download_dirs.sort.last.split('/').last
+      self.class.list_download_dirs.sort.last.to_s.split('/').last
     end
 
     private

data/lib/kindle_manager/version.rb

@@ -1,3 +1,3 @@
 module KindleManager
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/kindle_manager.rb

@@ -1,4 +1,3 @@
-require 'byebug'
 require 'amazon_auth'
 require "kindle_manager/version"
 require "kindle_manager/client"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kindle_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kazuho Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazon_auth