narou 2.6.1 → 2.7.0

data/lib/database.rb

@@ -52,7 +52,7 @@ class Database
   end
 
   def refresh
-    @database = Inventory.load(DATABASE_NAME, :local)
+    @database = Inventory.load(DATABASE_NAME)
   end
 
   #

data/lib/device.rb

@@ -138,6 +138,9 @@ class Device
           raise SendFailure, res[1].rstrip
         end
       end
+      if Narou.economy?("send_delete")
+        FileUtils.rm_f(src_file)
+      end
       dst_path
     else
       nil

data/lib/device/ibooks.rb

@@ -60,7 +60,7 @@ module Device::Ibooks
   end
 
   def get_epubdir_path_in_ibooks_container
-    list = Inventory.load("ibooks_epubdir_path_list", :local)
+    list = Inventory.load("ibooks_epubdir_path_list")
     if list[@toc_url]
       list[@toc_url]
     else
@@ -106,7 +106,7 @@ module Device::Ibooks
   end
 
   def regist_epubdir_path_to_setting(path)
-    list = Inventory.load("ibooks_epubdir_path_list", :local)
+    list = Inventory.load("ibooks_epubdir_path_list")
     list[@toc_url] = path
     list.save
   end

data/lib/device/ibunko.rb

@@ -51,6 +51,10 @@ module Device::Ibunko
     end
     puts File.basename(zipfile_path) + " を出力しました"
     puts "<bold><green>#{@device.display_name}用ファイルを出力しました</green></bold>".termcolor
+    if Narou.economy?("cleanup_temp") && @argument_target_type == :novel
+      # 作業用ファイルを削除
+      FileUtils.rm_f(@converted_txt_path)
+    end
     zipfile_path
   end
 

data/lib/diffviewer.rb

@@ -134,8 +134,8 @@ class DiffViewer
           end
         end
       end
-      result = "<bold><red>-#{old_str}</red>\n" \
-               "<green>+#{new_str}</green></bold>"
+      result = "<bold><red>-#{old_str}</red></bold>\n" \
+               "<bold><green>+#{new_str}</green></bold>"
     when "-"
       result = "<bold><red>-#{TermColorLight.escape(old_element)}</red></bold>"
     when "+"

data/lib/downloader.rb

@@ -289,11 +289,14 @@ class Downloader
     @id = id || @@database.create_new_id
     @new_novel = @@database[@id].!
     @section_download_cache = {}
-    @download_wait_steps = Inventory.load("local_setting", :local)["download.wait-steps"] || 0
+    @download_wait_steps = Inventory.load("local_setting")["download.wait-steps"] || 0
     @download_use_subdirectory = use_subdirectory?
     if @setting["is_narou"] && (@download_wait_steps > 10 || @download_wait_steps == 0)
       @download_wait_steps = 10
     end
+    @nosave_diff = Narou.economy?("nosave_diff")
+    @nosave_raw = Narou.economy?("nosave_raw")
+    @gurad_spoiler = Inventory.load("local_setting")["guard-spoiler"]
     initialize_wait_counter
   end
 
@@ -307,7 +310,7 @@ class Downloader
       @@__wait_counter = 0
       @@__last_download_time = Time.now - 20
     end
-    @@interval_sleep_time = Inventory.load("local_setting", :local)["download.interval"] || 0
+    @@interval_sleep_time = Inventory.load("local_setting")["download.interval"] || 0
     @@interval_sleep_time = 0 if @@interval_sleep_time < 0
     @@max_steps_wait_time = [STEPS_WAIT_TIME, @@interval_sleep_time].max
   end
@@ -318,7 +321,7 @@ class Downloader
   def use_subdirectory?
     if @new_novel
       # 新規DLする小説
-      Inventory.load("local_setting", :local)["download.use-subdirectory"] || false
+      Inventory.load("local_setting")["download.use-subdirectory"] || false
     else
       # すでにDL済みの小説
       @@database[@id]["use_subdirectory"] || false
@@ -410,8 +413,7 @@ class Downloader
           end
         rescue Interrupt
           remove_cache_dir
-          @stream.puts "ダウンロードを中断しました"
-          exit Narou::EXIT_ERROR_CODE
+          raise
         end
         update_database
         :ok
@@ -437,7 +439,7 @@ class Downloader
       unless tags.include?("end")
         update_database if update_subtitles.count == 0
         $stdout.silence do
-          Command::Tag.execute!([@id, "--add", "end", "--color", "white"])
+          Command::Tag.execute!(%W(#{id} --add end --color white --no-overwrite-color))
         end
         msg = old_toc.empty? ? "完結しているようです" : "完結したようです"
         @stream.puts "<cyan>#{id_and_title.escape} は#{msg}</cyan>".termcolor
@@ -524,6 +526,7 @@ class Downloader
   # 差分用キャッシュ保存ディレクトリ作成
   #
   def create_cache_dir
+    return nil if @nosave_diff
     now = Time.now
     name = now.strftime("%Y.%m.%d@%H.%M.%S")
     cache_dir = File.join(get_novel_data_dir, SECTION_SAVE_DIR_NAME, CACHE_SAVE_DIR_NAME, name)
@@ -760,7 +763,7 @@ class Downloader
       @stream.error "小説が削除されているか非公開な可能性があります"
       if @@database.novel_exists?(@id)
         $stdout.silence do
-          Command::Tag.execute!(%W(#{@id} --add 404 --color white))
+          Command::Tag.execute!(%W(#{@id} --add 404 --color white --no-overwrite-color))
         end
         Command::Freeze.execute!([@id])
       end
@@ -786,7 +789,7 @@ class Downloader
   # 更新された subtitle だけまとまった配列を返す
   #
   def update_body_check(old_subtitles, latest_subtitles)
-    strong_update = Inventory.load("local_setting", :local)["update.strong"]
+    strong_update = Inventory.load("local_setting")["update.strong"]
     latest_subtitles.select do |latest|
       index = latest["index"]
       index_in_old_toc = __search_index_in_subtitles(old_subtitles, index)
@@ -945,7 +948,8 @@ class Downloader
       else
         @stream.print "短編　"
       end
-      @stream.print "#{subtitle} (#{i+1}/#{max})"
+      printable_subtitle = @gurad_spoiler ? Helper.to_unprintable_words(subtitle) : subtitle
+      @stream.print "#{printable_subtitle} (#{i+1}/#{max})"
 
       section_file_name = "#{index} #{file_subtitle}.yaml"
       section_file_relative_path = File.join(SECTION_SAVE_DIR_NAME, section_file_name)
@@ -992,6 +996,7 @@ class Downloader
   # 差分用のキャッシュとして保存
   #
   def move_to_cache_dir(relative_path)
+    return if @nosave_diff
     path = File.join(get_novel_data_dir, relative_path)
     if File.exist?(path) && @cache_dir
       FileUtils.mv(path, @cache_dir)
@@ -1091,6 +1096,7 @@ class Downloader
   end
 
   def init_raw_dir
+    return if @nosave_raw
     path = get_raw_dir
     FileUtils.mkdir_p(path) unless File.exist?(path)
   end
@@ -1099,6 +1105,7 @@ class Downloader
   # テキストデータの生データを保存
   #
   def save_raw_data(raw_data, subtitle_info, ext = ".txt")
+    return if @nosave_raw
     index = subtitle_info["index"]
     file_subtitle = subtitle_info["file_subtitle"]
     path = File.join(get_raw_dir, "#{index} #{file_subtitle}#{ext}")

data/lib/helper.rb

@@ -5,6 +5,7 @@
 
 require "open3"
 require "time"
+require "systemu"
 
 #
 # 雑多なお助けメソッド群
@@ -176,8 +177,10 @@ module Helper
       "整数        "
     when :float
       "小数点数    "
-    when :string, :select, :multiple
+    when :string, :select
       "文字列      "
+    when :multiple
+      "文字列(複数)"
     when :directory
       "フォルダパス"
     when :file
@@ -285,9 +288,29 @@ module Helper
     result
   end
 
+  #
+  # 伏せ字にする
+  #
+  # 数字やスペース、句読点、感嘆符はそのままにする
+  #
+  def to_unprintable_words(string, mask = "●")
+    result = ""
+    string.each_char do |char|
+      result += case char
+                when /[0-9０-９ 　、。!?！？]/
+                  char
+                else
+                  mask
+                end
+    end
+    result
+  end
+
   #
   # 外部コマンド実行中の待機ループの処理を書けるクラス
   #
+  # 返り値：[標準出力のキャプチャ, 標準エラーのキャプチャ, Process::Status]
+  #
   # response = Helper::AsyncCommand.exec("処理に時間がかかる外部コマンド") do
   #   print "*"
   # end
@@ -297,30 +320,38 @@ module Helper
   #
   class AsyncCommand
     def self.exec(command, sleep_time = 0.5, &block)
-      Thread.new {
-        loop do
-          block.call if block
-          sleep(sleep_time)
+      looper = nil
+      _pid = nil
+      status, stdout, stderr = systemu(command) do |pid|
+        _pid = pid
+        looper = Thread.new(pid) do |pid|
+          loop do
+            block.call if block
+            sleep(sleep_time)
+            if Narou::Worker.canceled?
+              Process.kill("KILL", pid)
+              Process.detach(pid)
+              break
+            end
+          end
         end
-      }.tap { |th|
+        looper.join
+        looper = nil
+      end
+      stdout.force_encoding(Encoding::UTF_8)
+      stderr.force_encoding(Encoding::UTF_8)
+      return [stdout, stderr, status]
+    rescue Interrupt
+      if _pid
         begin
-          if Helper.engine_jruby?
-            # MEMO:
-            #   Open3.capture3 - 全く動かない
-            #   `` バッククウォート - 出力が文字化けする
-            res = Open3.popen3(command) { |i, o, e|
-              i.close
-              `cd`   # create dummy Process::Status object to $?
-              [o.read, e.read, $?]
-            }
-          else
-            res = Open3.capture3(command)
-          end
-        ensure
-          th.kill
+          Process.kill("KILL", _pid)
+          Process.detach(_pid)    # 死亡確認しないとゾンビ化する
+        rescue
         end
-        return res
-      }
+      end
+      raise
+    ensure
+      looper.kill if looper
     end
   end
 

data/lib/inventory.rb

@@ -10,9 +10,10 @@ require_relative "narou"
 # Narou.rbのシステムが記録するデータ単位
 #
 # .narou ディレクトリにYAMLファイルとして保存される
+# scope に :global を指定するとユーザーディレクトリ/.narousetting に保存される
 #
 module Inventory
-  def self.load(name, scope)
+  def self.load(name, scope = :local)
     @@cache ||= {}
     return @@cache[name] if @@cache[name]
     {}.tap { |h|
@@ -36,6 +37,7 @@ module Inventory
             raise "Unknown scope"
           end
     return nil unless dir
+    @mutex = Mutex.new
     @inventory_file_path = File.join(dir, name + ".yaml")
     if File.exist?(@inventory_file_path)
       self.merge!(Helper::CacheLoader.memo(@inventory_file_path) { |yaml|
@@ -48,7 +50,9 @@ module Inventory
     unless @inventory_file_path
       raise "not initialized setting dir yet"
     end
-    File.write(@inventory_file_path, YAML.dump(self))
+    @mutex.synchronize do
+      File.write(@inventory_file_path, YAML.dump(self))
+    end
   end
 end
 

data/lib/narou.rb

@@ -18,8 +18,9 @@ module Narou
   AOZORAEPUB3_DIR = "AozoraEpub3"
   PRESET_DIR = "preset"
   MISC_DIR = "misc"
-  EXIT_ERROR_CODE = 127
   GLOBAL_REPLACE_NAME = "replace.txt"
+  EXIT_ERROR_CODE = 127
+  EXIT_INTERRUPT = 126
 
   UPDATE_SORT_KEYS = {
     "id" => "ID", "last_update" => "更新日", "title" => "タイトル", "author" => "作者名",
@@ -33,9 +34,10 @@ module Narou
 
   def get_root_dir
     root_dir = nil
-    path = File.expand_path(File.dirname("."))
+    path = Dir.pwd
     drive_letter = ""
     if Helper.os_windows?
+      path.encode!(Encoding::UTF_8)
       path.gsub!(/^[a-z]:/i, "")
       drive_letter = $&
     end
@@ -86,7 +88,7 @@ module Narou
   end
 
   def alias_to_id(target)
-    aliases = Inventory.load("alias", :local)
+    aliases = Inventory.load("alias")
     if aliases[target]
       return aliases[target]
     end
@@ -95,7 +97,7 @@ module Narou
 
   def novel_frozen?(target)
     id = Downloader.get_id_by_target(target) or return false
-    Inventory.load("freeze", :local).include?(id)
+    Inventory.load("freeze").include?(id)
   end
 
   def get_preset_dir
@@ -201,7 +203,7 @@ module Narou
   require_relative "device"
 
   def get_device(device_name = nil)
-    device_name = Inventory.load("local_setting", :local)["device"] unless device_name
+    device_name = Inventory.load("local_setting")["device"] unless device_name
     if device_name && Device.exists?(device_name)
       return Device.create(device_name)
     end
@@ -223,7 +225,7 @@ module Narou
   end
 
   def get_theme
-    Inventory.load("local_setting", :local)["theme"]
+    Inventory.load("local_setting")["theme"]
   end
 
   def get_theme_dir(name = nil)
@@ -237,5 +239,10 @@ module Narou
     end.compact
   end
   memoize :get_theme_names
+
+  def economy?(mode)
+    eco_modes = Inventory.load("local_setting")["economy"].to_s.split(",").map(&:strip)
+    eco_modes.include?(mode)
+  end
  end
 end

data/lib/novelconverter.rb

@@ -181,6 +181,10 @@ class NovelConverter
       return :error
     end
 
+    error_list = stdout_capture.scan(/^(?:\[ERROR\]|エラーが発生しました :).+$/)
+    warn_list = stdout_capture.scan(/^\[WARN\].+$/)
+    info_list = stdout_capture.scan(/^\[INFO\].+$/)
+
     if verbose
       puts
       puts "==== AozoraEpub3 stdout capture " + "=" * 47
@@ -188,12 +192,11 @@ class NovelConverter
       puts "=" * 79
     end
 
-    error_list = stdout_capture.scan(/^(?:\[ERROR\]|エラーが発生しました :).+$/)
-    warn_list = stdout_capture.scan(/^\[WARN\].+$/)
-    info_list = stdout_capture.scan(/^\[INFO\].+$/)
-    if !error_list.empty? || !warn_list.empty? || !info_list.empty?
-      puts
-      puts error_list, warn_list, info_list
+    if !error_list.empty? || !warn_list.empty?
+      unless verbose
+        puts
+        puts error_list, warn_list
+      end
       unless error_list.empty?
         # AozoraEpub3 のエラーにはEPUBが出力されないエラーとEPUBが出力されるエラーの2種類ある。
         # EPUBが出力される場合は「変換完了」という文字があるのでそれを検出する
@@ -270,12 +273,15 @@ class NovelConverter
       verbose: false,
       no_epub: false,
       no_mobi: false,
-      no_strip: false
+      no_strip: false,
+      no_cleanup_txt: false,
     }.merge(options)
 
     device = options[:device]
+    clean_up_file_list = []
 
     return false if options[:no_epub]
+    clean_up_file_list << txt_path unless options[:no_cleanup_txt]
     # epub
     status = NovelConverter.txt_to_epub(txt_path, options[:use_dakuten_font],
                                         options[:dst_dir], device, options[:verbose])
@@ -293,6 +299,7 @@ class NovelConverter
       return epub_path
     end
 
+    clean_up_file_list << epub_path
     # mobi
     status = NovelConverter.epub_to_mobi(epub_path, options[:verbose])
     return nil if status != :success
@@ -311,9 +318,20 @@ class NovelConverter
     puts "<bold><green>MOBIファイルを出力しました</green></bold>".termcolor
 
     return mobi_path
+  ensure
+    if Narou.economy?("cleanup_temp")
+      # 作業用ファイルを削除
+      clean_up_temp_files(clean_up_file_list)
+    end
+  end
+
+  def self.clean_up_temp_files(path_list)
+    path_list.each do |path|
+      FileUtils.rm_f(path)
+    end
   end
 
-  def initialize(setting, output_filename = nil, display_inspector = false)
+  def initialize(setting, output_filename = nil, display_inspector = false, output_text_dir = nil)
     @setting = setting
     @novel_id = setting.id
     @novel_author = setting.author
@@ -324,6 +342,7 @@ class NovelConverter
     @display_inspector = display_inspector
     @use_dakuten_font = false
     @converter = create_converter
+    @converter.output_text_dir = output_text_dir
   end
 
   #
@@ -357,10 +376,10 @@ class NovelConverter
       progressbar = ProgressBar.new(subtitles.size)
     end
     on(:"convert_main.loop") do |i|
-      progressbar.output(i)
+      progressbar.output(i) if progressbar
     end
     one(:"convert_main.finish") do
-      progressbar.clear
+      progressbar.clear if progressbar
     end
   end
 
@@ -497,6 +516,8 @@ class NovelConverter
   #
   def convert_main_for_novel(subtitles = nil, is_hotentry = false)
     toc = Downloader.get_toc_data(@setting.archive_path)
+    subtitles ||= toc["subtitles"]
+    @converter.subtitles = subtitles
     toc["story"] = @converter.convert(toc["story"], "story")
     html = HTML.new
     html.strip_decoration_tag = @setting.enable_strip_decoration_tag
@@ -504,7 +525,6 @@ class NovelConverter
     html.set_illust_setting({current_url: site_setting["illust_current_url"],
                              grep_pattern: site_setting["illust_grep_pattern"]})
 
-    subtitles ||= toc["subtitles"]
     sections = subtitles_to_sections(subtitles, html)
     converted_text = create_novel_text_by_template(sections, toc, is_hotentry)
 
@@ -521,6 +541,7 @@ class NovelConverter
     trigger(:"convert_main.init", subtitles)
     subtitles.each_with_index do |subinfo, i|
       trigger(:"convert_main.loop", i)
+      @converter.current_index = i
       section = load_novel_section(subinfo, section_save_dir)
       if section["chapter"].length > 0
         section["chapter"] = @converter.convert(section["chapter"], "chapter")
@@ -538,9 +559,10 @@ class NovelConverter
       section["subtitle"] = @converter.convert(section["subtitle"], "subtitle")
       sections << section
     end
-    trigger(:"convert_main.finish")
     @use_dakuten_font = @converter.use_dakuten_font
     sections
+  ensure
+    trigger(:"convert_main.finish")
   end
 
   #
@@ -585,7 +607,7 @@ class NovelConverter
   #
   def update_latest_convert_novel
     id = Downloader.get_id_by_target(@novel_title)
-    Inventory.load("latest_convert", :local).tap { |inv|
+    Inventory.load("latest_convert").tap { |inv|
       inv["id"] = id
       inv.save
     }