narou 2.6.1 → 2.7.0

data/lib/command/setting.rb

@@ -333,7 +333,7 @@ module Command
           tab: :general
         },
         "hotentry.auto-mail" => {
-          type: :boolean, help: "新着投稿作成時にメールを送る(mail設定済みの場合)",
+          type: :boolean, help: "hotentryをメールで送る(mail設定済みの場合)",
           tab: :detail
         },
         "update.strong" => {
@@ -431,8 +431,24 @@ module Command
           type: :string, help:  "--multiple指定時の区切り文字",
           tab: :detail
         },
+        "economy" => {
+          type: :multiple,
+          help: "容量節約に関する設定。カンマ区切りで設定\n" \
+                "(cleanup_temp:変換後に作業ファイルを削除 send_delete:送信後に書籍ファイルを削除 " \
+                "nosave_diff:差分ファイルを保存しない nosave_raw:rawデータを保存しない)",
+          select_keys: %w(cleanup_temp send_delete nosave_diff nosave_raw),
+          select_summaries: %w(変換後に作業ファイルを削除 送信後に書籍ファイルを削除
+                               差分ファイルを保存しない rawデータを保存しない),
+          tab: :detail
+        },
+        "guard-spoiler" => {
+          type: :boolean,
+          help: "ネタバレ防止機能。ダウンロード時の各話タイトルを伏せ字で表示する",
+          tab: :detail
+        },
         "theme" => {
           type: :select, help: "WEB UI 用テーマ選択",
+          invisible: true,
           select_keys: Narou.get_theme_names,
           select_summaries: Narou.get_theme_names,
           tab: :general

data/lib/command/tag.rb

@@ -114,15 +114,25 @@ module Command
     end
 
     def execute(argv)
+      # タグの色がすでに決まっていた場合は変更しない隠しオプション
+      no_overwrite_color = !!argv.delete("--no-overwrite-color")
       super
+      @options["no-overwrite-color"] = no_overwrite_color   # super で @options.clear されるのでここで代入
+      color_changed = change_colors
       @options["mode"] ||= :list
       if argv.empty?
         if @options["mode"] == :list
           display_taglist
           return
         end
-        error "対象の小説を指定して下さい"
-        exit Narou::EXIT_ERROR_CODE
+        if color_changed
+          puts "タグの色を変更しました"
+          display_taglist
+          return
+        else
+          error "対象の小説を指定して下さい"
+          exit Narou::EXIT_ERROR_CODE
+        end
       else
         if @options["mode"] == :list
           search_novel_by_tag(argv)
@@ -146,6 +156,17 @@ module Command
       List.execute!(["--tag", argv.join(" ")])
     end
 
+    def change_colors
+      changed = false
+      if @options["color"] && @options["tags"]
+        @options["tags"].each do |tag|
+          set_color(tag, @options["color"])
+        end
+        changed = true
+      end
+      changed
+    end
+
     def edit_tags(argv)
       database = Database.instance
       tagname_to_ids(argv)
@@ -168,11 +189,6 @@ module Command
           tags.clear
           puts "#{title} のタグをすべて外しました"
         end
-        if @options["color"] && @options["tags"]
-          @options["tags"].each do |tag|
-            set_color(tag, @options["color"])
-          end
-        end
         if tags.size > 0
           print "現在のタグは "
           print tags.map { |tagname|
@@ -187,7 +203,7 @@ module Command
     end
 
     def self.get_color(tagname)
-      tag_colors = Inventory.load("tag_colors", :local)
+      tag_colors = Inventory.load("tag_colors")
       color = tag_colors[tagname]
       return color if color
       last_color = tag_colors.values.last || COLORS.last
@@ -199,7 +215,10 @@ module Command
     end
 
     def set_color(tagname, color)
-      tag_colors = Inventory.load("tag_colors", :local)
+      tag_colors = Inventory.load("tag_colors")
+      if @options["no-overwrite-color"]
+        return if tag_colors.include?(tagname)
+      end
       tag_colors[tagname] = color
       tag_colors.save
     end

data/lib/command/update.rb

@@ -114,12 +114,12 @@ module Command
       super
       mistook_count = 0
       update_target_list = argv.dup
-      no_open = false
+      @options["no-open"] = false
       if update_target_list.empty?
         Database.instance.each_key do |id|
           update_target_list << id
         end
-        no_open = true
+        @options["no-open"] = true
       end
       tagname_to_ids(update_target_list)
 
@@ -134,7 +134,7 @@ module Command
       end
       flush_cache    # memoist のキャッシュ削除
 
-      inv = Inventory.load("local_setting", :local)
+      inv = Inventory.load("local_setting")
       @options["hotentry"] = inv["hotentry"]
       @options["hotentry.auto-mail"] = inv["hotentry.auto-mail"]
       hotentry = {}
@@ -170,31 +170,50 @@ module Command
           result = downloader.start_download
           case result.status
           when :ok
-            unless @options["no-convert"] ||
-                   (@options["convert-only-new-arrival"] && !result.new_arrivals)
-              convert_argv = [target]
-              convert_argv << "--no-open" if no_open
-              Convert.execute!(convert_argv)
+            if @options["no-convert"] ||
+                 (@options["convert-only-new-arrival"] && !result.new_arrivals)
+              next
             end
           when :failed
             puts "ID:#{data["id"]}　#{data["title"]} の更新は失敗しました"
             mistook_count += 1
+            next
           when :canceled
             puts "ID:#{data["id"]}　#{data["title"]} の更新はキャンセルされました"
             mistook_count += 1
+            next
           when :none
             puts "#{data["title"]} に更新はありません"
+            next unless data["_convert_failure"]
+          end
+
+          if data["_convert_failure"]
+            puts "<yellow>前回変換できなかったので再変換します</yellow>".termcolor
+          end
+          convert_argv = [target]
+          convert_argv << "--no-open" if @options["no-open"]
+          convert_status = Convert.execute!(convert_argv)
+          if convert_status > 0
+            # 変換が失敗したか、中断された
+            data["_convert_failure"] = true
+            # 中断された場合には残りのアップデートも中止する
+            raise Interrupt if convert_status == Narou::EXIT_INTERRUPT
+          else
+            # 変換に成功した
+            data.delete("_convert_failure")
           end
         end
-      end
 
-      process_hotentry(hotentry)
-      save_log(update_log)
+        process_hotentry(hotentry)
+      end
 
       exit mistook_count if mistook_count > 0
     rescue Interrupt
       puts "アップデートを中断しました"
-      exit Narou::EXIT_ERROR_CODE
+      exit Narou::EXIT_INTERRUPT
+    ensure
+      save_log(update_log)
+      Database.instance.save_database
     end
 
     def get_log_paths
@@ -241,6 +260,7 @@ module Command
     end
 
     def update_general_lastup(through_frozen_novel: true)
+      completed = false
       database = Database.instance
       puts "最新話掲載日を更新しています..."
       progressbar = ProgressBar.new(database.get_object.size - 1)
@@ -265,7 +285,7 @@ module Command
         else
           # 小説情報ページがない場合は目次から取得する
           begin
-            dates = get_latest_dates(setting)
+            dates = get_latest_dates(id)
           rescue OpenURI::HTTPError, Errno::ECONNRESET => e
             setting.clear
             next
@@ -275,8 +295,10 @@ module Command
         setting.clear
       end
       database.save_database
-      progressbar.clear
-      puts "更新が完了しました"
+      completed = true
+    ensure
+      progressbar.clear if progressbar
+      puts "更新が完了しました" if completed
     end
 
     # オンラインの目次からgeneral_lastupを取得する
@@ -322,23 +344,28 @@ module Command
       progressbar = ProgressBar.new(subtitles_size)
       total_progress = 0
 
-      hotentry.each do |id, subtitles|
-        setting = NovelSetting.load(id, ignore_force, ignore_default)
-        novel_converter = NovelConverter.new(setting, output_filename, display_inspector)
-        last_num = 0
-        novel_converter.on(:"convert_main.loop") do |i|
-          progressbar.output(total_progress + i)
-          last_num = i
-        end
-        converted_text_array << {
-          setting: setting,
-          text: novel_converter.convert_main_for_novel(subtitles, true)
-        }
-        use_dakuten_font |= novel_converter.use_dakuten_font
+      begin
+        hotentry.each do |id, subtitles|
+          setting = NovelSetting.load(id, ignore_force, ignore_default)
+          setting.enable_illust = false   # 挿絵はパス解決が煩雑なので強制無効
+          novel_converter = NovelConverter.new(setting, output_filename,
+                                               display_inspector, Update.hotentry_dirname)
+          last_num = 0
+          novel_converter.on(:"convert_main.loop") do |i|
+            progressbar.output(total_progress + i)
+            last_num = i
+          end
+          converted_text_array << {
+            setting: setting,
+            text: novel_converter.convert_main_for_novel(subtitles, true)
+          }
+          use_dakuten_font |= novel_converter.use_dakuten_font
 
-        total_progress += last_num + 1
+          total_progress += last_num + 1
+        end
+      ensure
+        progressbar.clear
       end
-      progressbar.clear
       puts "縦書用の変換が終了しました"
 
       device = Narou.get_device

data/lib/commandbase.rb

@@ -4,6 +4,7 @@
 #
 
 require "optparse"
+require_relative "web/worker"
 
 module Command
   class CommandBase
@@ -55,7 +56,7 @@ module Command
 
     def load_local_settings
       command_prefix = self.class.to_s.scan(/[^:]+$/)[0].downcase
-      local_settings = Inventory.load("local_setting", :local)
+      local_settings = Inventory.load("local_setting")
       local_settings.each do |name, value|
         if name =~ /^#{command_prefix}\.(.+)$/
           @options[$1] = value
@@ -126,7 +127,7 @@ module Command
     # 設定の強制設定
     #
     def force_change_settings_function(pairs)
-      settings = Inventory.load("local_setting", :local)
+      settings = Inventory.load("local_setting")
       modified = false
       pairs.each do |name, value|
         if settings[name].nil? || settings[name] != value

data/lib/commandline.rb

@@ -62,7 +62,7 @@ module CommandLine
   end
 
   def load_default_arguments(cmd)
-    default_arguments_list = Inventory.load("local_setting", :local)
+    default_arguments_list = Inventory.load("local_setting")
     (default_arguments_list["default_args.#{cmd}"] || "").split
   end
 
@@ -70,7 +70,7 @@ module CommandLine
   # 引数をスペース以外による区切り文字で展開する
   #
   def multiple_argument_extract(argv)
-    delimiter = Inventory.load("local_setting", :local)["multiple-delimiter"] || ","
+    delimiter = Inventory.load("local_setting")["multiple-delimiter"] || ","
     argv.map! { |arg|
       arg.split(delimiter)
     }.flatten!

data/lib/converterbase.rb

@@ -7,6 +7,7 @@ require "stringio"
 require "date"
 require "uri"
 require "nkf"
+require "pathname"
 require_relative "narou"
 require_relative "progressbar"
 require_relative "inspector"
@@ -17,6 +18,8 @@ class ConverterBase
   ENGLISH_SENTENCES_MIN_LENGTH = 8   # この文字数以上アルファベットが続くと半角のまま
 
   attr_reader :use_dakuten_font
+  attr_accessor :output_text_dir, :subtitles
+  attr_accessor :current_index   # 現在処理してる subtitles 内でのインデックス
 
   def before(io, text_type)
     data = io.string
@@ -37,10 +40,17 @@ class ConverterBase
     @inspector = inspector
     @illustration = illustration
     @use_dakuten_font = false
-    initialize_member_values
+    @output_text_dir = nil
+    @subtitles = nil
+    @current_index = 0
+    reset_member_values
   end
 
-  def initialize_member_values
+  #
+  # .convert が実行されるたびに呼ばれるメンバ変数リセット用メソッド
+  # インスタンス作成時に一度だけ初期化したい場合は initialize で初期化する
+  #
+  def reset_member_values
     @request_insert_blank_next_line = false
     @request_skip_output_line = false
     @before_line = ""
@@ -832,7 +842,8 @@ class ConverterBase
   #
   def auto_join_line(data)
     # 次の行の冒頭が開き記号だったら意図的な改行だと判断して連結しない
-    data.gsub!(/([^、])、\n　([^「『(（【<＜〈《≪…‥―])/, "\\1、\\2")
+    # 行頭の全角スペースが２個以上の場合も連結しない
+    data.gsub!(/([^、])、\n　([^「『(（【<＜〈《≪…‥―　])/, "\\1、\\2")
   end
 
   CHARACTER_OF_RUBY = "一-龠Ａ-Ｚａ-ｚA-Za-z"
@@ -1267,12 +1278,16 @@ class ConverterBase
 
   def convert(text, text_type)
     return "" if text == ""
+    output_text_dir = @output_text_dir || @setting.archive_path
     @text_type = text_type
     io = StringIO.new(rstrip_all_lines(text))
     (io = before_convert(io)).rewind
     (io = convert_main(io)).rewind
     (io = after_convert(io)).rewind
-    return insert_separator_for_selection(replace_by_replace_txt(io.read))
+    data = replace_by_replace_txt(io.read)
+    data = insert_separator_for_selection(data)
+    data = double_dash_to_image(data, output_text_dir)
+    return data
   end
 
   #
@@ -1297,8 +1312,9 @@ class ConverterBase
     else
       data = io.read
     end
-    initialize_member_values
+    reset_member_values
     convert_for_all_data(data)
+    progressbar = nil
     if @text_type == "textfile"
       # convert_for_all_data -> replace_narou_tag
       # で改行化を行わないと正確な改行数は分からない
@@ -1310,7 +1326,7 @@ class ConverterBase
       @write_fp.write(data)
     else
       @read_fp.each_with_index do |line, i|
-        progressbar.output(i) if @text_type == "textfile"
+        progressbar.output(i) if progressbar
         @request_skip_output_line = false
         zenkaku_rstrip(line)
         if @request_insert_blank_next_line
@@ -1367,8 +1383,11 @@ class ConverterBase
       data.replace(title_and_author + data)
     end
     data.rstrip!
-    progressbar.clear if @text_type == "textfile"
     @write_fp
+  ensure
+    if @text_type == "textfile" && progressbar
+      progressbar.clear
+    end
   end
 
   #
@@ -1382,4 +1401,48 @@ class ConverterBase
     end
     result
   end
+
+  DASH_FILES = %w(singledash.png doubledash.png)
+
+  def double_dash_to_image(text, output_text_dir)
+    return text unless @setting.enable_double_dash_to_image
+    begin
+      # AozoraEpub3 は相対パスじゃないとエラーになるので相対パスに変換
+      dash_paths = dash_image_relative_paths(Narou.get_preset_dir, output_text_dir)
+    rescue ArgumentError => e
+      if e.message =~ /^different prefix/
+        # Windowsにおいて、スクリプト本体のあるドライブと小説フォルダがあるドライブが
+        # 違う場合、相対パスを計算できなくなる。そのための対処として、.narou ディレクトリ
+        # に画像データをコピーし、同一ドライブ内で相対パスを取れるようにする
+        copy_dash_images_to_local_setting_dir
+        dash_paths = dash_image_relative_paths(Narou.get_local_setting_dir, output_text_dir)
+      else
+        raise
+      end
+    end
+    text.gsub(/―{2,}/) do |match|
+      len = match.length
+      result = "※［＃（#{dash_paths[1]}）］" * (len / 2)
+      if len.odd?
+        result += "※［＃（#{dash_paths[0]}）］"
+      end
+      result
+    end
+  end
+
+  def dash_image_relative_paths(base_dir, output_text_dir)
+    DASH_FILES.map do |name|
+      pathname = Pathname(File.join(base_dir, name))
+      pathname.relative_path_from(Pathname(output_text_dir)).to_s
+    end
+  end
+
+  def copy_dash_images_to_local_setting_dir
+    DASH_FILES.each do |name|
+      path = File.join(Narou.get_local_setting_dir, name)
+      unless File.exist?(path)
+        FileUtils.copy(File.join(Narou.get_preset_dir, name), path)
+      end
+    end
+  end
 end