narou 2.5.2 → 2.6.0

data/lib/helper.rb

@@ -109,7 +109,8 @@ module Helper
   # ダウンロードしてきたデータを使いやすいように処理
   #
   def pretreatment_source(src, encoding = Encoding::UTF_8)
-    restor_entity(src.force_encoding(encoding)).gsub("\r", "")
+    src.force_encoding(encoding).gsub("\r", "")
+       .encode("UTF-16BE", encoding, :invalid => :replace, :undef => :replace, :replace => "?").encode("UTF-8")
   end
 
   ENTITIES = { quot: '"', amp: "&", nbsp: " ", lt: "<", gt: ">", copy: "(c)", "#39" => "'" }
@@ -117,7 +118,7 @@ module Helper
   # エンティティ復号
   #
   def restor_entity(str)
-    result = str.encode("UTF-16BE", "UTF-8", :invalid => :replace, :undef => :replace, :replace => "?").encode("UTF-8")
+    result = str.dup
     ENTITIES.each do |key, value|
       result.gsub!("&#{key};", value)
     end

data/lib/html.rb

@@ -3,6 +3,8 @@
 # Copyright 2013 whiteleaf. All rights reserved.
 #
 
+require_relative "helper"
+
 class HTML
   attr_accessor :string
 
@@ -36,6 +38,7 @@ class HTML
     @string = s_to_aozora
     @string = img_to_aozora
     @string = delete_tag
+    @string = Helper.restor_entity(@string)
     @string
   end
 

data/lib/logger.rb

@@ -107,18 +107,30 @@ module Narou::LoggerModule
       end
     end
   end
+
+  def write_base(str, stream)
+    str = str.to_s
+    if str.encoding == Encoding::ASCII_8BIT
+      str.force_encoding(Encoding::UTF_8)
+    end
+    write_console(str, stream)
+  end
+
+  def warn(str)
+    self.puts str
+  end
+
+  def error(str)
+    self.puts "<bold><red>[ERROR]</red></bold> ".termcolor + str
+  end
 end
 
 class Narou::Logger < StringIO
   include Narou::LoggerModule
   
   def write(str)
-    str = str.to_s
-    if str.encoding == Encoding::ASCII_8BIT
-      str.force_encoding(Encoding::UTF_8)
-    end
+    write_base(str, STDOUT)
     super(str)
-    write_console(str, STDOUT)
   end
 
   def tty?
@@ -130,12 +142,8 @@ class Narou::LoggerError < StringIO
   include Narou::LoggerModule
 
   def write(str)
-    str = str.to_s
-    if str.encoding == Encoding::ASCII_8BIT
-      str.force_encoding(Encoding::UTF_8)
-    end
+    write_base(str, STDERR)
     super(str)
-    write_console(str, STDERR)
   end
 
   def tty?
@@ -144,11 +152,11 @@ class Narou::LoggerError < StringIO
 end
 
 def warn(str)
-  puts str
+  $stdout.warn str
 end
 
 def error(str)
-  puts "<bold><red>[ERROR]</red></bold> ".termcolor + str
+  $stdout.error str
 end
 
 $stdout = Narou::Logger.new

data/lib/narou.rb

@@ -221,5 +221,21 @@ module Narou
       "#{key.rjust(width)} : #{summary}"
     }.join("\n")
   end
+
+  def get_theme
+    Inventory.load("local_setting", :local)["theme"]
+  end
+
+  def get_theme_dir(name = nil)
+    File.join([get_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
  end
 end

data/lib/novelconverter.rb

@@ -15,8 +15,11 @@ require_relative "progressbar"
 require_relative "helper"
 require_relative "inventory"
 require_relative "html"
+require_relative "eventable"
 
 class NovelConverter
+  include Narou::Eventable
+
   NOVEL_TEXT_TEMPLATE_NAME = "novel.txt"
   NOVEL_TEXT_TEMPLATE_NAME_FOR_IBUNKO = "ibunko_novel.txt"
 
@@ -208,7 +211,7 @@ class NovelConverter
   # EPUBファイルをkindlegenでMOBIへ
   # AozoraEpub3.jar と同じ場所に kindlegen が無ければ何もしない
   #
-  # 返り値：正常終了 :success、エラー終了 :error、中断終了 :abort、kindlegenがなかった nil
+  # 返り値：正常終了 :success、エラー終了 :error、中断終了 :abort
   #
   def self.epub_to_mobi(epub_path, verbose = false)
     kindlegen_path = File.join(File.dirname(Narou.get_aozoraepub3_path), "kindlegen")
@@ -256,6 +259,60 @@ class NovelConverter
     :success
   end
 
+  #
+  # 変換された整形済みテキストファイルをデバイスに対応した書籍データに変換する
+  #
+  def self.convert_txt_to_ebook_file(txt_path, options)
+    options = {
+      use_dakuten_font: false,
+      dst_dir: nil,
+      device: nil,
+      verbose: false,
+      no_epub: false,
+      no_mobi: false,
+      no_strip: false
+    }.merge(options)
+
+    device = options[:device]
+
+    return false if options[:no_epub]
+    # epub
+    status = NovelConverter.txt_to_epub(txt_path, options[:use_dakuten_font],
+                                        options[:dst_dir], device, options[:verbose])
+    return nil if status != :success
+    if device && device.kobo?
+      epub_ext = device.ebook_file_ext
+    else
+      epub_ext = ".epub"
+    end
+    epub_path = txt_path.sub(/.txt$/, epub_ext)
+
+    if !device || !device.kindle? || options[:no_mobi]
+      puts File.basename(epub_path) + " を出力しました"
+      puts "<bold><green>EPUBファイルを出力しました</green></bold>".termcolor
+      return epub_path
+    end
+
+    # mobi
+    status = NovelConverter.epub_to_mobi(epub_path, options[:verbose])
+    return nil if status != :success
+    mobi_path = epub_path.sub(/\.epub$/, device.ebook_file_ext)
+
+    # strip
+    unless options[:no_strip]
+      puts "kindlestrip実行中"
+      begin
+        SectionStripper.strip(mobi_path, nil, false)
+      rescue StripException => e
+        error "#{e.message}"
+      end
+    end
+    puts File.basename(mobi_path).encode(Encoding::UTF_8) + " を出力しました"
+    puts "<bold><green>MOBIファイルを出力しました</green></bold>".termcolor
+
+    return mobi_path
+  end
+
   def initialize(setting, output_filename = nil, display_inspector = false)
     @setting = setting
     @novel_id = setting.id
@@ -266,24 +323,73 @@ class NovelConverter
     @illustration = Illustration.new(@setting, @inspector)
     @display_inspector = display_inspector
     @use_dakuten_font = false
+    @converter = create_converter
   end
 
-  def load_novel_section(subtitle_info)
+  #
+  # 変換処理メインループ
+  #
+  def convert_main(text = nil)
+    display_header
+    initialize_event
+
+    if text
+      converted_text = convert_main_for_text(text)
+    else
+      converted_text = convert_main_for_novel
+      update_latest_convert_novel
+    end
+
+    inspect_novel(converted_text)
+
+    output_path = create_output_path(text, converted_text)
+    File.write(output_path, converted_text)
+
+    display_footer
+
+    output_path
+  end
+
+  def initialize_event
+    progressbar = nil
+
+    one(:"convert_main.init") do |subtitles|
+      progressbar = ProgressBar.new(subtitles.size)
+    end
+    on(:"convert_main.loop") do |i|
+      progressbar.output(i)
+    end
+    one(:"convert_main.finish") do
+      progressbar.clear
+    end
+  end
+
+  def display_header
+    print "ID:#{@novel_id}　" if @novel_id
+    puts "#{@novel_title} の変換を開始"
+  end
+
+  def display_footer
+    puts "縦書用の変換が終了しました"
+  end
+
+  def load_novel_section(subtitle_info, section_save_dir)
     file_subtitle = subtitle_info["file_subtitle"] || subtitle_info["subtitle"]   # 互換性維持のため
-    path = File.join(@section_save_dir, "#{subtitle_info["index"]} #{file_subtitle}.yaml")
+    path = File.join(section_save_dir, "#{subtitle_info["index"]} #{file_subtitle}.yaml")
     YAML.load_file(path)
   end
 
-  def create_novel_text_by_template(sections)
-    toc = @toc
-    cover_chuki = @cover_chuki
+  # is_hotentry を有効にすると、テンプレートで作成するテキストファイルに
+  # あらすじ、作品タイトル、本の読み終わり表示が付与されなくなる
+  def create_novel_text_by_template(sections, toc, is_hotentry = false)
+    cover_chuki = create_cover_chuki
     device = Narou.get_device
     setting = @setting
     processed_title = toc["title"]
     data = Database.instance.get_data("id", @novel_id)
     # タイトルに新着更新日を付加する
     if @setting.enable_add_date_to_title
-      new_arrivals_date = data["new_arrivals_date"] || data["last_update"]
+      new_arrivals_date = data[@setting.title_date_target] || Time.now
       date_str = new_arrivals_date.strftime(@setting.title_date_format)
       if @setting.title_date_align == "left"
         processed_title = date_str + processed_title
@@ -300,7 +406,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, 1.0)
+    Template.get(tempalte_name, binding, 1.1)
   end
 
   #
@@ -329,84 +435,111 @@ class NovelConverter
     end
   end
 
-  def find_site_setting
-    @@site_settings.find { |s| s.multi_match(@toc["toc_url"], "url") }
+  #
+  # 目次情報からサイト設定を取得
+  #
+  def find_site_setting(toc_url)
+    @@site_settings.find { |s| s.multi_match(toc_url, "url") }
   end
 
   #
-  # 変換処理メイン
+  # 各小説用の converter.rb 変換オブジェクトを生成
   #
-  def convert_main(text = nil)
-    print "ID:#{@novel_id}　" if @novel_id
-    puts "#{@novel_title} の変換を開始"
-    sections = []
-    @cover_chuki = create_cover_chuki
-
-    conv = load_converter(@novel_title, @setting.archive_path).new(@setting, @inspector, @illustration)
-    if text
-      result = conv.convert(text, "textfile")
-      unless @setting.enable_enchant_midashi
-        @inspector.info "テキストファイルの処理を実行しましたが、改行直後の見出し付与は有効になっていません。" +
-                        "setting.ini の enable_enchant_midashi を true にすることをお薦めします。"
-      end
-      splited = result.split("\n", 3)
-      result = [splited[0], splited[1], @cover_chuki, splited[2]].join("\n")   # 表紙の挿絵注記を3行目に挟み込む
-    else
-      @section_save_dir = Downloader.get_novel_section_save_dir(@setting.archive_path)
-      @toc = Downloader.get_toc_data(@setting.archive_path)
-      @toc["story"] = conv.convert(@toc["story"], "story")
-      html = HTML.new
-      site_setting = find_site_setting
-      html.set_illust_setting({current_url: site_setting["illust_current_url"],
-                               grep_pattern: site_setting["illust_grep_pattern"]})
-      progressbar = ProgressBar.new(@toc["subtitles"].size)
-      @toc["subtitles"].each_with_index do |subinfo, i|
-        progressbar.output(i)
-        section = load_novel_section(subinfo)
-        if section["chapter"].length > 0
-          section["chapter"] = conv.convert(section["chapter"], "chapter")
-        end
-        @inspector.subtitle = section["subtitle"]
-        element = section["element"]
-        data_type = element.delete("data_type") || "text"
-        element.each do |text_type, elm_text|
-          if data_type == "html"
-            html.string = elm_text
-            elm_text = html.to_aozora
-          end
-          element[text_type] = conv.convert(elm_text, text_type)
-        end
-        section["subtitle"] = conv.convert(section["subtitle"], "subtitle")
-        sections << section
-      end
-      progressbar.clear
-      result = create_novel_text_by_template(sections)
-    end
-
-    @use_dakuten_font = conv.use_dakuten_font
-
-    inspect_novel(result)
+  def create_converter
+    load_converter(@novel_title, @setting.archive_path).new(@setting, @inspector, @illustration)
+  end
 
+  #
+  # 最終的に出力するパスを生成
+  #
+  def create_output_path(is_text_file_mode, converted_text)
+    output_path = ""
     if @output_filename
-      save_path = File.join(@setting.archive_path, File.basename(@output_filename))
+      output_path = File.join(@setting.archive_path, File.basename(@output_filename))
     else
-      if text
-        info = get_title_and_author_by_text(result)
+      if is_text_file_mode
+        info = get_title_and_author_by_text(converted_text)
       else
         info = { "author" => @novel_author, "title" => @novel_title }
       end
-      save_filename = Narou.create_novel_filename(info)
-      save_path = File.join(@setting.archive_path, save_filename)
-      if save_path !~ /\.\w+$/
-        save_path += ".txt"
+      filename = Narou.create_novel_filename(info)
+      output_path = File.join(@setting.archive_path, filename)
+      if output_path !~ /\.\w+$/
+        output_path += ".txt"
       end
     end
-    File.write(save_path, result)
-    puts "縦書用の変換が終了しました"
+    output_path
+  end
+
+  #
+  # テキストファイル変換時の実質的なメイン処理
+  #
+  def convert_main_for_text(text)
+    result = @converter.convert(text, "textfile")
+    unless @setting.enable_enchant_midashi
+      @inspector.info "テキストファイルの処理を実行しましたが、改行直後の見出し付与は有効になっていません。" +
+                      "setting.ini の enable_enchant_midashi を true にすることをお薦めします。"
+    end
+    splited = result.split("\n", 3)
+    # 表紙の挿絵注記を3行目に挟み込む
+    converted_text = [splited[0], splited[1], create_cover_chuki, splited[2]].join("\n")
 
-    update_latest_convert_novel
+    @use_dakuten_font = @converter.use_dakuten_font
 
-    save_path
+    converted_text
+  end
+
+  #
+  # 管理小説変換時の実質的なメイン処理
+  #
+  # 引数 subtitles にデータを渡した場合はそれを直接使う
+  # is_hotentry を有効にすると出力されるテキストファイルにあらすじや作品タイトル等が含まれなくなる
+  #
+  def convert_main_for_novel(subtitles = nil, is_hotentry = false)
+    toc = Downloader.get_toc_data(@setting.archive_path)
+    toc["story"] = @converter.convert(toc["story"], "story")
+    html = HTML.new
+    site_setting = find_site_setting(toc["toc_url"])
+    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)
+
+    converted_text
+  end
+
+  #
+  # subtitle info から変換処理をする
+  #
+  def subtitles_to_sections(subtitles, html)
+    sections = []
+    section_save_dir = Downloader.get_novel_section_save_dir(@setting.archive_path)
+
+    trigger(:"convert_main.init", subtitles)
+    subtitles.each_with_index do |subinfo, i|
+      trigger(:"convert_main.loop", i)
+      section = load_novel_section(subinfo, section_save_dir)
+      if section["chapter"].length > 0
+        section["chapter"] = @converter.convert(section["chapter"], "chapter")
+      end
+      @inspector.subtitle = section["subtitle"]
+      element = section["element"]
+      data_type = element.delete("data_type") || "text"
+      element.each do |text_type, elm_text|
+        if data_type == "html"
+          html.string = elm_text
+          elm_text = html.to_aozora
+        end
+        element[text_type] = @converter.convert(elm_text, text_type)
+      end
+      section["subtitle"] = @converter.convert(section["subtitle"], "subtitle")
+      sections << section
+    end
+    trigger(:"convert_main.finish")
+    @use_dakuten_font = @converter.use_dakuten_font
+    sections
   end
 
   #
@@ -418,9 +551,10 @@ class NovelConverter
   end
 
   def inspect_novel(text)
-    # 行末読点の現在状況を調査する
-    @inspector.inspect_end_touten_conditions(text)
-    @inspector.countup_return_in_brackets(text)
+    if @setting.enable_inspect
+      @inspector.inspect_end_touten_conditions(text)   # 行末読点の現在状況を調査する
+      @inspector.countup_return_in_brackets(text)      # カギ括弧内の改行状況を調査する
+    end
 
     if !@display_inspector
       unless @inspector.empty?