lknovel 0.0.5 → 0.0.6

data/CHANGELOG

@@ -5,3 +5,5 @@
 0.0.4: Remove unnecessary require, check if cover image exist in template and
        crop
 0.0.5: Fix lots of errors detected by epubcheck
+0.0.6: Add --chapter-theads/--image-theads cli options, support download a
+       whole series

data/README.md

@@ -37,10 +37,16 @@ manually using the package manager. For Debian/Ubuntu:
 ## Usage
 
     $ lknovel -h
-    Usage: lknovel [options] url
+    Usage: lknovel [options] URL ...
+
+    URL can be:
+        http://lknovel.lightnovel.cn/main/vollist/?.html
+        http://lknovel.lightnovel.cn/main/book/?.html
 
     Specific options:
         -k, --[no-]keep                  Keep temporary files
+        -t, --chapter-theads THREADS     Chapter download threads(4)
+        -T, --image-theads THREADS       Image download threads(5)
         -q, --[no-]quiet                 Run quietly
 
     Common options:

data/lib/lknovel/app.rb

@@ -1,6 +1,7 @@
 require 'erb'
 require 'fileutils'
 require 'gepub'
+require 'lknovel/series'
 require 'lknovel/volume'
 require 'optparse'
 require 'ostruct'
@@ -11,16 +12,31 @@ module Lknovel
     def self.parse(args)
       options = OpenStruct.new
       options.verbose = true
+      options.chapter_theads = 4
+      options.image_theads = 5
       options.keep = false
 
       opt_parser = OptionParser.new do |opts|
-        opts.banner = 'Usage: lknovel [options] url'
+        opts.banner = "Usage: lknovel [options] URL ...\n\n"
+        opts.banner << "URL can be:\n"
+        opts.banner << "    http://lknovel.lightnovel.cn/main/vollist/?.html\n"
+        opts.banner << "    http://lknovel.lightnovel.cn/main/book/?.html\n"
         opts.separator "\nSpecific options:"
 
         opts.on('-k', '--[no-]keep', 'Keep temporary files') do |k|
           options.keep = k
         end
 
+        opts.on('-t', '--chapter-theads THREADS', Integer,
+                "Chapter download threads(#{options.chapter_theads})") do |ct|
+          options.chapter_theads = ct
+        end
+
+        opts.on('-T', '--image-theads THREADS', Integer,
+                "Image download threads(#{options.image_theads})") do |it|
+          options.image_theads = it
+        end
+
         opts.on('-q', '--[no-]quiet', 'Run quietly') do |q|
           options.verbose = !q
         end
@@ -54,15 +70,34 @@ module Lknovel
 
     def run
       ARGV.each do |url|
-        process_volume(url)
+        if url.start_with?('http://lknovel.lightnovel.cn/main/book/')
+          volume = Volume.new(url)
+          process_volume(volume)
+        elsif url.start_with?('http://lknovel.lightnovel.cn/main/vollist/')
+          series = Series.new(url)
+          series.parse
+          series.volumes.each do |volume|
+            process_volume(volume)
+          end
+        else
+          puts "Unsupported url: #{url}"
+        end
       end
     end
 
-    def process_volume(url)
-      volume = Volume.new(url)
+    def process_volume(volume)
+      volume.parse
+      if File.exists?("#{volume.path}.epub")
+        puts "Skip: #{volume.path}.epub"
+        puts
+        return
+      end
+      puts "Start: #{volume.title}"
 
-      parallel_verbose(volume.chapters, title: 'Chapters',
-                        verbose: @options.verbose) do |chapter|
+      parallel_verbose(volume.chapters,
+                       title: 'Chapters',
+                       threads: @options.chapter_theads,
+                       verbose: @options.verbose) do |chapter|
         chapter.parse
         chapter.title
       end
@@ -79,8 +114,10 @@ module Lknovel
             end
           end
 
-          parallel_verbose(images, title: 'Images',
-                            verbose: @options.verbose) do |image|
+          parallel_verbose(images,
+                           title: 'Images',
+                           threads: @options.image_theads,
+                           verbose: @options.verbose) do |image|
             image.download
             image.file
           end
@@ -119,8 +156,12 @@ module Lknovel
         contributor volume.illustrator, 'ill'
 
         resources(:workdir => volume.path) {
-          cover_image = File.join(IMAGE_DIR, volume.cover_image)
-          cover_image cover_image
+          if volume.cover_image
+            cover_image = File.join(IMAGE_DIR, volume.cover_image)
+            cover_image cover_image
+          else
+            cover_image = nil
+          end
           file \
             "#{STYLESHEET_DIR}/default.css" => "#{STYLESHEET_PATH}/default.css"
           images = Dir.glob("#{IMAGE_DIR}/*").select {|x| x != cover_image}
@@ -138,6 +179,7 @@ module Lknovel
       builder.generate_epub("#{volume.path}.epub")
       FileUtils.rm_r volume.path unless @options.keep
       puts "Finish: #{volume.path}.epub"
+      puts
 
     end
 

data/lib/lknovel/assets/stylesheets/default.css

@@ -17,6 +17,7 @@ img {
 
 ol li {
   padding-top: 15px;
+  list-style-type: none;
 }
 
 .page-break {

data/lib/lknovel/chapter.rb

@@ -14,9 +14,9 @@ module Lknovel
     attr_reader :url, :title, :content
 
     def initialize(url, options = {})
-      @options = {:title => nil}.merge(options)
+      options = {:title => nil}.merge(options)
       @url = url
-      @title = @options[:title]
+      @title = options[:title]
     end
 
     def parse

data/lib/lknovel/meta.rb

@@ -1,5 +1,5 @@
 module Lknovel
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
   MODULE_PATH = File.expand_path('..', __FILE__)
   TEMPLATE_PATH = File.join(MODULE_PATH, 'templates')
   STYLESHEET_PATH = File.join(MODULE_PATH, 'assets', 'stylesheets')

data/lib/lknovel/series.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+require 'lknovel/utils'
+require 'lknovel/volume'
+require 'nokogiri'
+require 'open-uri'
+
+module Lknovel
+  class Series
+    attr_reader :volumes
+
+    def initialize(url)
+      @url = url
+    end
+
+    def parse
+      page = retryable do
+        Nokogiri::HTML(open(@url))
+      end
+
+      @volumes = page.css('dl dd h2.ft-24 strong a').map do |x|
+        volume_title = x.text.split("\r\n")[-1].strip
+        volume_url = x['href']
+        Volume.new(volume_url, title: volume_title)
+      end
+    end
+  end
+end

data/lib/lknovel/utils.rb

@@ -33,7 +33,8 @@ def parallel_verbose(items, options = {}, &block)
     msg = "\r#{opts[:title]}: 0/#{items.size} ..."
     STDERR.write msg
   end
-  Parallel.each_with_index(items, :in_threads => 5) do |item, index|
+  Parallel.each_with_index(items,
+                           :in_threads => opts[:threads]) do |item, index|
     extra_msg = block.call(item, index)
     if opts[:verbose]
       # get previous console output length, aware of wide chars

data/lib/lknovel/volume.rb

@@ -14,9 +14,10 @@ module Lknovel
 
     attr_accessor :cover_image
 
-    def initialize(url)
+    def initialize(url, options = {})
+      options = {:title => nil}.merge(options)
       @url = url
-      parse
+      @title = options[:title]
     end
 
     def parse

data/test/minitest_helper.rb

@@ -1,10 +1,11 @@
-begin
+CI = !!ENV['TRAVIS']
+
+if CI
   require 'coveralls'
   Coveralls.wear!
-rescue LoadError
 end
 
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'minitest/autorun'
-require 'pry-rescue/minitest'
+require 'pry-rescue/minitest' unless CI

data/test/test_lknovel_image.rb

@@ -13,12 +13,9 @@ describe Lknovel::Image do
     image.file.must_equal '20120808202600_62961.jpg'
   end
 
-  it 'download' do
+  it 'download and crop' do
     image.download(TMP)
     File.exists?(File.join(TMP, image.file)).must_equal true
-  end
-
-  it 'crop' do
     cover_image = File.join(TMP, 'cover.jpg')
     cropped = image.crop(cover_image, '52%x100%+0+0', :dir => TMP) { |w, h| w > h * 1.5 }
     cropped.must_equal true

data/test/test_lknovel_series.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+require 'minitest_helper'
+require 'lknovel/series'
+
+describe Lknovel::Series do
+
+  series = Lknovel::Series.new('http://lknovel.lightnovel.cn/main/vollist/615.html')
+  series.parse
+
+  it 'volume[0]' do
+    volume = series.volumes[0]
+    volume.url.must_equal 'http://lknovel.lightnovel.cn/main/book/2123.html'
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lknovel
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,6 +145,7 @@ files:
 - lib/lknovel/chapter.rb
 - lib/lknovel/image.rb
 - lib/lknovel/meta.rb
+- lib/lknovel/series.rb
 - lib/lknovel/templates/chapter.html.erb
 - lib/lknovel/templates/front.html.erb
 - lib/lknovel/utils.rb
@@ -154,6 +155,7 @@ files:
 - test/test_lknovel.rb
 - test/test_lknovel_chapter.rb
 - test/test_lknovel_image.rb
+- test/test_lknovel_series.rb
 - test/test_lknovel_volume.rb
 homepage: https://github.com/azuwis/ruby-lknovel
 licenses:
@@ -185,5 +187,6 @@ test_files:
 - test/test_lknovel.rb
 - test/test_lknovel_chapter.rb
 - test/test_lknovel_image.rb
+- test/test_lknovel_series.rb
 - test/test_lknovel_volume.rb
 has_rdoc: