narou 3.5.1 → 3.8.0

data/lib/helper.rb

@@ -350,10 +350,10 @@ module Helper
   # 長過ぎるファイルパスを詰める
   # ファイル名部分のみを詰める。拡張子は維持する
   #
-  def truncate_path(path, limit = Inventory.load["filename-length-limit"])
+  def truncate_path(path, limit = Inventory.load["filename-length-limit"], extname: nil)
     limit ||= FILENAME_LENGTH_LIMIT
     dirname = File.dirname(path)
-    extname = File.extname(path)
+    extname ||= File.extname(path)
     basename = File.basename(path, extname)
     if basename.length > limit
       basename = basename[0...limit]
@@ -375,7 +375,7 @@ module Helper
   #
   def erb_copy(src, dst, _binding)
     data = File.read(src, mode: "r:BOM|UTF-8")
-    result = ERB.new(data, nil, "-").result(_binding)
+    result = ERB.new(data, trim_mode: "-").result(_binding)
     File.write(dst, result)
   end
 

data/lib/inventory.rb

@@ -44,13 +44,13 @@ module Inventory
     return unless File.exist?(@inventory_file_path)
     self.merge!(Helper::CacheLoader.memo(@inventory_file_path) { |yaml|
       begin
-        YAML.load(yaml)
+        YAML.unsafe_load(yaml)
       rescue Psych::SyntaxError
         unless restore(@inventory_file_path)
           error "#{@inventory_file_path} が壊れてるっぽい"
           raise
         end
-        YAML.load_file(@inventory_file_path)
+        YAML.unsafe_load_file(@inventory_file_path)
       end
     })
   end

data/lib/loadconverter.rb

@@ -10,7 +10,7 @@ BlankConverter = Class.new(ConverterBase) {}
 
 $latest_converter = nil
 
-def converter(title, &block)
+def converter(_title = nil, &block)
   $latest_converter = Class.new(ConverterBase, &block)
 end
 
@@ -58,7 +58,7 @@ end
 #     buffer
 #   end
 # end
-def load_converter(title, archive_path)
+def load_converter(archive_path)
   converter_path = File.join(archive_path, "converter.rb")
   if File.exist?(converter_path)
     $latest_converter = nil
@@ -71,9 +71,8 @@ def load_converter(title, archive_path)
   if conv
     return conv
   else
-    title_for_converter = (title =~ /.txt\z/ ? title : File.basename(archive_path))
     error "converter.rbは見つかりましたが、`converter'で登録されていないようです。" +
-          "変換処理は converter \"#{title_for_converter.gsub('"', '\\"')}\" として登録する必要があります"
+          "変換処理は converter do ... end として登録する必要があります"
     return BlankConverter
   end
 end

data/lib/mailer.rb

@@ -23,7 +23,7 @@ class Mailer
     this.clear
     setting_file_path = File.join(Narou.root_dir, SETTING_FILE)
     if File.exist?(setting_file_path)
-      options = YAML.load_file(setting_file_path)
+      options = YAML.unsafe_load_file(setting_file_path)
       unless options.delete(:complete)
         raise SettingUncompleteError, "設定ファイルの書き換えが終了していないようです。\n" +
                                       "設定ファイルは #{setting_file_path} にあります"

data/lib/narou.rb

@@ -38,330 +38,336 @@ module Narou
 
   extend Mixin::Locker
 
- class << self
-  extend Memoist
+  class << self
+    extend Memoist
 
-  @@is_web = false
+    @@is_web = false
 
-  def last_commit_year
-    2020
-  end
+    def last_commit_year
+      2021
+    end
 
-  def root_dir
-    root = nil
-    path = Dir.pwd
-    drive_letter = ""
-    if Helper.os_windows?
-      path.encode!(Encoding::UTF_8)
-      path.gsub!(/^[a-z]:/i, "")
-      drive_letter = $&
-    end
-    while path != ""
-      if File.directory?("#{drive_letter}#{path}/#{LOCAL_SETTING_DIR_NAME}")
-        root = drive_letter + path
-        break
+    def root_dir
+      root = nil
+      path = Dir.pwd
+      drive_letter = ""
+      if Helper.os_windows?
+        path.encode!(Encoding::UTF_8)
+        path.gsub!(/^[a-z]:/i, "")
+        drive_letter = $&
+      end
+      while path != ""
+        if File.directory?("#{drive_letter}#{path}/#{LOCAL_SETTING_DIR_NAME}")
+          root = drive_letter + path
+          break
+        end
+        path.gsub!(%r!/[^/]*$!, "")
       end
-      path.gsub!(%r!/[^/]*$!, "")
+      Pathname(root) if root
     end
-    Pathname(root) if root
-  end
-  memoize :root_dir
+    memoize :root_dir
 
-  def local_setting_dir
-    root_dir&.join(LOCAL_SETTING_DIR_NAME)
-  end
-  memoize :local_setting_dir
+    def local_setting_dir
+      root_dir&.join(LOCAL_SETTING_DIR_NAME)
+    end
+    memoize :local_setting_dir
 
-  def global_setting_dir
-    if root_dir
-      dir = root_dir.join(GLOBAL_SETTING_DIR_NAME)
-      return dir if dir.directory?
+    def global_setting_dir
+      if root_dir
+        dir = root_dir.join(GLOBAL_SETTING_DIR_NAME)
+        return dir if dir.directory?
+      end
+      dir = Pathname(GLOBAL_SETTING_DIR_NAME).expand_path("~")
+      dir.mkdir unless dir.exist?
+      dir
     end
-    dir = Pathname(GLOBAL_SETTING_DIR_NAME).expand_path("~")
-    dir.mkdir unless dir.exist?
-    dir
-  end
-  memoize :global_setting_dir
+    memoize :global_setting_dir
 
-  def script_dir
-    Pathname(__dir__).join("..").expand_path
-  end
-  memoize :script_dir
+    def script_dir
+      Pathname(__dir__).join("..").expand_path
+    end
+    memoize :script_dir
 
-  def log_dir
-    root_dir&.join(LOG_DIR)
-  end
+    def log_dir
+      root_dir&.join(LOG_DIR)
+    end
 
-  def preset_dir
-    script_dir&.join(PRESET_DIR)
-  end
-  memoize :preset_dir
+    def preset_dir
+      script_dir&.join(PRESET_DIR)
+    end
+    memoize :preset_dir
 
-  def already_init?
-    root_dir.present?
-  end
+    def already_init?
+      root_dir.present?
+    end
 
-  def init
-    return nil if already_init?
-    FileUtils.mkdir(LOCAL_SETTING_DIR_NAME)
-    puts "#{LOCAL_SETTING_DIR_NAME}/ を作成しました"
-    Database.init
-  end
+    def init
+      return nil if already_init?
+      FileUtils.mkdir(LOCAL_SETTING_DIR_NAME)
+      puts "#{LOCAL_SETTING_DIR_NAME}/ を作成しました"
+      Database.init
+    end
 
-  #
-  # target が alias だった場合はIDに変換する
-  #
-  # 全てのtarget照合系はこのメソッドを通過するので、ここで小文字にしてしまう
-  #
-  def alias_to_id(target)
-    aliases = Inventory.load("alias")
-    if aliases[target]
-      return aliases[target]
-    end
-    target.kind_of?(Numeric) ? target : target.downcase
-  end
+    #
+    # target が alias だった場合はIDに変換する
+    #
+    # 全てのtarget照合系はこのメソッドを通過するので、ここで小文字にしてしまう
+    #
+    def alias_to_id(target)
+      aliases = Inventory.load("alias")
+      if aliases[target]
+        return aliases[target]
+      end
+      target.is_a?(Numeric) ? target : target.downcase
+    end
 
-  def novel_frozen?(target)
-    id = Downloader.get_id_by_target(target) or return false
-    Inventory.load("freeze").include?(id)
-  end
+    def novel_frozen?(target)
+      id = Downloader.get_id_by_target(target) or return false
+      Inventory.load("freeze").include?(id)
+    end
 
-  def create_aozoraepub3_jar_path(*paths)
-    Pathname(File.expand_path(File.join(*paths, AOZORAEPUB3_JAR_NAME)))
-  end
+    def create_aozoraepub3_jar_path(*paths)
+      Pathname(File.expand_path(File.join(*paths, AOZORAEPUB3_JAR_NAME)))
+    end
 
-  def aozoraepub3_directory?(path)
-    create_aozoraepub3_jar_path(path).exist?
-  end
+    def aozoraepub3_directory?(path)
+      create_aozoraepub3_jar_path(path).exist?
+    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
+    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
-    pattern
-  end
 
-  def write_replace_txt(path, pairs)
-    buffer = pairs.each_with_object("\t").map(&:join).join("\n")
-    File.write(path, buffer)
-  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 = root_dir.join(GLOBAL_REPLACE_NAME)
-    pairs =
-      if path.exist?
-        Helper::CacheLoader.memo(path) do |text|
-          parse_replace_txt(text)
+    def load_global_replace_pattern
+      path = root_dir.join(GLOBAL_REPLACE_NAME)
+      pairs =
+        if path.exist?
+          Helper::CacheLoader.memo(path) do |text|
+            parse_replace_txt(text)
+          end
+        else
+          []
         end
-      else
-        []
-      end
-    @@global_replace_pattern_pairs = pairs
-    pairs
-  end
+      @@global_replace_pattern_pairs = pairs
+      pairs
+    end
 
-  def global_replace_pattern
-    @@global_replace_pattern_pairs ||= load_global_replace_pattern
-  end
+    def global_replace_pattern
+      @@global_replace_pattern_pairs ||= load_global_replace_pattern
+    end
 
-  def save_global_replace_pattern
-    path = root_dir.join(GLOBAL_REPLACE_NAME)
-    write_replace_txt(path, @@global_replace_pattern_pairs)
-  end
+    def save_global_replace_pattern
+      path = root_dir.join(GLOBAL_REPLACE_NAME)
+      write_replace_txt(path, @@global_replace_pattern_pairs)
+    end
 
-  #
-  # AozoraEpub3 の実行ファイル(.jar)のフルパス取得
-  # 検索順序
-  # 1. グローバルセッティング (global_setting aozoraepub3dir)
-  # 2. 小説保存ディレクトリ(Narou.root_dir) 直下の AozoraEpub3
-  # 3. スクリプト保存ディレクトリ(Narou.script_dir) 直下の AozoraEpub3
-  #
-  def aozoraepub3_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 aozora_jar_path.exist?
-        return aozora_jar_path
+    #
+    # AozoraEpub3 の実行ファイル(.jar)のフルパス取得
+    # 検索順序
+    # 1. グローバルセッティング (global_setting aozoraepub3dir)
+    # 2. 小説保存ディレクトリ(Narou.root_dir) 直下の AozoraEpub3
+    # 3. スクリプト保存ディレクトリ(Narou.script_dir) 直下の AozoraEpub3
+    #
+    def aozoraepub3_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 aozora_jar_path.exist?
+          return aozora_jar_path
+        end
       end
-    end
-    [Narou.root_dir, Narou.script_dir].each do |dir|
-      aozora_jar_path = create_aozoraepub3_jar_path(dir, AOZORAEPUB3_DIR)
-      return aozora_jar_path if aozora_jar_path.exist?
-    end
-    nil
-  end
-  memoize :aozoraepub3_path
-
-  #
-  # 書籍ファイル名を生成する
-  # convert.filename-to-ncode を設定している場合に novel_data に ncode、domain を
-  # 設定しない場合は id カラムが必須
-  #
-  def create_novel_filename(novel_data, ext = "")
-    filename_to_ncode = Inventory.load("local_setting")["convert.filename-to-ncode"]
-    novel_setting =
-      if novel_data["id"]
-        NovelSetting.load(novel_data["id"])
-      else
-        OpenStruct.new
+      [Narou.root_dir, Narou.script_dir].each do |dir|
+        aozora_jar_path = create_aozoraepub3_jar_path(dir, AOZORAEPUB3_DIR)
+        return aozora_jar_path if aozora_jar_path.exist?
       end
-    if novel_setting.output_filename.present?
-      %!#{novel_setting.output_filename}#{ext}!
-    elsif filename_to_ncode
-      ncode, domain = novel_data["ncode"], novel_data["domain"]
-      if !ncode || !domain
-        id = novel_data["id"]
-        unless id
-          raise ArgumentError, %!novel_data["id"] を設定して下さい!
+      nil
+    end
+    memoize :aozoraepub3_path
+
+    #
+    # 書籍ファイル名を生成する
+    # convert.filename-to-ncode を設定している場合に novel_data に ncode、domain を
+    # 設定しない場合は id カラムが必須
+    #
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
+    def create_novel_filename(novel_data, ext = "")
+      filename_to_ncode = Inventory.load("local_setting")["convert.filename-to-ncode"]
+      novel_setting =
+        if novel_data["id"]
+          NovelSetting.load(novel_data["id"])
+        else
+          OpenStruct.new
+        end
+      if novel_setting.output_filename.present?
+        %!#{novel_setting.output_filename}#{ext}!
+      elsif filename_to_ncode
+        ncode = novel_data["ncode"]
+        domain = novel_data["domain"]
+        if !ncode || !domain
+          id = novel_data["id"]
+          unless id
+            raise ArgumentError, %!novel_data["id"] を設定して下さい!
+          end
+          site_setting = Downloader.get_sitesetting_by_target(id)
+          ncode = site_setting["ncode"]
+          domain = site_setting["domain"]
         end
-        site_setting = Downloader.get_sitesetting_by_target(id)
-        ncode = site_setting["ncode"]
-        domain = site_setting["domain"]
+        serialized_domain = domain.to_s.gsub(".", "_")
+        %!#{serialized_domain}_#{ncode}#{ext}!
+      else
+        author = Helper.replace_filename_special_chars(
+          novel_setting.novel_author.presence || novel_data["author"],
+          true
+        )
+        title = Helper.replace_filename_special_chars(
+          novel_setting.novel_title.presence || novel_data["title"],
+          true
+        )
+        filename = "[#{author}] #{title}#{ext}"
+        length_limit = Inventory.load["ebook-filename-length-limit"]
+        length_limit ? Helper.truncate_path(filename, length_limit, extname: ext) : filename
       end
-      serialized_domain = domain.to_s.gsub(".", "_")
-      %!#{serialized_domain}_#{ncode}#{ext}!
-    else
-      author = Helper.replace_filename_special_chars(
-        novel_setting.novel_author.presence || novel_data["author"],
-        true
-      )
-      title = Helper.replace_filename_special_chars(
-        novel_setting.novel_title.presence || novel_data["title"],
-        true
-      )
-      filename = "[#{author}] #{title}#{ext}"
-      length_limit = Inventory.load["ebook-filename-length-limit"]
-      length_limit ? Helper.truncate_path(filename, length_limit) : filename
     end
-  end
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
-  def get_mobi_paths(target)
-    get_ebook_file_paths(target, ".mobi")
-  end
+    def get_mobi_paths(target)
+      get_ebook_file_paths(target, ".mobi")
+    end
 
-  def get_ebook_file_paths(target, ext)
-    data = Downloader.get_data_by_target(target)
-    return nil unless data
-    dir = Downloader.get_novel_data_dir_by_target(target)
-    fname = create_novel_filename(data, ext)
-    base = File.basename(fname, ext)
-    get_ebook_file_paths_from_components(dir, base, ext)
-  end
+    def get_ebook_file_paths(target, ext)
+      data = Downloader.get_data_by_target(target)
+      return nil unless data
 
-  def get_ebook_file_paths_from_components(dir, base, ext)
-    paths = [File.join(dir, "#{base}#{ext}")]
-    index = 2
-    while File.exist?(path = File.join(dir, "#{base}_#{index}#{ext}"))
-      paths.push(Pathname(path))
-      index += 1
+      dir = Downloader.get_novel_data_dir_by_target(target)
+      fname = create_novel_filename(data, ext)
+      base = File.basename(fname, ext)
+      get_ebook_file_paths_from_components(dir, base, ext)
     end
-    paths
-  end
 
-  def misc_dir
-    root_dir.join(MISC_DIR)
-  end
+    def get_ebook_file_paths_from_components(dir, base, ext)
+      paths = [File.join(dir, "#{base}#{ext}")]
+      index = 2
+      while File.exist?(path = File.join(dir, "#{base}_#{index}#{ext}"))
+        paths.push(Pathname(path))
+        index += 1
+      end
+      paths
+    end
+
+    def misc_dir
+      root_dir.join(MISC_DIR)
+    end
 
-  require_relative "device"
+    require_relative "device"
 
-  def get_device(device_name = nil)
-    device_name = Inventory.load("local_setting")["device"] unless device_name
-    if device_name && Device.exists?(device_name)
-      return Device.create(device_name)
+    def get_device(device_name = nil)
+      device_name ||= Inventory.load("local_setting")["device"]
+      if device_name && Device.exists?(device_name)
+        return Device.create(device_name)
+      end
+      nil
     end
-    nil
-  end
 
-  def web=(bool)
-    @@is_web = bool
-  end
+    def web=(bool)
+      @@is_web = bool
+    end
 
-  def web?
-    @@is_web
-  end
+    def web?
+      @@is_web
+    end
 
-  def update_sort_key_summaries(left_space = 28)
-    summaries = { "KEY" => "   対象" }.merge(UPDATE_SORT_KEYS)
-    key_max_width = summaries.keys.max_by(&:length).length
-    summaries.map do |(key, summary)|
-      "#{" " * left_space}| #{key.center(key_max_width)} | #{summary}"
-    end.join("\n")
-  end
+    def update_sort_key_summaries(left_space = 28)
+      summaries = { "KEY" => "   対象" }.merge(UPDATE_SORT_KEYS)
+      key_max_width = summaries.keys.max_by(&:length).length
+      summaries.map do |(key, summary)|
+        "#{" " * left_space}| #{key.center(key_max_width)} | #{summary}"
+      end.join("\n")
+    end
 
-  def get_theme
-    Inventory.load("local_setting")["webui.theme"]
-  end
+    def theme
+      Inventory.load("local_setting")["webui.theme"]
+    end
 
-  def get_theme_dir(name = nil)
-    Pathname(File.join([script_dir, "lib/web/public/theme", name].compact))
-  end
+    def get_theme_dir(name = nil)
+      Pathname(File.join([script_dir, "lib/web/public/theme", name].compact))
+    end
 
-  def get_theme_names
-    Dir.glob(get_theme_dir("*")).map do |path|
-      name = File.basename(path)
-      name == "fonts" ? nil : name
-    end.compact
-  end
-  memoize :get_theme_names
+    def theme_names
+      Dir.glob(get_theme_dir("*")).map do |path|
+        name = File.basename(path)
+        name == "fonts" ? nil : name
+      end.compact
+    end
+    memoize :theme_names
 
-  def economy?(mode)
-    eco_modes = Inventory.load("local_setting")["economy"].to_s.split(",").map(&:strip)
-    eco_modes.include?(mode)
-  end
+    def economy?(mode)
+      eco_modes = Inventory.load("local_setting")["economy"].to_s.split(",").map(&:strip)
+      eco_modes.include?(mode)
+    end
 
-  def novel_type_text(type)
-    type == 2 ? "短編" : "連載"
-  end
+    def novel_type_text(type)
+      type == 2 ? "短編" : "連載"
+    end
 
-  #
-  # Narou.rb gem の最新バージョン番号を取得する
-  #
-  # rubygems公式APIによる取得は、WindowsでのSSL証明書問題で取得出来ない
-  # 環境があるため、gemコマンド経由で取得する
-  #
-  def latest_version
-    response = `gem search ^narou$`.split("\n")
-    if response.last =~ /\Anarou \(([0-9.]+).*?\)\z/
-      $1
+    #
+    # Narou.rb gem の最新バージョン番号を取得する
+    #
+    # rubygems公式APIによる取得は、WindowsでのSSL証明書問題で取得出来ない
+    # 環境があるため、gemコマンド経由で取得する
+    #
+    def latest_version
+      response = `gem search ^narou$`.split("\n")
+      if response.last =~ /\Anarou \(([0-9.]+).*?\)\z/
+        $1
+      end
     end
-  end
 
-  def commit_version
-    cv_path = File.expand_path("commitversion", script_dir)
-    File.read(cv_path) if File.exist?(cv_path)
-  end
-  memoize :commit_version
+    def commit_version
+      cv_path = File.expand_path("commitversion", script_dir)
+      File.read(cv_path) if File.exist?(cv_path)
+    end
+    memoize :commit_version
 
-  def kindlegen_path
-    postfix = Helper.os_windows? ? ".exe" : ""
-    aozoraepub3_path.dirname.join("kindlegen#{postfix}")
-  end
-  memoize :kindlegen_path
+    def kindlegen_path
+      postfix = Helper.os_windows? ? ".exe" : ""
+      aozoraepub3_path.dirname.join("kindlegen#{postfix}")
+    end
+    memoize :kindlegen_path
 
-  def line_height(default: LINE_HEIGHT_DEFAULT)
-    global_setting = Inventory.load("global_setting", :global)
-    global_setting["line-height"] || default
-  end
+    def line_height(default: LINE_HEIGHT_DEFAULT)
+      global_setting = Inventory.load("global_setting", :global)
+      global_setting["line-height"] || default
+    end
 
-  def concurrency_enabled?
-    $stdout != $stdout2
-  end
-  memoize :concurrency_enabled?
+    def concurrency_enabled?
+      $stdout != $stdout2
+    end
+    memoize :concurrency_enabled?
 
-  # 同時実行が有効ならキューに積んで、無効なら普通に実行する
-  def concurrency_call(&block)
-    if concurrency_enabled?
-      Worker.push(&block)
-      EXIT_SUCCESS
-    else
-      block.call
+    # 同時実行が有効ならキューに積んで、無効なら普通に実行する
+    def concurrency_call(&block)
+      if concurrency_enabled?
+        Worker.push(&block)
+        EXIT_SUCCESS
+      else
+        block.call
+      end
     end
   end
- end
 end