narou 3.2.5.1 → 3.3.0

data/lib/eventable.rb

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

data/lib/extension.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
 
 require "open-uri"
 require "openssl"
@@ -18,22 +23,19 @@ end
 #
 require "securerandom"
 
-def File.write(path, string, *options)
-  dirpath = File.dirname(path)
-  backup = false
-  temp_path =
-    if File.extname(path) == ".yaml" && File.basename(dirpath) != Downloader::SECTION_SAVE_DIR_NAME
-      backup = true
-      "#{path}.backup"
-    else
-      File.join(dirpath, SecureRandom.hex(15))
-    end
+def File.write(path, string, *options, mode: nil)
+  return super if mode
 
-  super(temp_path, string, *options)
+  dirpath = File.dirname(path)
+  temp_path = File.join(dirpath, SecureRandom.hex(15))
+  if File.extname(path) == ".yaml" && File.basename(dirpath) != Downloader::SECTION_SAVE_DIR_NAME
+    backup = "#{path}.backup"
+  end
 
+  res = super(temp_path, string, *options)
   if backup
-    super(path, string, *options)
-  else
-    File.rename(temp_path, path)
+    super(backup, string, *options)
   end
+  File.rename(temp_path, path)
+  res
 end

data/lib/extensions/jruby.rb

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

data/lib/extensions/monkey_patches.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+require_relative "monkey_patches/pathname"

data/lib/extensions/monkey_patches/pathname.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+require "pathname"
+
+module Narou
+  module MonkyPatches
+    module PathnameGlob
+      # Pathname#glob は Ruby2.5 から実装された
+      def glob(pattern, flags = 0, &block)
+        Pathname.glob(self.join(pattern), flags, &block)
+      end
+    end
+  end
+end
+
+unless Pathname.method_defined?(:glob)
+  Pathname.prepend(Narou::MonkyPatches::PathnameGlob)
+end

data/lib/extensions/windows.rb

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

data/lib/extensions/windows_write_color.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 =begin
 original source is

data/lib/helper.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
@@ -15,6 +16,7 @@ module Helper
 
   HOST_OS = RbConfig::CONFIG["host_os"]
   FILENAME_LENGTH_LIMIT = 50
+  FOLDER_LENGTH_LIMIT = 50
 
   def os_windows?
     @@os_is_windows ||= HOST_OS =~ /mswin(?!ce)|mingw|bccwin/i
@@ -68,7 +70,7 @@ module Helper
     end
     case determine_os
     when :windows
-      system(%!explorer "file:///#{path.encode(Encoding::Windows_31J)}"!)
+      system(%!explorer "file:///#{path}"!.encode(Encoding::Windows_31J))
     when :cygwin
       system(%!cygstart "#{path}"!)
     when :mac
@@ -93,8 +95,10 @@ module Helper
     end
   end
 
-  def print_horizontal_rule
-    puts "―" * 35
+  HR_TEXT = "―" * 35
+
+  def print_horizontal_rule(io = $stdout)
+    io.puts HR_TEXT
   end
 
   def replace_filename_special_chars(str, invalid_replace = false)
@@ -330,7 +334,7 @@ module Helper
   # 数字やスペース、句読点、感嘆符はそのままにする
   #
   def to_unprintable_words(string, mask = "●")
-    result = "".dup
+    result = +""
     string.each_char do |char|
       result += case char
                 when /[0-9０-９ 　、。!?！？]/
@@ -346,7 +350,8 @@ module Helper
   # 長過ぎるファイルパスを詰める
   # ファイル名部分のみを詰める。拡張子は維持する
   #
-  def truncate_path(path, limit = FILENAME_LENGTH_LIMIT)
+  def truncate_path(path, limit = Inventory.load["filename-length-limit"])
+    limit ||= FILENAME_LENGTH_LIMIT
     dirname = File.dirname(path)
     extname = File.extname(path)
     basename = File.basename(path, extname)
@@ -359,6 +364,12 @@ module Helper
     end
   end
 
+  def truncate_folder_title(title, limit = Inventory.load["folder-length-limit"])
+    limit ||= FOLDER_LENGTH_LIMIT
+    return title if title.length <= limit
+    title[0...limit]
+  end
+
   #
   # src をERBとして読み込んでから dst に書き出す
   #
@@ -398,11 +409,11 @@ module Helper
           loop do
             block.call if block
             sleep(sleep_time)
-            if Narou::Worker.canceled?
-              Process.kill("KILL", pid)
-              Process.detach(pid)
-              break
-            end
+            next unless Narou::Worker.canceled?
+            next unless Narou::WebWorker.canceled?
+            Process.kill("KILL", pid)
+            Process.detach(pid)
+            break
           end
         end
         looper.join
@@ -411,17 +422,22 @@ module Helper
       stdout.force_encoding(Encoding::UTF_8)
       stderr.force_encoding(Encoding::UTF_8)
       return [stdout, stderr, status]
+    rescue RuntimeError => e
+      raise unless e.message.include?("interrupted")
+      process_kill(_pid)
+      raise Interrupt
     rescue Interrupt
-      if _pid
-        begin
-          Process.kill("KILL", _pid)
-          Process.detach(_pid)    # 死亡確認しないとゾンビ化する
-        rescue
-        end
-      end
+      process_kill(_pid)
       raise
     ensure
-      looper.kill if looper
+      looper&.kill
+    end
+
+    def self.process_kill(pid)
+      return unless pid
+      Process.kill("KILL", pid)
+      Process.detach(pid) # 死亡確認しないとゾンビ化する
+    rescue
     end
   end
 
@@ -516,4 +532,3 @@ module Helper
     end
   end
 end
-

data/lib/html.rb

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

data/lib/illustration.rb

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

data/lib/ini.rb

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

data/lib/input.rb

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

data/lib/inspector.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
@@ -161,7 +162,7 @@ class Inspector
       num += 1
     end
     if num > 0
-      msg = "#{num}個の行末読点を発見しました。"
+      msg = +"#{num}個の行末読点を発見しました。"
       if num >= END_TOUTEN_COUNT_THRESHOLD
         msg << "作者による手動改行により改行が多くなっています。" + \
                "setting.ini の enable_auto_join_line を true にすることをお薦めします。"

data/lib/inventory.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
@@ -14,7 +15,7 @@ require_relative "narou"
 # scope に :global を指定するとユーザーディレクトリ/.narousetting に保存される
 #
 module Inventory
-  def self.load(name, scope = :local)
+  def self.load(name = "local_setting", scope = :local)
     @@cache ||= {}
     return @@cache[name] if @@cache[name]
     {}.tap { |h|
@@ -82,4 +83,3 @@ module Inventory
     OpenStruct.new(result)
   end
 end
-

data/lib/mailer.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
@@ -20,7 +21,7 @@ class Mailer
   def self.create
     this = instance
     this.clear
-    setting_file_path = File.join(Narou.get_root_dir, SETTING_FILE)
+    setting_file_path = File.join(Narou.root_dir, SETTING_FILE)
     if File.exist?(setting_file_path)
       options = YAML.load_file(setting_file_path)
       unless options.delete(:complete)

data/lib/mixin/all.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+require_relative "output_error"
+require_relative "locker"

data/lib/mixin/locker.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+module Narou
+  module Mixin
+    module Locker
+      def locked?(target)
+        id = Downloader.get_id_by_target(target) or return false
+        Inventory.load("lock").include?(id)
+      end
+
+      def lock(target)
+        id = Downloader.get_id_by_target(target)
+        unless id
+          yield if block_given?
+          return
+        end
+        locked_list = Inventory.load("lock")
+        locked_list[id] = Time.now
+        locked_list.save
+        return unless block_given?
+        begin
+          yield
+        ensure
+          unlock(target)
+        end
+      end
+
+      def unlock(target)
+        id = Downloader.get_id_by_target(target) or return
+        locked_list = Inventory.load("lock")
+        return unless locked_list.delete(id)
+        locked_list.save
+      end
+    end
+  end
+end

data/lib/mixin/output_error.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+module Narou
+  module Mixin
+    module OutputError
+      def output_error(io, exception)
+        outputter = proc do
+          io.puts "#{$@.shift}: #{exception.message} (#{exception.class})"
+          $@.each do |b|
+            io.puts "  from #{b}"
+          end
+        end
+        # MEMO: report_on_exception は Ruby 2.4.0 から実装
+        if Thread.respond_to?(:report_on_exception) && Thread.report_on_exception
+          # report_on_exception が有効な場合は標準出力へのエラー表示はそっちに任せる。
+          # silence を使うことで、標準出力には表示されないがログには記録される
+          io.silence(&outputter)
+        else
+          outputter.call
+        end
+      end
+    end
+  end
+end

data/lib/narou.rb

@@ -1,13 +1,16 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
 
 require "fileutils"
 require "memoist"
+require "pathname"
 require "active_support/core_ext/object/blank"
 require_relative "helper"
 require_relative "inventory"
+require_relative "mixin/all"
 if Helper.engine_jruby?
   require_relative "extensions/jruby"
 end
@@ -19,7 +22,9 @@ module Narou
   AOZORAEPUB3_DIR = "AozoraEpub3"
   PRESET_DIR = "preset"
   MISC_DIR = "misc"
+  LOG_DIR = "log"
   GLOBAL_REPLACE_NAME = "replace.txt"
+  EXIT_SUCCESS = 0
   EXIT_ERROR_CODE = 127
   EXIT_INTERRUPT = 126
   EXIT_REQUEST_REBOOT = 125
@@ -31,6 +36,8 @@ module Narou
     "new_arrivals_date" => "新着日", "general_lastup" => "最新話掲載日"
   }
 
+  extend Mixin::Locker
+
  class << self
   extend Memoist
 
@@ -40,8 +47,8 @@ module Narou
     2018
   end
 
-  def get_root_dir
-    root_dir = nil
+  def root_dir
+    root = nil
     path = Dir.pwd
     drive_letter = ""
     if Helper.os_windows?
@@ -51,44 +58,47 @@ module Narou
     end
     while path != ""
       if File.directory?("#{drive_letter}#{path}/#{LOCAL_SETTING_DIR_NAME}")
-        root_dir = drive_letter + path
+        root = drive_letter + path
         break
       end
       path.gsub!(%r!/[^/]*$!, "")
     end
-    root_dir
+    Pathname(root) if root
   end
-  memoize :get_root_dir
+  memoize :root_dir
 
   def 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_NAME)
-    end
-    local_setting_dir
+    root_dir&.join(LOCAL_SETTING_DIR_NAME)
   end
   memoize :local_setting_dir
 
   def global_setting_dir
-    root_dir = get_root_dir
     if root_dir
-      dir = File.join(root_dir, GLOBAL_SETTING_DIR_NAME)
-      return dir if File.directory?(dir)
+      dir = root_dir.join(GLOBAL_SETTING_DIR_NAME)
+      return dir if dir.directory?
     end
-    dir = File.expand_path(GLOBAL_SETTING_DIR_NAME, "~")
-    FileUtils.mkdir(dir) unless File.exist?(dir)
+    dir = Pathname(GLOBAL_SETTING_DIR_NAME).expand_path("~")
+    dir.mkdir unless dir.exist?
     dir
   end
   memoize :global_setting_dir
 
-  def get_script_dir
-    File.expand_path(File.join(File.dirname(__FILE__), ".."))
+  def script_dir
+    Pathname(__dir__).join("..").expand_path
+  end
+  memoize :script_dir
+
+  def log_dir
+    root_dir&.join(LOG_DIR)
   end
-  memoize :get_script_dir
+
+  def preset_dir
+    script_dir&.join(PRESET_DIR)
+  end
+  memoize :preset_dir
 
   def already_init?
-    !!get_root_dir
+    root_dir.present?
   end
 
   def init
@@ -116,17 +126,12 @@ module Narou
     Inventory.load("freeze").include?(id)
   end
 
-  def get_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))
+    Pathname(File.expand_path(File.join(*paths, AOZORAEPUB3_JAR_NAME)))
   end
 
   def aozoraepub3_directory?(path)
-    File.exist?(create_aozoraepub3_jar_path(path))
+    create_aozoraepub3_jar_path(path).exist?
   end
 
   def parse_replace_txt(text)
@@ -148,14 +153,15 @@ module Narou
   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)
+    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
-      pairs = []
-    end
     @@global_replace_pattern_pairs = pairs
     pairs
   end
@@ -165,7 +171,7 @@ module Narou
   end
 
   def save_global_replace_pattern
-    path = File.join(get_root_dir, GLOBAL_REPLACE_NAME)
+    path = root_dir.join(GLOBAL_REPLACE_NAME)
     write_replace_txt(path, @@global_replace_pattern_pairs)
   end
 
@@ -173,26 +179,24 @@ module Narou
   # AozoraEpub3 の実行ファイル(.jar)のフルパス取得
   # 検索順序
   # 1. グローバルセッティング (global_setting aozoraepub3dir)
-  # 2. 小説保存ディレクトリ(Narou.get_root_dir) 直下の AozoraEpub3
-  # 3. スクリプト保存ディレクトリ(Narou.get_script_dir) 直下の AozoraEpub3
+  # 2. 小説保存ディレクトリ(Narou.root_dir) 直下の AozoraEpub3
+  # 3. スクリプト保存ディレクトリ(Narou.script_dir) 直下の AozoraEpub3
   #
-  def get_aozoraepub3_path
+  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 File.exist?(aozora_jar_path)
+      if aozora_jar_path.exist?
         return aozora_jar_path
       end
     end
-    [Narou.get_root_dir, Narou.get_script_dir].each do |dir|
+    [Narou.root_dir, Narou.script_dir].each do |dir|
       aozora_jar_path = create_aozoraepub3_jar_path(dir, AOZORAEPUB3_DIR)
-      if File.exist?(aozora_jar_path)
-        return aozora_jar_path
-      end
+      return aozora_jar_path if aozora_jar_path.exist?
     end
     nil
   end
-  memoize :get_aozoraepub3_path
+  memoize :aozoraepub3_path
 
   #
   # 書籍ファイル名を生成する
@@ -252,14 +256,14 @@ module Narou
     paths = [File.join(dir, "#{base}#{ext}")]
     index = 2
     while File.exist?(path = File.join(dir, "#{base}_#{index}#{ext}"))
-      paths.push(path)
+      paths.push(Pathname(path))
       index += 1
     end
     paths
   end
 
-  def get_misc_dir
-    File.join(get_root_dir, MISC_DIR)
+  def misc_dir
+    root_dir.join(MISC_DIR)
   end
 
   require_relative "device"
@@ -293,7 +297,7 @@ module Narou
   end
 
   def get_theme_dir(name = nil)
-    File.join([get_script_dir, "lib/web/public/theme", name].compact)
+    Pathname(File.join([script_dir, "lib/web/public/theme", name].compact))
   end
 
   def get_theme_names
@@ -327,14 +331,14 @@ module Narou
   end
 
   def commit_version
-    cv_path = File.expand_path("commitversion", get_script_dir)
+    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" : ""
-    File.join(File.dirname(Narou.get_aozoraepub3_path), "kindlegen#{postfix}")
+    aozoraepub3_path.dirname.join("kindlegen#{postfix}")
   end
   memoize :kindlegen_path
 
@@ -343,5 +347,19 @@ module Narou
     global_setting["line-height"] || default
   end
 
+  def concurrency_enabled?
+    $stdout != $stdout2
+  end
+  memoize :concurrency_enabled?
+
+  # 同時実行が有効ならキューに積んで、無効なら普通に実行する
+  def concurrency_call(&block)
+    if concurrency_enabled?
+      Worker.push(&block)
+      EXIT_SUCCESS
+    else
+      block.call
+    end
+  end
  end
 end