narou 1.1.1 → 1.1.2

data/lib/database.rb

@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/device.rb

@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
@@ -65,7 +65,7 @@ class Device
         capture = `#{cmd}`
         if $?.exitstatus > 0
           puts
-          warn capture.force_encoding(Encoding::Windows_31J).rstrip
+          error capture.force_encoding(Encoding::Windows_31J).rstrip
           exit 1
         end
       else
@@ -73,7 +73,7 @@ class Device
           FileUtils.cp(src_file, dst_path)
         rescue => e
           puts
-          warn e.message
+          error e.message
           exit 1
         end
       end

data/lib/device/kindle.rb

@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/device/kobo.rb

@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/device/library/windows.rb

@@ -1,22 +1,10 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
 
-require "fiddle"
 require "win32ole"
-
-module WinAPI
-  include Fiddle
-  class InvalidOS < StandardError; end
-  Handle = RUBY_VERSION >= "2.0.0" ? Fiddle::Handle : DL::Handle
-
-  def self.GetLogicalDriveStrings(buf_size, buffer)
-    @@get_logical_drive_strings ||= Function.new(Handle.new("kernel32")["GetLogicalDriveStrings"],
-                                                 [TYPE_LONG, TYPE_VOIDP], TYPE_LONG)
-    @@get_logical_drive_strings.call(buf_size, buffer)
-  end
-end
+require_relative "../../extensions/windows"
 
 module Device::Library
   module Windows

data/lib/downloader.rb

@@ -1,14 +1,16 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
 
+require "yaml"
 require "fileutils"
 require_relative "narou"
 require_relative "sitesetting"
 require_relative "template"
 require_relative "database"
 require_relative "localsetting"
+require_relative "narou/api"
 
 #
 # 小説サイトからのダウンロード
@@ -23,6 +25,8 @@ class Downloader
 
   attr_reader :id
 
+  class NoSerialNovel < StandardError; end
+
   #
   # ターゲット(ID、URL、Nコード、小説名)を指定して小説データのダウンロードを開始する
   #
@@ -35,13 +39,13 @@ class Downloader
     when :url, :ncode
       setting = get_sitesetting_by_target(target)
       unless setting
-        warn "対応外の#{type}です(#{target})"
+        error "対応外の#{type}です(#{target})"
         return false
       end
     when :id
       data = @@database[target.to_i]
       unless data
-        warn "指定のID(#{target})は存在しません"
+        error "指定のID(#{target})は存在しません"
         return false
       end
       setting = get_sitesetting_by_sitename(data["sitename"])
@@ -52,7 +56,7 @@ class Downloader
         setting = get_sitesetting_by_sitename(data["sitename"])
         setting.multi_match(data["toc_url"], "url")
       else
-        warn "指定の小説(#{target})は存在しません"
+        error "指定の小説(#{target})は存在しません"
         return false
       end
     end
@@ -126,7 +130,7 @@ class Downloader
     else
       @@database.delete(id)
       @@database.save_database
-      warn "#{path} が見つかりません。"
+      error "#{path} が見つかりません。"
       warn "保存フォルダが消去されていたため、データベースのインデックスを削除しました。"
       return nil
     end
@@ -210,7 +214,7 @@ class Downloader
   def self.get_sitesetting_by_sitename(sitename)
     setting = @@settings.find { |s| s["name"] == sitename }
     return setting if setting
-    warn "#{data["sitename"]} の設定ファイルが見つかりません"
+    error "#{data["sitename"]} の設定ファイルが見つかりません"
     exit 1
   end
 
@@ -227,11 +231,11 @@ class Downloader
       settings << setting
     end
     if settings.empty?
-      warn "小説サイトの定義ファイルがひとつもありません"
+      error "小説サイトの定義ファイルがひとつもありません"
       exit 1
     end
     unless @@narou
-      warn "小説家になろうの定義ファイルが見つかりませんでした"
+      error "小説家になろうの定義ファイルが見つかりませんでした"
       exit 1
     end
     settings
@@ -295,12 +299,18 @@ class Downloader
   # ダウンロード処理本体
   #
   # 返り値：ダウンロードしたものが１話でもあったかどうか(Boolean)
+  #         nil なら何らかの原因でダウンロード自体出来なかった
   #
   def start_download
-    latest_toc = get_latest_table_of_contents
+    begin
+      latest_toc = get_latest_table_of_contents
+    rescue NoSerialNovel
+      error @setting["ncode"] + " は短編小説です。現在短編小説には対応していません"
+      return nil
+    end
     unless latest_toc
-      warn "目次データが取得出来ませんでした"
-      exit 1
+      error @setting["url"] + " の目次データが取得出来ませんでした"
+      return nil
     end
     if @setting["confirm_over18"]
       unless confirm_over18?
@@ -364,11 +374,25 @@ class Downloader
       "file_title" => @file_title,
       "toc_url" => @setting["toc_url"],
       "sitename" => @setting["name"],
+      "novel_type" => @novel_type,
       "last_update" => Time.now
     }
     @@database.save_database
   end
 
+  #
+  # 連載小説かどうか調べる
+  #
+  def serial_novel?
+    if @@database[@id]
+      @novel_type = @@database[@id]["novel_type"] || 1
+    else
+      api = Narou::API.new(@setting, "nt")
+      @novel_type = api["novel_type"]
+    end
+    @novel_type == 1
+  end
+
   #
   # 目次データを取得する
   #
@@ -390,12 +414,15 @@ class Downloader
       end
     rescue OpenURI::HTTPError => e
       if e.message =~ /^404/
-        warn "指定されたURLは存在しません"
+        error "指定されたURLは存在しません"
         return false
       else
         raise
       end
     end
+    if @setting["narou_api_url"] && !serial_novel?
+      raise NoSerialNovel
+    end
     @setting.multi_match(toc_source, "title", "author", "story", "tcode")
     @title = @setting["title"]
     @file_title = Helper.replace_filename_special_chars(@title)
@@ -461,7 +488,7 @@ class Downloader
   def sections_download_and_save(subtitles)
     max = subtitles.count
     return if max == 0
-    puts "ID:#{@id}　#{@title} のDL開始"
+    puts ("<green>" + TermColor.escape("ID:#{@id}　#{@title} のDL開始") + "</green>").termcolor
     interval_sleep_time = LocalSetting.get["local_setting"]["download.interval"] || 0
     interval_sleep_time = 0 if interval_sleep_time < 0
     save_least_one = false
@@ -536,7 +563,7 @@ class Downloader
     rescue OpenURI::HTTPError => e
       if e.message =~ /^503/
         if retry_count == 0
-          warn "上限までリトライしましたがファイルがダウンロード出来ませんでした"
+          error "上限までリトライしましたがファイルがダウンロード出来ませんでした"
           exit 1
         end
         retry_count -= 1

data/lib/extensions/windows.rb

@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+
+begin
+  require "fiddle"
+
+  module WinAPI
+    include Fiddle
+    Handle = RUBY_VERSION >= "2.0.0" ? Fiddle::Handle : DL::Handle
+    Kernel32 = Handle.new("kernel32")
+
+    def self.GetLogicalDriveStrings(buf_size, buffer)
+      @@get_logical_drive_strings ||=
+        Function.new(Kernel32["GetLogicalDriveStrings"], [TYPE_LONG, TYPE_VOIDP], TYPE_LONG)
+      @@get_logical_drive_strings.call(buf_size, buffer)
+    end
+
+    def self.SetConsoleTextAttribute(cons_handle, attr)
+      @@set_console_text_attribute ||=
+        Function.new(Kernel32["SetConsoleTextAttribute"], [-TYPE_INT, -TYPE_INT], -TYPE_INT)
+      @@set_console_text_attribute.call(cons_handle, attr)
+    end
+
+    def self.GetConsoleScreenBufferInfo(cons_handle, lp_buffer)
+      @@get_console_screen_buffer_info ||=
+        Function.new(Kernel32["GetConsoleScreenBufferInfo"], [TYPE_LONG, TYPE_VOIDP], TYPE_INT)
+      @@get_console_screen_buffer_info.call(cons_handle, lp_buffer)
+    end
+
+    def self.GetStdHandle(handle_type)
+      @@get_std_handle ||= Function.new(Kernel32["GetStdHandle"], [-TYPE_INT], -TYPE_INT)
+      @@get_std_handle.call(handle_type)
+    end
+
+    def self.GetLastError
+      @@get_last_error ||= Function.new(Kernel32["GetLastError"], [], -TYPE_INT)
+      @@get_last_error.call
+    end
+  end
+rescue LoadError
+  # Fiddle がない環境用(http://www.artonx.org/data/asr/ の1.9.3とか)
+  require "dl/import"
+
+  class InvalidOS < StandardError; end
+
+  module WinAPI
+    extend DL::Importer
+    begin
+      dlload "kernel32"
+      extern "long GetLogicalDriveStrings(long, void*)"
+      extern "long SetConsoleTextAttribute(long, long)"
+      extern "long GetConsoleScreenBufferInfo(long, void*)"
+      extern "long GetStdHandle(long)"
+      extern "long GetLastError()"
+    rescue DL::DLError
+      raise InvalidOS, "not Windows"
+    end
+  end
+end

data/lib/globalsetting.rb

@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/helper.rb

@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/illustration.rb

@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/ini.rb

@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/inspector.rb

@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
@@ -58,7 +58,7 @@ class Inspector
     @info
   end
 
-  def display(klass = ALL, target = $stderr)
+  def display(klass = ALL, target = $stdout)
     target.puts @messages.map { |msg|
       if msg =~ /^\[(.+)\]/
         key = KLASS_TAG.key($1)

data/lib/kindlestrip.rb

@@ -1,5 +1,5 @@
 #! ruby
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # It was translated into Ruby script by whiteleaf.
 #

data/lib/loadconverter.rb

@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
@@ -72,7 +72,7 @@ def load_converter(title, archive_path)
   if conv
     return conv
   else
-    warn "converter.rbは見つかりましたが、`converter'で登録されていないようです。" +
+    error "converter.rbは見つかりましたが、`converter'で登録されていないようです。" +
          "変換処理は converter \"#{title}\" として登録する必要があります"
     return BlankConverter
   end

data/lib/localsetting.rb

@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/logger.rb

@@ -1,10 +1,11 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
 
 require "singleton"
 require "stringio"
+require_relative "color"
 
 module LoggerModule
   def initialize
@@ -20,9 +21,23 @@ module LoggerModule
     @is_silent
   end
 
+  def strip_color(str)
+    str.gsub(/(?:\e\[\d*[a-zA-Z])+/, "")
+  end
+
   def save(path)
     File.write(path, string)
   end
+
+  def write_console(str, target)
+    if str.encoding == Encoding::ASCII_8BIT
+      str.force_encoding("utf-8")
+    end
+    unless @is_silent
+      str = strip_color(str) if $disable_color
+      write_color(str, target)
+    end
+  end
 end
 
 class Logger < StringIO
@@ -34,10 +49,9 @@ class Logger < StringIO
   end
 
   def write(str)
-    super
-    unless @is_silent
-      STDOUT.write(str)
-    end
+    str = str.to_s
+    super(strip_color(str))
+    write_console(str, STDOUT)
   end
 end
 
@@ -50,12 +64,15 @@ class LoggerError < StringIO
   end
 
   def write(str)
-    super
-    unless @is_silent
-      STDERR.write(str)
-    end
+    str = str.to_s
+    super(strip_color(str))
+    write_console(str, STDERR)
   end
 end
 
+def error(str)
+  warn "<red>[ERROR]</red> #{str}".termcolor
+end
+
 $stdout = Logger.get
 $stderr = LoggerError.get

data/lib/narou.rb

@@ -1,4 +1,4 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/narou/api.rb

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+require "open-uri"
+require "yaml"
+
+module Narou
+  #
+  # 小説家になろうデベロッパーAPI操作クラス
+  #
+  class API
+    def initialize(setting, of = "")
+      @setting = setting
+      @api_url = @setting["narou_api_url"]
+      @ncode = @setting["ncode"]
+      request_api(of)
+    end
+
+    def [](key)
+      @api_result[key]
+    end
+
+    def request_api(of)
+      url = "#{@api_url}?ncode=#{@ncode}&of=#{of}"
+      open(url) do |fp|
+        result = YAML.load(fp.read)
+        if result[0]["allcount"] == 1
+          @api_result = result[1]
+          if of.length > 0
+            @api_result["novel_type"] = @api_result["noveltype"]
+          end
+        else
+          error "なろうAPIから情報が取得出来ませんでした"
+          exit 1
+        end
+      end
+    end
+  end
+end