narou 2.9.5 → 3.0.0

data/lib/extension.rb

@@ -18,8 +18,21 @@ end
 require "securerandom"
 
 def File.write(path, string, *options)
-  dirname = File.dirname(path)
-  temp_path = File.join(dirname, SecureRandom.hex(15))
+  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
+
   super(temp_path, string, *options)
-  File.rename(temp_path, path)
+
+  if backup
+    super(path, string, *options)
+  else
+    File.rename(temp_path, path)
+  end
 end

data/lib/helper.rb

@@ -99,6 +99,12 @@ module Helper
 
   def replace_filename_special_chars(str, invalid_replace = false)
     result = str.tr("/:*?\"<>|.", "／：＊？”〈〉｜．").gsub("\\", "￥").gsub("\t", "").gsub("\n", "")
+    if Inventory.load("local_setting")["normalize-filename"]
+      begin
+        result.unicode_normalize!
+      rescue Encoding::CompatibilityError
+      end
+    end
     if invalid_replace
       org_encoding = result.encoding
       result = result.encode(Encoding::Windows_31J, invalid: :replace, undef: :replace, replace: "_")
@@ -111,16 +117,24 @@ module Helper
   # ダウンロードした文字列をエンコード及び不正な文字列除去、改行コード統一
   #
   def pretreatment_source(src, encoding = Encoding::UTF_8)
+    encoding_class = Encoding.find(encoding)
     src.force_encoding(encoding)
+       .tap do |this|
+         if encoding_class != Encoding::UTF_8
+           this.encode!(Encoding::UTF_8, invalid: :replace, undef: :replace)
+         end
+       end
        .scrub("?")
        .gsub("\r", "")
+       .gsub(/&#x([0-9a-f]+);/i) { [$1.hex].pack("U") }
+       .gsub(/&#(\d+);/) { [$1.to_i].pack("U") }
   end
 
   ENTITIES = { quot: '"', amp: "&", nbsp: " ", lt: "<", gt: ">", copy: "(c)", "#39" => "'" }
   #
   # エンティティ復号
   #
-  def restor_entity(str)
+  def restore_entity(str)
     result = str.dup
     ENTITIES.each do |key, value|
       result.gsub!("&#{key};", value)
@@ -251,8 +265,9 @@ module Helper
   #
   # from: ファイルパスをまとめた Array
   # dest_dir: コピー先のディレクトリ
+  # check_timestamp: タイムスタンプを比較して新しければコピーする
   #
-  def copy_files(from, dest_dir)
+  def copy_files(from, dest_dir, check_timestamp: true)
     from.each do |path|
       basename = File.basename(path)
       dirname = File.basename(File.dirname(path))
@@ -260,7 +275,13 @@ module Helper
       unless File.directory?(save_dir)
         FileUtils.mkdir_p(save_dir)
       end
-      FileUtils.copy(path, File.join(save_dir, basename))
+      dest = File.join(save_dir, basename)
+      if check_timestamp && File.exist?(dest)
+        src_mtime = File.mtime(path)
+        dest_mtime = File.mtime(dest)
+        next if dest_mtime >= src_mtime
+      end
+      FileUtils.copy(path, dest)
     end
   end
 
@@ -269,6 +290,8 @@ module Helper
   #
   def date_string_to_time(date)
     date ? Time.parse(date.sub(/[\(（].+?[\)）]/, "").tr("年月日時分秒@;", "///::: :")) : nil
+  rescue ArgumentError
+    nil
   end
 
   #

data/lib/html.rb

@@ -49,7 +49,7 @@ class HTML
     @string = img_to_aozora
     @string = em_to_sesame
     @string = delete_tag
-    @string = Helper.restor_entity(@string)
+    @string = Helper.restore_entity(@string)
     @string
   end
 

data/lib/inspector.rb

@@ -58,6 +58,15 @@ class Inspector
     @info
   end
 
+  def display_summary(target = $stdout)
+    target.print "小説状態の調査結果を #{Inspector::INSPECT_LOG_NAME} に出力しました（"
+    target.print KLASS_TAG.values.map { |klass_type|
+      num = @messages.count { |msg| msg =~ /^\[#{klass_type}\]/ }
+      "#{klass_type}：#{num}件"
+    }.join("、")
+    target.puts "）"
+  end
+
   def display(klass = ALL, target = $stdout)
     target.puts @messages.map { |msg|
       if msg =~ /^\[(.+)\]/

data/lib/inventory.rb

@@ -30,20 +30,27 @@ module Inventory
   def init(name, scope)
     dir = case scope
           when :local
-            Narou.get_local_setting_dir
+            Narou.local_setting_dir
           when :global
-            Narou.get_global_setting_dir
+            Narou.global_setting_dir
           else
             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|
+    return unless File.exist?(@inventory_file_path)
+    self.merge!(Helper::CacheLoader.memo(@inventory_file_path) { |yaml|
+      begin
         YAML.load(yaml)
-      })
-    end
+      rescue Psych::SyntaxError
+        unless restore(@inventory_file_path)
+          error "#{@inventory_file_path} が壊れてるっぽい"
+          raise
+        end
+        YAML.load_file(@inventory_file_path)
+      end
+    })
   end
 
   def save
@@ -54,5 +61,12 @@ module Inventory
       File.write(@inventory_file_path, YAML.dump(self))
     end
   end
+
+  def restore(path)
+    backup_path = "#{path}.backup"
+    return nil unless File.exist?(backup_path)
+    FileUtils.copy(backup_path, path)
+    true
+  end
 end
 

data/lib/logger.rb

@@ -83,7 +83,12 @@ module Narou::LoggerModule
     $stdout.capturing = false
     buffer = $stdout.string
     $stdout = temp_stream
-    options[:ansicolor_strip] ? strip_color(buffer) : buffer
+    result = options[:ansicolor_strip] ? strip_color(buffer) : buffer
+    if $stdout.capturing && !options[:quiet]
+      # 多段キャプチャ中かつ quite: false の場合は外側にも伝播する
+      $stdout.string << result
+    end
+    result
   end
 
   def strip_color(str)
@@ -151,8 +156,9 @@ class Narou::LoggerError < StringIO
   end
 end
 
-def warn(str)
+def warn(str, trace = nil)
   $stdout.warn str
+  $stdout.warn trace if trace
 end
 
 def error(str)

data/lib/mailer.rb

@@ -56,7 +56,8 @@ class Mailer
     params[:charset] = "UTF-8"
     params[:text_part_charset] = "UTF-8"
     if attached_file_path
-      params[:attachments] = { File.basename(attached_file_path) => File.binread(attached_file_path) }
+      basename = File.basename(attached_file_path).tr("@", "＠")
+      params[:attachments] = { basename => File.binread(attached_file_path) }
     end
     begin
       Pony.mail(params)

data/lib/narou.rb

@@ -12,8 +12,8 @@ if Helper.engine_jruby?
 end
 
 module Narou
-  LOCAL_SETTING_DIR = ".narou"
-  GLOBAL_SETTING_DIR = ".narousetting"
+  LOCAL_SETTING_DIR_NAME = ".narou"
+  GLOBAL_SETTING_DIR_NAME = ".narousetting"
   AOZORAEPUB3_JAR_NAME = "AozoraEpub3.jar"
   AOZORAEPUB3_DIR = "AozoraEpub3"
   PRESET_DIR = "preset"
@@ -22,6 +22,7 @@ module Narou
   EXIT_ERROR_CODE = 127
   EXIT_INTERRUPT = 126
   EXIT_REQUEST_REBOOT = 125
+  MODIFIED_TAG = "modified"
 
   UPDATE_SORT_KEYS = {
     "id" => "ID", "last_update" => "更新日", "title" => "タイトル", "author" => "作者名",
@@ -33,6 +34,10 @@ module Narou
 
   @@is_web = false
 
+  def last_commit_year
+    2016
+  end
+
   def get_root_dir
     root_dir = nil
     path = Dir.pwd
@@ -43,7 +48,7 @@ module Narou
       drive_letter = $&
     end
     while path != ""
-      if File.directory?("#{drive_letter}#{path}/#{LOCAL_SETTING_DIR}")
+      if File.directory?("#{drive_letter}#{path}/#{LOCAL_SETTING_DIR_NAME}")
         root_dir = drive_letter + path
         break
       end
@@ -53,24 +58,27 @@ module Narou
   end
   memoize :get_root_dir
 
-  def get_local_setting_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)
+      local_setting_dir = File.join(root_dir, LOCAL_SETTING_DIR_NAME)
     end
     local_setting_dir
   end
-  memoize :get_local_setting_dir
+  memoize :local_setting_dir
 
-  def get_global_setting_dir
-    global_setting_dir = File.expand_path(File.join("~", GLOBAL_SETTING_DIR))
-    unless File.exist?(global_setting_dir)
-      FileUtils.mkdir(global_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)
     end
-    global_setting_dir
+    dir = File.expand_path(GLOBAL_SETTING_DIR_NAME, "~")
+    FileUtils.mkdir(dir) unless File.exist?(dir)
+    dir
   end
-  memoize :get_global_setting_dir
+  memoize :global_setting_dir
 
   def get_script_dir
     File.expand_path(File.join(File.dirname(__FILE__), ".."))
@@ -83,8 +91,8 @@ module Narou
 
   def init
     return nil if already_init?
-    FileUtils.mkdir(LOCAL_SETTING_DIR)
-    puts LOCAL_SETTING_DIR + "/ を作成しました"
+    FileUtils.mkdir(LOCAL_SETTING_DIR_NAME)
+    puts "#{LOCAL_SETTING_DIR}/ を作成しました"
     Database.init
   end
 
@@ -245,10 +253,12 @@ module Narou
     @@is_web
   end
 
-  def update_sort_key_summaries(width = 27)
-    ({"KEY" => "対象"}.merge(UPDATE_SORT_KEYS)).map { |(key, summary)|
-      "#{key.rjust(width)} : #{summary}"
-    }.join("\n")
+  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

data/lib/narou/api.rb

@@ -4,7 +4,10 @@
 #
 
 require "open-uri"
+require "zlib"
 require "yaml"
+require "json"
+require "memoist"
 require_relative "../novelinfo"
 
 module Narou
@@ -12,50 +15,78 @@ module Narou
   # 小説家になろうデベロッパーAPI操作クラス
   #
   class API
+    extend Memoist
+
+    # 一度に問い合わせする件数
+    BATCH_LIMIT = 300
+
+    # なろうAPIの結果の圧縮レベル(1〜5)
+    GZIP_LEVEL = 5
+
+    # リクエスト間ウェイト(sec)
+    REQUEST_INTERVAL = 3
+
     #
     # なろうデベロッパーAPIから情報を取得
     #
-    # setting: なろうの SiteSetting
+    # api_url: なろうAPIのエンドポイントを指定。通常小説用と18禁小説用と分かれているため
+    # ncodes: 取得したい小説のNコードを指定。文字列か配列を指定可能
     # of: 出力パラメータ（http://dev.syosetu.com/man/api/#of_parm 参照）
     #
-    def initialize(setting, of)
-      @setting = setting
-      @api_url = @setting["narou_api_url"]
-      @ncode = @setting["ncode"]
-      request_api(of)
+    def initialize(api_url:, ncodes:, of:)
+      @api_url = api_url
+      @ncodes = Array(ncodes).map(&:downcase)
+      @of = "n-#{of}"
+      @splited_of = @of.split("-")
     end
 
     def [](key)
       @api_result[key]
     end
 
-    def request_api(of, gzip = 5)
-      # Ruby 2.0 以上だと gzip 自動デコード
-      gzip_opt = RUBY_VERSION >= "2.0.0" ? "gzip=#{gzip}&" : ""
-      url = "#{@api_url}?#{gzip_opt}ncode=#{@ncode}&of=#{of}"
+    def request
+      @stores = []
+      @ncodes.each_slice(BATCH_LIMIT).with_index do |ncodes, index|
+        sleep REQUEST_INTERVAL unless index.zero?
+        request_api(ncodes)
+      end
+      @stores
+    end
+
+    def request_api(ncodes, limit = BATCH_LIMIT)
+      url = "#{@api_url}?gzip=#{GZIP_LEVEL}&ncode=#{ncodes.join("-")}&of=#{@of}&lim=#{limit}&out=json"
       open(url) do |fp|
-        result = YAML.load(fp.read.force_encoding(Encoding::UTF_8))
-        if result[0]["allcount"] == 1
-          @api_result = result[1]
-          if of.length > 0
-            @api_result["novel_type"] = @api_result["noveltype"]
-            # なろうAPIが返すデータが数値の場合があるため強制変換
-            @api_result["writer"] = @api_result["writer"].to_s
-            stat_end = @api_result["end"]
-            if stat_end
-              @api_result["end"] = stat_end == 0
-            end
-          end
-        else
-          # なろうAPIからデータを取得出来なかった
-          # 開示設定が検索から除外に設定されるとAPIからはアクセスできなくなる
-          result = NovelInfo.load(@setting)
-          unless result
-            error "小説家になろうからデータを取得出来ませんでした"
-            exit Narou::EXIT_ERROR_CODE
-          end
-          @api_result = result
+        data = Zlib::GzipReader.wrap(fp).read.force_encoding(Encoding::UTF_8)
+        results = JSON.parse(data)
+        return if results[0]["allcount"].zero?
+        store_results(results.drop(1))
+      end
+    end
+
+    def store_results(results)
+      @stores += results.map do |result|
+        result["ncode"].downcase!
+        result["novel_type"] = result["noveltype"] if has_of?("nt")
+        result["writer"] = result["writer"].to_s if has_of?("w")
+        %w(general_firstup general_lastup novelupdated_at).each do |key|
+          result[key] &&= Time.parse(result[key])
         end
+        stat_end = result["end"]
+        if stat_end
+          result["end"] = stat_end.zero?
+        end
+        result
+      end
+    end
+
+    def has_of?(type)
+      @splited_of.include?(type)
+    end
+    memoize :has_of?
+
+    def private_novels
+      (@ncodes - @stores.map { |st| st["ncode"] }).map do |ncode|
+        Downloader.get_data_by_target(ncode)["id"]
       end
     end
   end

data/lib/novelconverter.rb

@@ -451,6 +451,7 @@ class NovelConverter
   # $t タイトル自身。書式の中で自由な位置にタイトルを埋め込める
   # $ns 小説が掲載されているサイト名
   # $nt 小説種別（短編 or 連載）
+  # $ntag 小説のタグをカンマ区切りにしたもの
   #
   # ※ $t を使用した場合、title_date_align を無視する
   #
@@ -462,6 +463,7 @@ class NovelConverter
       special_format_chars = [
         ["$s", calc_reverse_short_time(new_arrivals_date)],
         ["$ns", @data["sitename"]],
+        ["$ntag", tags_join_comma(@data)],
         ["$nt", Narou.novel_type_text(@data["novel_type"])],
         ["$t", title]
       ]
@@ -487,6 +489,11 @@ class NovelConverter
     result
   end
 
+  def tags_join_comma(data)
+    tags = data["tags"] || []
+    tags.sort.join(",")
+  end
+
   def decorate_title(title)
     processed_title = add_date_to_title(title)
     # タイトルに完結したかどうかを付加する
@@ -678,7 +685,7 @@ class NovelConverter
 
     if !@display_inspector
       unless @inspector.empty?
-        puts "小説状態の調査結果を #{Inspector::INSPECT_LOG_NAME} に出力しました"
+        @inspector.display_summary
       end
     else
       # 小説の監視・検査状況を表示する