narou 1.5.11 → 1.6.0

data/lib/database.rb

@@ -7,7 +7,7 @@ require "fileutils"
 require "singleton"
 require "yaml"
 require_relative "narou"
-require_relative "localsetting"
+require_relative "inventory"
 
 class Database
   include Singleton
@@ -48,7 +48,7 @@ class Database
   end
 
   def initialize
-    @database = LocalSetting.get[DATABASE_NAME]
+    @database = Inventory.load(DATABASE_NAME, :local)
   end
 
   #
@@ -69,7 +69,7 @@ class Database
   end
 
   def save_database
-    LocalSetting.get.save_settings(DATABASE_NAME)
+    @database.save
   end
 
   def get_object

data/lib/device.rb

@@ -4,6 +4,7 @@
 #
 
 require "fileutils"
+require_relative "narou"
 require_relative "helper"
 
 class Device
@@ -51,12 +52,12 @@ class Device
 
   def initialize(device_name)
     unless Device.exists?(device_name)
-      raise UnknownDevice, "#{device_name} は存在しません"
+      raise UnknownDevice, "#{device_name} という端末は存在しません"
     end
-    @device = DEVICES[device_name.downcase]
-    @name = @device::NAME
-    @display_name = @device::DISPLAY_NAME
-    @ebook_file_ext = @device::EBOOK_FILE_EXT
+    @device_module = DEVICES[device_name.downcase]
+    @name = @device_module::NAME
+    @display_name = @device_module::DISPLAY_NAME
+    @ebook_file_ext = @device_module::EBOOK_FILE_EXT
     create_device_check_methods
   end
 
@@ -65,7 +66,7 @@ class Device
   end
 
   def find_documents_directory(device_root_dir)
-    @device::DOCUMENTS_PATH_LIST.each do |documents_path|
+    @device_module::DOCUMENTS_PATH_LIST.each do |documents_path|
       documents_directory = File.join(device_root_dir, documents_path)
       return documents_directory if File.directory?(documents_directory)
     end
@@ -74,7 +75,7 @@ class Device
 
   def get_documents_path
     if Device.respond_to?(:get_device_root_dir)
-      dir = Device.get_device_root_dir(@device::VOLUME_NAME)
+      dir = Device.get_device_root_dir(@device_module::VOLUME_NAME)
       if dir
         return find_documents_directory(dir)
       end
@@ -103,16 +104,16 @@ class Device
           # Rubyでコピーするのは遅いのでOSのコマンドを叩く
           cmd = "copy /B " + %!"#{src_file}" "#{dst_path}"!.gsub("/", "\\").encode(Encoding::Windows_31J)
           capture = `#{cmd}`
-          if $?.exitstatus > 0
+          unless $?.success?
             raise capture.force_encoding(Encoding::Windows_31J).rstrip
           end
-        rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError => e
-          # Windows-31J に変換できない文字をファイル名に含むものはRubyでコピーする
+        rescue StandardError
+          # コマンドで送信出来ないものはRubyで直接コピーする
           FileUtils.cp(src_file, dst_path)
         end
       else
-        capture = `cp "#{src_file}" "#{dst_path}"`
-        raise capture.rstrip if $?.exitstatus > 0
+        status = system(%!cp "#{src_file}" "#{dst_path}"!)
+        raise "コピーできませんでした" unless status
       end
       dst_path
     else
@@ -125,7 +126,19 @@ class Device
   end
 
   def physical_support?
-    @device::PHYSICAL_SUPPORT
+    @device_module::PHYSICAL_SUPPORT
+  end
+
+  def get_hook_module
+    @device_module
+  end
+
+  def get_relative_variables
+    if @device_module.const_defined?(:RELATED_VARIABLES)
+      @device_module::RELATED_VARIABLES
+    else
+      {}
+    end
   end
 
   private

data/lib/device/ibooks.rb

@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+module Device::Ibooks
+  PHYSICAL_SUPPORT = false
+  VOLUME_NAME = nil
+  DOCUMENTS_PATH_LIST = nil
+  EBOOK_FILE_EXT = ".epub"
+  NAME = "iBooks"
+  DISPLAY_NAME = "iBooks"
+
+  IBOOKS_CONTAINER_DIR = "~/Library/Containers/com.apple.BKAgentService/Data/Documents/iBooks/Books"
+
+  RELATED_VARIABLES = {
+    "force.enable_half_indent_bracket" => false,
+    "force.enable_add_date_to_title" => false,    # タイトルを変えてもiBooksに反映されないため
+  }
+
+  def hook_change_settings(&original_func)
+    @@__already_exec_change_settings ||= false
+    return if @@__already_exec_change_settings
+    force_change_settings_function({
+      "force.enable_half_indent_bracket" => false,
+    })
+    @@__ibooks_container_dir = File.expand_path(IBOOKS_CONTAINER_DIR)
+    unless File.exists?(@@__ibooks_container_dir)
+      error "iBooksの管理フォルダが見つかりませんでした。" \
+            "MacOSX Mavericks以降のiBooksのみ管理に対応しています"
+      @@__ibooks_container_dir = nil
+    end
+    @@__already_exec_change_settings = true
+  end
+
+  #
+  # EPUBへ変換したあとiBooksが管理しているディレクトリに展開する
+  #
+  def hook_convert_txt_to_ebook_file(&original_func)
+    ebook_file_path = original_func.call
+    return ebook_file_path unless ebook_file_path
+    return ebook_file_path unless @@__ibooks_container_dir
+    if @argument_target_type == :file
+      warn "テキストファイル変換時はiBooksへの登録は行われません"
+      return ebook_file_path
+    end
+    @toc_url = @novel_data["toc_url"]
+    epubdir_path = get_epubdir_path_in_ibooks_container
+    if epubdir_path && File.exists?(epubdir_path)
+      extract_epub(ebook_file_path, epubdir_path)
+      puts "iBooksに登録してあるEPUBを更新しました"
+    else
+      epubdir_path = watch_ibooks_container(ebook_file_path)
+      if epubdir_path
+        regist_epubdir_path_to_setting(epubdir_path)
+        puts "iBooksへの登録を確認しました"
+      else
+        error "EPUBの展開後のフォルダが見つかりませんでした。" \
+              "iBooksがインストールされているか確認して下さい"
+      end
+    end
+    ebook_file_path
+  end
+
+  def get_epubdir_path_in_ibooks_container
+    list = Inventory.load("ibooks_epubdir_path_list", :local)
+    if list[@toc_url]
+      list[@toc_url]
+    else
+      nil
+    end
+  end
+
+  def extract_epub(ebook_file_path, epubdir_path)
+    require "zip"
+    Zip.on_exists_proc = true
+    Zip::File.open(ebook_file_path) do |zip_file|
+      zip_file.each do |entry|
+        extract_path = File.join(epubdir_path, entry.name)
+        FileUtils.mkdir_p(File.dirname(extract_path))
+        entry.extract(extract_path)
+      end
+    end
+  end
+
+  def watch_ibooks_container(ebook_file_path)
+    just_before_list = get_ibooks_containing_epub_list
+    unless system(%!open -a iBooks "#{ebook_file_path}"!)
+      error "iBooksが開けませんでした"
+      return nil
+    end
+    limit = 15
+    found_path = nil
+    while limit > 0
+      sleep(1)
+      just_after_list = get_ibooks_containing_epub_list
+      differ = just_after_list - just_before_list
+      if differ.length == 1
+        found_path = differ[0]
+        break
+      end
+      limit -= 1
+    end
+    found_path
+  end
+
+  def get_ibooks_containing_epub_list
+    Dir.glob("#{@@__ibooks_container_dir}/*.epub/")
+  end
+
+  def regist_epubdir_path_to_setting(path)
+    list = Inventory.load("ibooks_epubdir_path_list", :local)
+    list[@toc_url] = path
+    list.save
+  end
+end

data/lib/device/ibunko.rb

@@ -10,4 +10,49 @@ module Device::Ibunko
   EBOOK_FILE_EXT = ".zip"
   NAME = "iBunko"
   DISPLAY_NAME = "i文庫"
+
+  RELATED_VARIABLES = {
+    "force.enable_half_indent_bracket" => false,
+    "force.enable_dakuten_font" => false
+  }
+
+  #
+  # i文庫用にテキストと挿絵ファイルをzipアーカイブ化する
+  #
+  def hook_convert_txt_to_ebook_file(&original_func)
+    return false if @options["no-zip"]
+    require "zip"
+    Zip.unicode_names = true
+    dirpath = File.dirname(@converted_txt_path)
+    translate_illust_chuki_to_img_tag
+    zipfile_path = @converted_txt_path.sub(/.txt$/, @device.ebook_file_ext)
+    File.delete(zipfile_path) if File.exists?(zipfile_path)
+    Zip::File.open(zipfile_path, Zip::File::CREATE) do |zip|
+      zip.add(File.basename(@converted_txt_path), @converted_txt_path)
+      illust_dirpath = File.join(dirpath, Illustration::ILLUST_DIR)
+      # 挿絵
+      if File.exists?(illust_dirpath)
+        Dir.glob(File.join(illust_dirpath, "*")) do |img_path|
+          zip.add(File.join(Illustration::ILLUST_DIR, File.basename(img_path)), img_path)
+        end
+      end
+      # 表紙画像
+      cover_name = NovelConverter.get_cover_filename(dirpath)
+      if cover_name
+        zip.add(cover_name, File.join(dirpath, cover_name))
+      end
+    end
+    puts File.basename(zipfile_path) + " を出力しました"
+    puts "<bold><green>#{@device.display_name}用ファイルを出力しました</green></bold>".termcolor
+    zipfile_path
+  end
+
+  #
+  # 挿絵注記をimgタグに変換する
+  #
+  def translate_illust_chuki_to_img_tag
+    data = File.read(@converted_txt_path, encoding: Encoding::UTF_8)
+    data.gsub!(/［＃挿絵（(.+?)）入る］/, "<img src=\"\\1\">")
+    File.write(@converted_txt_path, data)
+  end
 end

data/lib/device/kindle.rb

@@ -10,4 +10,8 @@ module Device::Kindle
   EBOOK_FILE_EXT = ".mobi"
   NAME = "Kindle"
   DISPLAY_NAME = "Kindle"
+
+  RELATED_VARIABLES = {
+    "force.enable_half_indent_bracket" => true,
+  }
 end

data/lib/device/kobo.rb

@@ -10,4 +10,8 @@ module Device::Kobo
   EBOOK_FILE_EXT = ".kepub.epub"
   NAME = "Kobo"
   DISPLAY_NAME = "Kobo"
+
+  RELATED_VARIABLES = {
+    "force.enable_half_indent_bracket" => false,
+  }
 end

data/lib/device/library/windows.rb

@@ -10,10 +10,7 @@ module Device::Library
   module Windows
     def get_device_root_dir(volume_name)
       @@FileSystemObject ||= WIN32OLE.new("Scripting.FileSystemObject")
-      drive_strings = " " * 1000
-      result_len = WinAPI.GetLogicalDriveStrings(1000, drive_strings)
-      drives = drive_strings[0, result_len].split("\0")
-      drives.each do |drive_letter|
+      get_drives.each do |drive_letter|
         drive_info = @@FileSystemObject.GetDrive(drive_letter)
         vol = drive_info.VolumeName rescue ""
         if vol.downcase == volume_name.downcase
@@ -22,5 +19,16 @@ module Device::Library
       end
       nil
     end
+
+    def get_drives
+      result = []
+      bits = WinAPI.GetLogicalDrives
+      26.times do |i|
+        if bits & (1 << i) != 0
+          result << "#{(65 + i).chr}:\\"
+        end
+      end
+      result
+    end
   end
 end

data/lib/device/reader.rb

@@ -10,4 +10,13 @@ module Device::Reader
   EBOOK_FILE_EXT = ".epub"
   NAME = "Reader"
   DISPLAY_NAME = "SonyReader"
+
+  def hook_change_settings(&original_func)
+    @@__already_exec_change_settings ||= false
+    return if @@__already_exec_change_settings
+    force_change_settings_function({
+      "force.enable_half_indent_bracket" => false,
+    })
+    @@__already_exec_change_settings = true
+  end
 end

data/lib/diffviewer.rb

@@ -0,0 +1,147 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+require "diff/lcs"
+require "termcolor"
+
+#
+# 指定されたソースの差分を作成する
+#
+# 書式はなんちゃってunified contextなので、パッチ作成には使えません
+#
+class DiffViewer
+  class InvalidSourceType < StandardError; end
+
+  def initialize(old, new, source = :file)
+    case source
+    when :file
+      old_strings = File.read(old, :encoding => Encoding::UTF_8)
+      new_strings = File.read(new, :encoding => Encoding::UTF_8)
+    when :string
+      old_strings = old
+      new_strings = new
+    else
+      raise InvalidSourceType, "source supported options are ':file' and ':string'"
+    end
+    old_strings.gsub!("\r", "")
+    new_strings.gsub!("\r", "")
+    @builded_buffer = ""
+    @events = Diff::LCS.sdiff(old_strings.split("\n"), new_strings.split("\n"))
+    build
+  end
+
+  def to_s
+    @builded_buffer
+  end
+
+  def view
+    puts @builded_buffer
+  end
+
+  private
+
+  def build
+    @buffer = {}
+    pos = 0
+    events_size = @events.size
+    while pos < events_size
+      pos = output_differing_line_and_before_and_behind(pos)
+    end
+    before_index = -1000
+    @builded_buffer = @buffer.sort_by { |index|
+      # buffer の格納順はバラバラなのでソートしておく
+      index
+    }.map { |(index, (event, str))|
+      # index が途切れたら、ポジション情報を付与する
+      result = ""
+      if index - before_index >= 2
+        result += "<bold><cyan>@@ -#{event.old_position+1}, " \
+                  "+#{event.new_position+1} @@</cyan></bold>\n".termcolor
+      end
+      result += str
+      before_index = index
+      result
+    }.join("\n")
+  end
+
+  #
+  # 指定ラインが編集・追加・削除されていた行だったら前後３行をバッファに出力
+  #
+  def output_differing_line_and_before_and_behind(index, force = false)
+    last = index + 1
+    return last if @buffer[index] || index < 0
+    event = @events[index] or return last
+    if %w(! + -).include?(event.action)
+      @buffer[index] = [event, decorate_event(event)]
+      ((index - 3)..(index + 3)).each do |i|
+        output_differing_line_and_before_and_behind(i, true)
+      end
+      last = index + 3 + 1
+    elsif force
+      @buffer[index] = [event, " #{event.old_element}"]
+    end
+    last
+  end
+
+  #
+  # レーベンシュタイン距離を計算する
+  #
+  # differ には Diff::LCS.sdiff で処理したものをそのまま渡す
+  #
+  def calc_levenshtein_distance(differ)
+    differ.reject { |e| e.unchanged? }.count
+  end
+
+  #
+  # event.action を見てラインを装飾
+  #
+  def decorate_event(event)
+    result = ""
+    old_element = event.old_element
+    new_element = event.new_element
+    case event.action
+    when "!"
+      old_str = ""
+      new_str = ""
+      line_events = Diff::LCS.sdiff(old_element, new_element)
+      distance = calc_levenshtein_distance(line_events)
+      # レーベンシュタイン距離を正規化する
+      size = [old_element.length, new_element.length].max
+      normalized_distance = distance / size.to_f
+      if normalized_distance > 0.7
+        # 双方の文字列があまりにも似ていない場合、編集部分をカラー化すると
+        # 非常に見づらい表示になってしまうので、単純に削除・追加のみ装飾する
+        old_str = TermColor.escape(old_element)
+        new_str = TermColor.escape(new_element)
+      else
+        line_events.each do |e|
+          os = TermColor.escape(e.old_element) rescue ""
+          ns = TermColor.escape(e.new_element) rescue ""
+          case e.action
+          when "="
+            old_str += os
+            new_str += ns
+          when "!"
+            os = "<underline>#{os}</underline>" if os == " " || os == "　"
+            ns = "<underline>#{ns}</underline>" if ns == " " || os == "　"
+            old_str += "<reverse><on_black><yellow>#{os}</yellow></on_black></reverse>"
+            new_str += "<reverse><on_black><yellow>#{ns}</yellow></on_black></reverse>"
+          when "-"
+            old_str += "<reverse>#{os}</reverse>"
+          when "+"
+            new_str += "<reverse>#{ns}</reverse>"
+          end
+        end
+      end
+      result = "<bold><red>-#{old_str}</red>\n" \
+               "<green>+#{new_str}</green></bold>"
+    when "-"
+      result = "<bold><red>-#{TermColor.escape(old_element)}</red></bold>"
+    when "+"
+      result = "<bold><green>+#{TermColor.escape(new_element)}</green></bold>"
+    end
+    result.termcolor
+  end
+end