narou 2.4.2 → 2.5.1

data/lib/ini.rb

@@ -3,6 +3,8 @@
 # Copyright 2013 whiteleaf. All rights reserved.
 #
 
+require_relative "helper"
+
 class Ini
   DELIMITER = "="
   GLOBAL_SECTION = "global"
@@ -24,7 +26,7 @@ class Ini
   def self.load_file(file)
     case
     when file.kind_of?(String)
-      text = open(file, "r:BOM|UTF-8") { |fp| fp.read }
+      text = File.read(file, mode: "r:BOM|UTF-8")
       ini = new(text)
       ini.filename = file
       return ini.object

data/lib/inventory.rb

@@ -38,7 +38,9 @@ module Inventory
     return nil unless dir
     @inventory_file_path = File.join(dir, name + ".yaml")
     if File.exist?(@inventory_file_path)
-      self.merge!(YAML.load_file(@inventory_file_path))
+      self.merge!(Helper::CacheLoader.memo(@inventory_file_path) { |yaml|
+        YAML.load(yaml)
+      })
     end
   end
 

data/lib/loadconverter.rb

@@ -9,7 +9,6 @@ require_relative "helper"
 BlankConverter = Class.new(ConverterBase) {}
 
 $converter_container = {}
-$converter_load_once = {}
 
 def converter(title, &block)
   $converter_container[title] = Class.new(ConverterBase, &block)
@@ -62,16 +61,7 @@ end
 def load_converter(title, archive_path)
   converter_path = File.join(archive_path, "converter.rb")
   if File.exist?(converter_path)
-    if Helper.os_windows?
-      # TODO: RubyのバグでUTF-8なパスをrequireが見えてない。修正されたら消す
-      unless $converter_load_once[archive_path]
-        eval(File.read(converter_path, encoding: Encoding::UTF_8),
-             binding, converter_path)
-        $converter_load_once[archive_path] = true
-      end
-    else
-      require converter_path
-    end
+    eval(File.read(converter_path, mode: "r:BOM|UTF-8"), binding, converter_path)
   else
     return BlankConverter
   end

data/lib/mailer.rb

@@ -4,6 +4,7 @@
 #
 
 require "yaml"
+require "singleton"
 require_relative "narou"
 
 class Mailer

data/lib/narou.rb

@@ -12,10 +12,6 @@ if Helper.engine_jruby?
 end
 
 module Narou
-  extend Memoist
-
-  module_function
-
   LOCAL_SETTING_DIR = ".narou"
   GLOBAL_SETTING_DIR = ".narousetting"
   AOZORAEPUB3_JAR_NAME = "AozoraEpub3.jar"
@@ -23,6 +19,15 @@ module Narou
   PRESET_DIR = "preset"
   MISC_DIR = "misc"
   EXIT_ERROR_CODE = 127
+  GLOBAL_REPLACE_NAME = "replace.txt"
+
+  UPDATE_SORT_KEYS = {
+    "id" => "ID", "last_update" => "更新日", "title" => "タイトル", "author" => "作者名",
+    "new_arrivals_date" => "新着日", "general_lastup" => "最新話掲載日"
+  }
+
+ class << self
+  extend Memoist
 
   @@is_web = false
 
@@ -106,6 +111,46 @@ module Narou
     File.exist?(create_aozoraepub3_jar_path(path))
   end
 
+  def parse_replace_txt(text)
+    pattern = []
+    text.each_line do |line|
+      line.sub!(/[\r\n]+\z/, "")
+      next if line[0] == ";"    # コメント記号
+      pair = line.split("\t", 2)
+      if pair.length == 2 && pair[0]
+        pattern << pair
+      end
+    end
+    pattern
+  end
+
+  def write_replace_txt(path, pairs)
+    buffer = pairs.each_with_object("\t").map(&:join).join("\n")
+    File.write(path, buffer)
+  end
+
+  def load_global_replace_pattern
+    path = File.join(get_root_dir, GLOBAL_REPLACE_NAME)
+    if File.exist?(path)
+      pairs = Helper::CacheLoader.memo(path) do |text|
+        parse_replace_txt(text)
+      end
+    else
+      pairs = []
+    end
+    @@global_replace_pattern_pairs = pairs
+    pairs
+  end
+
+  def global_replace_pattern
+    @@global_replace_pattern_pairs ||= load_global_replace_pattern
+  end
+
+  def save_global_replace_pattern
+    path = File.join(get_root_dir, GLOBAL_REPLACE_NAME)
+    write_replace_txt(path, @@global_replace_pattern_pairs)
+  end
+
   #
   # AozoraEpub3 の実行ファイル(.jar)のフルパス取得
   # 検索順序
@@ -152,7 +197,6 @@ module Narou
   def get_misc_dir
     File.join(get_root_dir, MISC_DIR)
   end
-  memoize :get_misc_dir
 
   require_relative "device"
 
@@ -171,4 +215,11 @@ module Narou
   def web?
     @@is_web
   end
+
+  def update_sort_key_summaries(width = 27)
+    ({"KEY" => "対象"}.merge(UPDATE_SORT_KEYS)).map { |(key, summary)|
+      "#{key.rjust(width)} : #{summary}"
+    }.join("\n")
+  end
+ end
 end

data/lib/novelconverter.rb

@@ -32,9 +32,10 @@ class NovelConverter
   def self.convert(target, options = {})
     options = {
       # default paraeters
-      output_filename: nil, display_inspector: false, ignore_force: false,
+      output_filename: nil, display_inspector: false,
+      ignore_force: false, ignore_default: false
     }.merge(options)
-    setting = NovelSetting.load(target, options[:ignore_force])
+    setting = NovelSetting.load(target, options[:ignore_force], options[:ignore_default])
     if setting
       novel_converter = new(setting, options[:output_filename], options[:display_inspector])
       return {
@@ -51,7 +52,8 @@ class NovelConverter
   def self.convert_file(filename, options = {})
     options = {
       # default parameters
-      encoding: nil, output_filename: nil, display_inspector: false, ignore_force: false,
+      encoding: nil, output_filename: nil, display_inspector: false,
+      ignore_force: false, ignore_default: false
     }.merge(options)
     output_filename = options[:output_filename]
     if output_filename
@@ -59,7 +61,7 @@ class NovelConverter
     else
       archive_path = File.dirname(filename) + "/"
     end
-    setting = NovelSetting.new(archive_path, options[:ignore_force])
+    setting = NovelSetting.create(archive_path, options[:ignore_force], options[:ignore_default])
     setting.author = ""
     setting.title = File.basename(filename)
     novel_converter = new(setting, output_filename, options[:display_inspector])
@@ -298,7 +300,7 @@ class NovelConverter
     processed_title = processed_title.gsub("《", "※［＃始め二重山括弧］")
                                      .gsub("》", "※［＃終わり二重山括弧］")
     tempalte_name = (device && device.ibunko? ? NOVEL_TEXT_TEMPLATE_NAME_FOR_IBUNKO : NOVEL_TEXT_TEMPLATE_NAME)
-    Template.get(tempalte_name, binding)
+    Template.get(tempalte_name, binding, 1.0)
   end
 
   #

data/lib/novelsetting.rb

@@ -10,29 +10,53 @@ class NovelSetting
   INI_NAME = "setting.ini"
   REPLACE_NAME = "replace.txt"
 
-  attr_accessor :id, :author, :title, :archive_path, :replace_pattern
+  attr_accessor :id, :author, :title, :archive_path, :replace_pattern, :settings
 
-  def self.load(target, ignore_force)
-    archive_path = Downloader.get_novel_data_dir_by_target(target)
-    if archive_path
-      setting = new(archive_path, ignore_force)
-      data = Downloader.get_data_by_target(target)
-      setting.id = data["id"]
-      setting.author = data["author"]
-      setting.title = data["title"]
-      setting
-    else
-      nil
-    end
+  #
+  # データベースに登録されている小説の設定を取得する
+  #
+  def self.load(target, ignore_force, ignore_default)
+    setting = create(target, ignore_force, ignore_default)
+    data = Downloader.get_data_by_target(target)
+    setting.id = data["id"]
+    setting.author = data["author"]
+    setting.title = data["title"]
+    setting
+  end
+
+  #
+  # 小説設定オブジェクトを作成する
+  #
+  # target には小説ID等の他、小説保存フォルダを指定できる。
+  # テキストファイル変換時はデータベースに登録されていないので load ではなくこちらを使用する
+  #
+  def self.create(target, ignore_force, ignore_default)
+    setting = new(target, ignore_force, ignore_default)
+    setting.load_settings
+    setting.set_attribute
+    setting.load_replace_pattern
+    setting
   end
 
-  def initialize(archive_path, ignore_force)
+  def initialize(target, ignore_force, ignore_default)
+    if File.directory?(target.to_s)
+      archive_path = target
+    else
+      archive_path = Downloader.get_novel_data_dir_by_target(target).to_s
+    end
     @archive_path = File.expand_path(archive_path)
     @ignore_force = ignore_force
+    @ignore_default = ignore_default
     @replace_pattern = []
-    load_settings
-    set_attribute
-    load_replace_pattern
+    @settings = {}
+  end
+
+  def ini_path
+    File.join(@archive_path, INI_NAME)
+  end
+
+  def load_setting_ini
+    Ini.load_file(ini_path) rescue Ini.load("")
   end
 
   #
@@ -41,58 +65,93 @@ class NovelSetting
   # 設定値の優先順位は
   # 1. narou setting コマンドで設定した force.*
   # 2. setting.ini
-  # 3. DEFAULT_SETTINGS
+  # 3. narou setting コマンドで設定した default.*
+  # 4. ORIGINAL_SETTINGS
   #
   def load_settings
-    @setting = {}
-    ini_path = File.join(@archive_path, INI_NAME)
-    ini = Ini.load_file(ini_path) rescue Ini.load("")
-    force_settings = {}
-    unless @ignore_force
-      # 設定値を強制的に上書きするデータの読込
-      Inventory.load("local_setting", :local).each { |name, value|
-        if name =~ /^force\.(.+)$/
-          force_settings[$1] = value
-        end
-      }
-    end
-    DEFAULT_SETTINGS.each do |element|
+    @settings.clear
+    ini = load_setting_ini
+    force_settings = @ignore_force ? {} : NovelSetting.load_force_settings
+    default_settings = @ignore_default ? {} : NovelSetting.load_default_settings
+    ORIGINAL_SETTINGS.each do |element|
       name, value, type = element[:name], element[:value], element[:type]
       if force_settings.include?(name)
-        @setting[name] = force_settings[name]
-      elsif ini["global"].include?(name) && type == Helper.type_of_value(ini["global"][name])
-        @setting[name] = ini["global"][name]
+        @settings[name] = force_settings[name]
+      elsif ini["global"].include?(name) && type_eq_value(type, ini["global"][name])
+        @settings[name] = ini["global"][name]
+      elsif default_settings.include?(name)
+        @settings[name] = default_settings[name]
       else
-        @setting[name] = value
+        @settings[name] = value
       end
     end
     # デフォルト設定以外を読み込む
     ini["global"].each do |key, value|
-      unless @setting.include?(key)
-        @setting[key] = value
+      unless @settings.include?(key)
+        @settings[key] = value
       end
     end
   end
 
+  #
+  # local_settings から group.name 形式のデータを取得
+  #
+  # { name: value, ... } 形式のハッシュとして返す
+  #
+  def self.load_settings_by_pattern(pattern)
+    res = Inventory.load("local_setting", :local).map { |name, value|
+      if name =~ /^#{pattern}\.(.+)$/
+        [$1, value]
+      else
+        nil
+      end
+    }.compact.flatten
+    Hash[*res]
+  end
+
+  #
+  # force.* 設定を取得
+  #
+  def self.load_force_settings
+    load_settings_by_pattern("force")
+  end
+
+  #
+  # default.* 設定を取得
+  #
+  def self.load_default_settings
+    load_settings_by_pattern("default")
+  end
+
   #
   # 設定を保存
   #
   def save_settings
     ini = Ini.new
     ini.filename = File.join(@archive_path, INI_NAME)
-    ini.object["global"].merge!(@setting)
+    ini.object["global"].merge!(@settings)
     ini.save
   end
 
+  def type_eq_value(type, value)
+    type_of_value = Helper.type_of_value(value)
+    case type
+    when :string, :select, :multiple
+      :string == type_of_value
+    else
+      type == type_of_value
+    end
+  end
+
   #
   # 指定された設定の型チェック
   #
   def check_value_of_type(name, value)
-    index = DEFAULT_SETTINGS.index { |v| v[:name] == name }
+    index = ORIGINAL_SETTINGS.index { |v| v[:name] == name }
     return unless index
-    default = DEFAULT_SETTINGS[index]
-    if default && default[:type] != Helper.type_of_value(value)
-      raise Helper::InvalidVariableType, default[:type]
+    original = ORIGINAL_SETTINGS[index]
+    if original && !type_eq_value(original[:type], value)
+      raise Helper::InvalidVariableType, original[:type]
     end
   end
 
@@ -100,15 +159,15 @@ class NovelSetting
   # 設定データ用アクセサ定義
   #
   def set_attribute
-    @setting.each_key do |key|
+    @settings.each_key do |key|
       instance_eval <<-EOS
         def #{key}
-          @setting["#{key}"]
+          @settings["#{key}"]
         end
 
         def #{key}=(value)
           check_value_of_type("#{key}", value)
-          @setting["#{key}"] = value
+          @settings["#{key}"] = value
         end
       EOS
     end
@@ -118,12 +177,14 @@ class NovelSetting
   # 配列風のアクセサ定義
   #
   def [](name)
-    @setting[name]
+    @settings[name]
   end
 
   def []=(name, value)
-    check_value_of_type(name, value)
-    @setting[name] = value
+    unless value.nil?
+      check_value_of_type(name, value)
+    end
+    @settings[name] = value
   end
 
   #
@@ -133,16 +194,7 @@ class NovelSetting
     @replace_pattern.clear
     replace_txt_path = File.join(@archive_path, REPLACE_NAME)
     if File.exist?(replace_txt_path)
-      open(replace_txt_path, "r:BOM|UTF-8") do |fp|
-        fp.each do |line|
-          line.sub!(/[\r\n]+\z/, "")
-          next if line[0] == ";"    # コメント記号
-          pattern = line.split("\t", 2)
-          if pattern.length == 2 && pattern[0]
-            @replace_pattern << pattern
-          end
-        end
-      end
+      @replace_pattern = Narou.parse_replace_txt(File.read(replace_txt_path, mode: "r:BOM|UTF-8"))
     end
     @replace_pattern
   end
@@ -152,11 +204,10 @@ class NovelSetting
   #
   def save_replace_pattern
     replace_txt_path = File.join(@archive_path, REPLACE_NAME)
-    buff = @replace_pattern.each_with_object("\t").map(&:join).join("\n")
-    File.write(replace_txt_path, buff)
+    Narou.write_replace_txt(replace_txt_path, @replace_pattern)
   end
 
-  DEFAULT_SETTINGS = [
+  ORIGINAL_SETTINGS = [
     # name: 変数名
     # type: 変数の型
     # value: 初期値
@@ -319,9 +370,11 @@ class NovelSetting
     },
     {
       name: "title_date_align",
-      type: :string,
+      type: :select,
       value: "right",
-      help: "enable_add_date_to_title で付与する日付の位置。left か right"
+      help: "enable_add_date_to_title で付与する日付の位置。left(タイトルの前) か right(タイトルの後)",
+      select_keys: %w(left right),
+      select_summaries: %w(タイトルの前 タイトルの後)
     },
     {
       name: "enable_ruby_youon_to_big",