narou 2.0.2 → 2.1.0

data/lib/converterbase.rb

@@ -575,10 +575,11 @@ class ConverterBase
   #
   # 必ず下げなければいけないところは強制的に字下げ
   # 他の部分は全体的に判断して字下げ
+  # enable_force_indent が有効なら強制字下げ
   #
   def auto_indent(data)
     data.gsub!(FULL_INDENT_TARGET, "　\\1")
-    if @setting.enable_auto_indent && @inspector.inspect_indent(data)
+    if @setting.enable_force_indent || (@setting.enable_auto_indent && @inspector.inspect_indent(data))
       data.gsub!(/^([^#{AUTO_INDENT_IGNORE_INDENT_CHAR}])/) do
         # 行頭に三点リーダーの代わりに連続中黒（・・・）が来た場合の対策
         # https://github.com/whiteleaf7/narou/issues/35

data/lib/device.rb

@@ -4,10 +4,24 @@
 #
 
 require "fileutils"
+require "memoist"
 require_relative "narou"
 require_relative "helper"
 
 class Device
+  #
+  # デバイスの栞をバックアップするときに使う時に include する
+  #
+  module BackupBookmarkUtility
+    extend Memoist
+
+    # 栞データを管理するディレクトリのパスを取得
+    def get_storage_path
+      File.join(Narou.get_misc_dir, "bookmark", @name)
+    end
+    memoize :get_storage_path
+  end
+
   case Helper.determine_os
   when :windows
     require_relative "device/library/windows"
@@ -45,6 +59,7 @@ class Device
 
   class UnknownDevice < StandardError; end
   class SendFailure < StandardError; end
+  class DontConneting < StandardError; end
 
   def self.exists?(device)
     DEVICES.include?(device.downcase)
@@ -149,8 +164,6 @@ class Device
     end
   end
 
-  private
-
   def create_device_check_methods
     DEVICES.keys.each do |name|
       instance_eval <<-EOS
@@ -160,4 +173,5 @@ class Device
       EOS
     end
   end
+  private :create_device_check_methods
 end

data/lib/device/epub.rb

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+#
+# multi-device で単純なEPUB変換をしたい場合用
+#
+module Device::Epub
+  PHYSICAL_SUPPORT = false
+  VOLUME_NAME = nil
+  DOCUMENTS_PATH_LIST = nil
+  EBOOK_FILE_EXT = ".epub"
+  NAME = "EPUB"
+  DISPLAY_NAME = "EPUB"
+
+  RELATED_VARIABLES = {
+    "force.enable_half_indent_bracket" => false,
+  }
+end

data/lib/device/ibooks.rb

@@ -15,15 +15,11 @@ module Device::Ibooks
 
   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.exist?(@@__ibooks_container_dir)
       error "iBooksの管理フォルダが見つかりませんでした。" \

data/lib/device/kindle.rb

@@ -3,6 +3,8 @@
 # Copyright 2013 whiteleaf. All rights reserved.
 #
 
+require "fileutils"
+
 module Device::Kindle
   PHYSICAL_SUPPORT = true
   VOLUME_NAME = "Kindle"
@@ -14,4 +16,22 @@ module Device::Kindle
   RELATED_VARIABLES = {
     "force.enable_half_indent_bracket" => true,
   }
+
+  include Device::BackupBookmarkUtility
+
+  def backup_bookmark
+    documents_path = get_documents_path
+    raise Device::DontConneting unless documents_path
+    paths = Dir.glob(File.join(documents_path, "*.sdr/*.azw3{f,r}"))
+    Helper.copy_files(paths, get_storage_path)
+    paths.size
+  end
+
+  def restore_bookmark
+    documents_path = get_documents_path
+    raise Device::DontConneting unless documents_path
+    paths = Dir.glob(File.join(get_storage_path, "*.sdr/*"))
+    Helper.copy_files(paths, documents_path)
+    paths.size
+  end
 end

data/lib/device/reader.rb

@@ -11,12 +11,7 @@ module Device::Reader
   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
+  RELATED_VARIABLES = {
+    "force.enable_half_indent_bracket" => false,
+  }
 end

data/lib/helper.rb

@@ -238,6 +238,25 @@ module Helper
     TYPE_OF_VALUE[value.class]
   end
 
+  #
+  # ファイルを指定したディレクトリにまとめてコピーする
+  # 指定したディレクトリが存在しなければ作成する
+  #
+  # from: ファイルパスをまとめた Array
+  # dest_dir: コピー先のディレクトリ
+  #
+  def copy_files(from, dest_dir)
+    from.each do |path|
+      basename = File.basename(path)
+      dirname = File.basename(File.dirname(path))
+      save_dir = File.join(dest_dir, dirname)
+      unless File.directory?(save_dir)
+        FileUtils.mkdir_p(save_dir)
+      end
+      FileUtils.copy(path, File.join(save_dir, basename))
+    end
+  end
+
   #
   # 外部コマンド実行中の待機ループの処理を書けるクラス
   #

data/lib/logger.rb

@@ -18,9 +18,18 @@ end
 module Narou end unless defined?(Narou)
 
 module Narou::LoggerModule
+  attr_accessor :capturing
+
   def initialize
     super
     @is_silent = false
+    @capturing = false
+  end
+
+  def copy_instance
+    self.class.new.tap { |obj|
+      obj.silent = silent
+    }
   end
 
   def silent=(enable)
@@ -55,18 +64,26 @@ module Narou::LoggerModule
   # 標準出力($stdout)のバッファリング＋取得
   #
   # キャプチャー用途なので標準エラーはキャプチャーしない
+  # quiet :: 標準出力に出力をしないかどうか
   # ansicolor_strip :: エスケープシーケンスを除去するか
   #
-  def capture(ansicolor_strip = true, &block)
+  def capture(options = {}, &block)
+    options = {
+      quiet: true, ansicolor_strip: true
+    }.merge(options)
     raise "#capture block given" unless block
     temp_stream = $stdout
-    $stdout = self.class.new
-    $stdout.silence do
+    $stdout = (self == $stdout ? copy_instance : self)
+    $stdout.capturing = true
+    if options[:quiet]
+      $stdout.silence { block.call }
+    else
       block.call
     end
+    $stdout.capturing = false
     buffer = $stdout.string
     $stdout = temp_stream
-    ansicolor_strip ? strip_color(buffer) : buffer
+    options[:ansicolor_strip] ? strip_color(buffer) : buffer
   end
 
   def strip_color(str)

data/lib/narou.rb

@@ -4,6 +4,7 @@
 #
 
 require "fileutils"
+require "memoist"
 require_relative "helper"
 require_relative "inventory"
 if Helper.engine_jruby?
@@ -11,24 +12,22 @@ if Helper.engine_jruby?
 end
 
 module Narou
+  extend Memoist
+
   module_function
 
   LOCAL_SETTING_DIR = ".narou"
   GLOBAL_SETTING_DIR = ".narousetting"
   AOZORAEPUB3_JAR_NAME = "AozoraEpub3.jar"
-  AOZORAEPUB3_DIR = "./AozoraEpub3"
-  PRESET_DIR = "./preset"
+  AOZORAEPUB3_DIR = "AozoraEpub3"
+  PRESET_DIR = "preset"
+  MISC_DIR = "misc"
   EXIT_ERROR_CODE = 127
 
-  @@root_dir = nil
-  @@local_setting_dir = nil
-  @@global_setting_dir = nil
-  @@aozora_jar_path = nil
-  @@preset_dir = nil
   @@is_web = false
 
   def get_root_dir
-    return @@root_dir if @@root_dir
+    root_dir = nil
     path = File.expand_path(File.dirname("."))
     drive_letter = ""
     if Helper.os_windows?
@@ -37,35 +36,38 @@ module Narou
     end
     while path != ""
       if File.directory?("#{drive_letter}#{path}/#{LOCAL_SETTING_DIR}")
-        @@root_dir = drive_letter + path
+        root_dir = drive_letter + path
         break
       end
       path.gsub!(%r!/[^/]*$!, "")
     end
-    @@root_dir
+    root_dir
   end
+  memoize :get_root_dir
 
   def get_local_setting_dir
-    return @@local_setting_dir if @@local_setting_dir
+    local_setting_dir = nil
     root_dir = get_root_dir
     if root_dir
-      @@local_setting_dir = File.join(root_dir, LOCAL_SETTING_DIR)
+      local_setting_dir = File.join(root_dir, LOCAL_SETTING_DIR)
     end
-    @@local_setting_dir
+    local_setting_dir
   end
+  memoize :get_local_setting_dir
 
   def get_global_setting_dir
-    return @@global_setting_dir if @@global_setting_dir
-    @@global_setting_dir = File.expand_path(File.join("~", GLOBAL_SETTING_DIR))
-    unless File.exist?(@@global_setting_dir)
-      FileUtils.mkdir(@@global_setting_dir)
+    global_setting_dir = File.expand_path(File.join("~", GLOBAL_SETTING_DIR))
+    unless File.exist?(global_setting_dir)
+      FileUtils.mkdir(global_setting_dir)
     end
-    @@global_setting_dir
+    global_setting_dir
   end
+  memoize :get_global_setting_dir
 
   def get_script_dir
-    @@script_dir ||= File.expand_path(File.join(File.dirname(__FILE__), ".."))
+    File.expand_path(File.join(File.dirname(__FILE__), ".."))
   end
+  memoize :get_script_dir
 
   def already_init?
     !!get_root_dir
@@ -92,10 +94,9 @@ module Narou
   end
 
   def get_preset_dir
-    return @@preset_dir if @@preset_dir
-    @@preset_dir = File.expand_path(File.join(get_script_dir, PRESET_DIR))
-    @@preset_dir
+    File.expand_path(File.join(get_script_dir, PRESET_DIR))
   end
+  memoize :get_preset_dir
 
   def create_aozoraepub3_jar_path(*paths)
     File.expand_path(File.join(*paths, AOZORAEPUB3_JAR_NAME))
@@ -113,24 +114,22 @@ module Narou
   # 3. スクリプト保存ディレクトリ(Narou.get_script_dir) 直下の AozoraEpub3
   #
   def get_aozoraepub3_path
-    return @@aozora_jar_path if @@aozora_jar_path
     global_setting_aozora_path = Inventory.load("global_setting", :global)["aozoraepub3dir"]
     if global_setting_aozora_path
       aozora_jar_path = create_aozoraepub3_jar_path(global_setting_aozora_path)
       if File.exist?(aozora_jar_path)
-        @@aozora_jar_path = aozora_jar_path
         return aozora_jar_path
       end
     end
     [Narou.get_root_dir, Narou.get_script_dir].each do |dir|
       aozora_jar_path = create_aozoraepub3_jar_path(dir, AOZORAEPUB3_DIR)
       if File.exist?(aozora_jar_path)
-        @@aozora_jar_path = aozora_jar_path
         return aozora_jar_path
       end
     end
     nil
   end
+  memoize :get_aozoraepub3_path
 
   def create_novel_filename(novel_data, ext = "")
     author, title = %w(author title).map { |k|
@@ -150,6 +149,11 @@ module Narou
     File.join(dir, create_novel_filename(data, ext))
   end
 
+  def get_misc_dir
+    File.join(get_root_dir, MISC_DIR)
+  end
+  memoize :get_misc_dir
+
   require_relative "device"
 
   def get_device(device_name = nil)

data/lib/novelconverter.rb

@@ -289,10 +289,8 @@ class NovelConverter
       end
     end
     # タイトルに完結したかどうかを付加する
-    flags = data["flags"] || {}
     tags = data["tags"] || []
-    flags["end"] ||= tags.include?("end")
-    if flags["end"]
+    if tags.include?("end")
       processed_title += " (完結)"
     end
     # タイトルがルビ化されてしまうのを抑制

data/lib/novelsetting.rb

@@ -197,6 +197,12 @@ class NovelSetting
       value: true,
       help: "自動行頭字下げ機能。行頭字下げが行われているかを判断し、適切に行頭字下げをする"
     },
+    {
+      name: "enable_force_indent",
+      type: :boolean,
+      value: false,
+      help: "行頭字下げを必ず行う。enable_auto_indent の設定は無視される"
+    },
     {
       name: "enable_auto_join_in_brackets",
       type: :boolean,

data/lib/version.rb

@@ -3,5 +3,5 @@
 # Copyright 2013 whiteleaf. All rights reserved.
 #
 
-Version = "2.0.2"
+Version = "2.1.0"
 

data/lib/web/appserver.rb

@@ -486,7 +486,7 @@ class Narou::AppServer < Sinatra::Base
       ids.each do |id|
         # セキュリティ的にWEB UIでは独自の差分表示のみ使う
         CommandLine.run!(["diff", "--no-tool", id])
-        print "<hr>"
+        Helper.print_horizontal_rule
       end
     end
   end

data/lib/web/helper4web.rb

@@ -8,8 +8,18 @@ require_relative "../helper"
 module Helper
   module_function
 
+  class << self
+    alias :original_print_horizontal_rule :print_horizontal_rule
+  end
+
   def print_horizontal_rule
-    print "<hr>"
+    # タグがキャプチャーされると困るので、キャプチャ専用の出力とWEBへの出力は分ける
+    if $stdout.capturing
+      $stdout.silence do
+        original_print_horizontal_rule
+      end
+    end
+    $stdout.push_server.send_all(echo: "<hr>")
   end
 end
 

data/lib/web/public/resources/narou.library.js

@@ -536,25 +536,32 @@ var Narou = (function() {
 
     init_events_progressbar: function() {
       var self = this;
-      var create_progress_html = function() {
-        return '<div class="progress"><div class="progress-bar progress-bar-success progress-bar-striped active" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%"></div></div>';
-      };
       var $progress = null;
+      var createProgressHtml = function(percent) {
+        return '<div class="progress"><div class="progress-bar progress-bar-success progress-bar-striped active" role="progressbar" aria-valuenow="' + percent + '" aria-valuemin="0" aria-valuemax="100" style="width:' + percent + '%"></div></div>';
+      };
+      var initializeProgressbar = function(percent) {
+        self.puts(createProgressHtml(percent));
+        $progress = self.console.find(".progress > div");
+      };
       var setProgressValue = function(step) {
         $progress.attr("aria-valuenow", step)
                  .width(step + "%");
       };
       this.notification.on("progressbar.init", function() {
-        self.puts(create_progress_html());
-        $progress = self.console.find(".progress > div");
+        initializeProgressbar(0);
       });
       this.notification.on("progressbar.step", function(value) {
-        if (!$progress) return;
-        setProgressValue(value);
+        if ($progress) {
+          setProgressValue(value);
+        }
+        else {
+          initializeProgressbar(value);
+        }
       });
       this.notification.on("progressbar.clear", function() {
         if (!$progress) return;
-        // 表示のタイムラグで100%付近のが表示されないまま消えてしまうので、
+        // 表示と通信のタイムラグで100%付近のが表示されないまま消えてしまうので、
         // 演出的にプログレスバーの消去を遅らせて、100%付近まで表示する
         setProgressValue(100);
         $progress = null;