narou 2.9.5 → 3.0.0

data/lib/command/update/general_lastup_updater.rb

@@ -0,0 +1,105 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+require_relative "../../narou/api"
+
+module Command
+  class Update < CommandBase
+    class GeneralLastupUpdater
+      def initialize(options)
+        @options = options
+        @database = Database.instance
+        @narou_novels = Hash.new { |hash, key| hash[key] = [] }
+        @other_novels = []
+        prepare
+      end
+
+      def save
+        @database.save_database
+      end
+
+      def prepare
+        @database.each_key do |id|
+          next if Narou.novel_frozen?(id)
+          setting = Downloader.get_sitesetting_by_target(id)
+          if setting["narou_api_url"]
+            @narou_novels[setting["narou_api_url"]] << setting["ncode"]
+          else
+            @other_novels << id
+          end
+          setting.clear
+        end
+      end
+
+      def update_narou_novels
+        @narou_novels.each do |api_url, ncodes|
+          api = Narou::API.new(api_url: api_url, ncodes: ncodes, of: "nu-gl")
+          api.request.each do |result|
+            ncode = result["ncode"]
+            data = Downloader.get_data_by_target(ncode)
+            last_check_date = data["last_check_date"] || data["last_update"]
+            if result["novelupdated_at"] > last_check_date
+              data["novelupdated_at"] = result["novelupdated_at"]
+              data["general_lastup"] = result["general_lastup"]
+              tags = data["tags"] ||= []
+              tags << Narou::MODIFIED_TAG unless tags.include?(Narou::MODIFIED_TAG)
+            end
+            data["last_check_date"] = Time.now
+          end
+          @other_novels += api.private_novels
+        end
+      end
+
+      def update_other_novels
+        progressbar = ProgressBar.new(@other_novels.size - 1)
+        interval = Interval.new(@options["interval"])
+
+        @other_novels.each_with_index do |id, index|
+          progressbar.output(index)
+          interval.wait
+          begin
+            setting = Downloader.get_sitesetting_by_target(id)
+            info = NovelInfo.load(setting)
+            dates = if info
+                      {
+                        "novelupdated_at" => info["novelupdated_at"],
+                        "general_lastup" => info["general_lastup"]
+                      }
+                    else
+                      # 小説情報ページがない場合は目次から取得する
+                      get_latest_dates(id)
+                    end
+          rescue OpenURI::HTTPError, Errno::ECONNRESET
+            setting.clear
+            next
+          end
+          data = @database[id]
+          data.merge!(dates)
+          last_check_date = data["last_check_date"] || data["last_update"]
+          if data["novelupdated_at"] > last_check_date
+            tags = @database[id]["tags"] ||= []
+            tags << Narou::MODIFIED_TAG unless tags.include?(Narou::MODIFIED_TAG)
+          end
+          data["last_check_date"] = Time.now
+          setting.clear
+        end
+      ensure
+        progressbar.clear if progressbar
+      end
+
+      # オンラインの目次からgeneral_lastupを取得する
+      # ただし、toc.yaml に最新話が存在し、かつsubdateが設定されていたらそれを使う
+      def get_latest_dates(target)
+        downloader = Downloader.new(target)
+        old_toc = downloader.load_toc_file
+        downloader.get_latest_table_of_contents(old_toc, through_error: true)
+        {
+          "novelupdated_at" => downloader.get_novelupdated_at,
+          "general_lastup" => downloader.get_general_lastup
+        }
+      end
+    end
+  end
+end

data/lib/command/update/interval.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+module Command
+  class Update < CommandBase
+    class Interval
+      MIN = 2.5               # 作品間ウェイトの最低秒数(処理時間含む)
+      FORCE_WAIT_TIME = 2.0   # 強制待機時間
+
+      def initialize(interval)
+        @time = Time.now - MIN
+        interval = interval.to_f
+        @interval_time = interval >= MIN ? interval : MIN
+      end
+
+      def wait
+        wait_time = Time.now - @time
+        sleep(@interval_time - wait_time) if wait_time < @interval_time
+        @time = Time.now
+      end
+
+      def force_wait
+        sleep(FORCE_WAIT_TIME)
+      end
+    end
+  end
+end

data/lib/command/web.rb

@@ -92,7 +92,7 @@ module Command
         rescue Interrupt => e
           # 中断されてコンソールへの入力が可能になってから、WEBrick が終了するまで
           # タイムラグがあって表示がごちゃまぜになるので、終わるのを少し待つ
-          sleep 3
+          sleep 2
         end
       end
     end

data/lib/commandbase.rb

@@ -4,6 +4,7 @@
 #
 
 require "optparse"
+require "termcolorlight"
 require_relative "web/worker"
 
 module Command
@@ -69,27 +70,33 @@ module Command
     #
     def tagname_to_ids(array)
       database = Database.instance
-      tag_index = Hash.new { [] }
-      database.each do |id, data|
-        tags = data["tags"] || []
-        tags.each do |tag|
-          tag_index[tag] |= [id]
-        end
-      end
-      array.map! { |arg|
-        if arg =~ /^[0-9]+$/
+      tag_index = database.tag_indexies
+      all_ids = database.ids
+      expanded_array = array.map { |arg|
+        if arg =~ /\A\d+\z/
           # 優先度はID＞タグのため、数字のみ指定されたら
           # そのIDが存在した場合はIDとみなす
-          next arg if database[arg.to_i]
-        end
-        if arg =~ /^tag:(.+)$/
-          # tag:タグ名 は直接タグと指定できる形式
-          # (数字タグとIDがかぶった場合にタグを指定出来るようにするもの)
-          arg = $1
+          id = arg.to_i
+          next id if database[id]
         end
-        ids = tag_index[arg]
+        ids =
+          case arg
+          when /\Atag:(.+)\z/
+            # tag:タグ名 は直接タグと指定できる形式
+            # (数字タグとIDがかぶった場合にタグを指定出来るようにするもの)
+            arg = $1
+            tag_index[$1]
+          when /\A\^tag:(.+)\z/
+            # ^tag:タグ名 は除外タグ指定
+            arg = $1
+            indexies = tag_index[$1]
+            indexies.empty? ? [] : all_ids - indexies
+          else
+            tag_index[arg]
+          end
         ids.empty? ? arg : ids
-      }.flatten!
+      }.flatten.uniq
+      array.replace(expanded_array)
     end
 
     #

data/lib/converterbase.rb

@@ -345,7 +345,7 @@ class ConverterBase
     data.replace(NKF.nkf("-wWX", data).tr("\u2014", "―"))
   end
 
-  # ミュート（ノノカギ）化する記号定義
+  # ミニュート（ノノカギ）化する記号定義
   SINGLE_MINUTE_FAMILY = %!‘’'!
   DOUBLE_MINUTE_FAMILY = %!“”〝〟"!
 
@@ -353,11 +353,11 @@ class ConverterBase
   # 半角記号を全角に変換
   #
   def symbols_to_zenkaku(data)
+    # MEMO: シングルミニュートを表示出来るフォントはほとんど無いためダブルにする
     data.gsub!(/[#{SINGLE_MINUTE_FAMILY}]([^"\n]+?)[#{SINGLE_MINUTE_FAMILY}]/, "〝\\1〟")
-    # MEMO: シングルミュートを表示出来るフォントはほとんど無いためダブルにする
     data.gsub!(/[#{DOUBLE_MINUTE_FAMILY}]([^"\n]+?)[#{DOUBLE_MINUTE_FAMILY}]/, "〝\\1〟")
     data.tr!("-=+/*《》'\"%$#&!?<>＜＞()|‐,._;:\[\]{}",
-             "－＝＋／＊≪≫’〝％＄＃＆！？〈〉〈〉（）｜－，．＿；：［］")
+             "－＝＋／＊≪≫’〝％＄＃＆！？〈〉〈〉（）｜－，．＿；：［］｛｝")
     data.gsub!("\\", "￥")
     data
   end
@@ -484,6 +484,7 @@ class ConverterBase
     # たまに見かける誤字対策
     data.gsub!(/。　/, "。")
     data.gsub!(/([？！])。/, "\\1")
+    data.gsub!(/([？！])、/, "\\1")
   end
 
   #
@@ -1416,6 +1417,10 @@ class ConverterBase
 
   def double_dash_to_image(text, output_text_dir)
     return text unless @setting.enable_double_dash_to_image
+    # サブタイトルの中の場合は無視する
+    # （サブタイトルは文字を大きくしているので、画像の位置がずれてしまうため）
+    return text if @text_type == "subtitle"
+
     begin
       # AozoraEpub3 は相対パスじゃないとエラーになるので相対パスに変換
       dash_paths = dash_image_relative_paths(Narou.get_preset_dir, output_text_dir)
@@ -1425,7 +1430,7 @@ class ConverterBase
         # 違う場合、相対パスを計算できなくなる。そのための対処として、.narou ディレクトリ
         # に画像データをコピーし、同一ドライブ内で相対パスを取れるようにする
         copy_dash_images_to_local_setting_dir
-        dash_paths = dash_image_relative_paths(Narou.get_local_setting_dir, output_text_dir)
+        dash_paths = dash_image_relative_paths(Narou.local_setting_dir, output_text_dir)
       else
         raise
       end
@@ -1449,7 +1454,7 @@ class ConverterBase
 
   def copy_dash_images_to_local_setting_dir
     DASH_FILES.each do |name|
-      path = File.join(Narou.get_local_setting_dir, name)
+      path = File.join(Narou.local_setting_dir, name)
       unless File.exist?(path)
         FileUtils.copy(File.join(Narou.get_preset_dir, name), path)
       end

data/lib/database.rb

@@ -15,10 +15,6 @@ class Database
   ARCHIVE_ROOT_DIR_PATH = "小説データ/"
   DATABASE_NAME = "database"
 
-  if Narou.already_init?
-    @@archive_root_path = File.expand_path(File.join(Narou.get_root_dir, ARCHIVE_ROOT_DIR_PATH))
-  end
-
   def [](key)
     @database[key]
   end
@@ -69,7 +65,7 @@ class Database
   # 小説格納用のルートディレクトリを取得
   #
   def self.archive_root_path
-    @@archive_root_path
+    @archive_root_path ||= File.expand_path(File.join(Narou.get_root_dir, ARCHIVE_ROOT_DIR_PATH))
   end
 
   def save_database
@@ -80,6 +76,10 @@ class Database
     @database
   end
 
+  def ids
+    @database.keys
+  end
+
   def novel_exists?(id)
     return nil if id.nil?
     @database.keys.include?(id.to_i)
@@ -114,4 +114,15 @@ class Database
       values
     end
   end
+
+  def tag_indexies
+    result = Hash.new { [] }
+    @database.each do |id, data|
+      tags = data["tags"] || []
+      tags.each do |tag|
+        result[tag.to_s] |= [id]
+      end
+    end
+    result
+  end
 end

data/lib/device.rb

@@ -104,7 +104,11 @@ class Device
   end
 
   def ejectable?
-    Device.support_eject? && connecting?
+    if Device.respond_to?(:ejectable?)
+      Device.ejectable?(@device_module::VOLUME_NAME)
+    else
+      Device.support_eject? && connecting?
+    end
   end
 
   def find_documents_directory(device_root_dir)

data/lib/device/library/linux.rb

@@ -2,17 +2,77 @@
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
+# rubocop:disable Lint/AssignmentInCondition
 
-module Device::Library
-  module Linux
-    def get_device_root_dir(volume_name)
-      %w(/media /mnt).each do |mount_root|
-        path = File.join(mount_root, volume_name)
-        if File.directory?(path)
-          return path
+require "etc"
+
+class Device
+  module Library
+    module Linux
+      username = Etc.getpwuid(Process.euid).name
+      @@mount_roots = %w(/media /mnt)
+      @@mount_roots << "/run/media/" + username # udisks2 による自動マウント(デフォルトの場所)
+      @@mount_roots << "/media/" + username # udisks2 による自動マウント(Ubuntuの場合)
+
+      # :reek:UtilityFunction
+      def get_device_root_dir(volume_name)
+        @@mount_roots.each do |mount_root|
+          path = File.join(mount_root, volume_name)
+          if File.directory?(path)
+            return path
+          end
+        end
+        nil
+      end
+
+      # 端末のデバイスファイル名と uhelper オプションの値を取得
+      def device_mount_info(volume_name)
+        device_root = get_device_root_dir(volume_name)
+        raise Device::CantEject, "端末が接続されていません" unless device_root
+
+        pattern = %r!^(/dev/[^ ]+) .* #{device_root} .*\Wuhelper=(\w+)!
+        open("|mount") do |io|
+          while line = io.gets
+            if line =~ pattern
+              return [$1, $2]
+            end
+          end
+        end
+        [nil, nil]
+      end
+
+      def ejectable?(volume_name)
+        case device_mount_info(volume_name)[1]
+        when "udisks", "udisks2"
+          true
+        else
+          false
+        end
+      rescue Device::CantEject
+        false
+      end
+
+      def eject(volume_name)
+        device, uhelper = device_mount_info(volume_name)
+
+        case uhelper
+        when "udisks"
+          commands = ["udisks --unmount #{device}",
+                      "udisks --detach #{device.chop}"]
+        when "udisks2"
+          commands = ["udisksctl unmount -b #{device} --no-user-interaction",
+                      "udisksctl power-off -b #{device.chop} --no-user-interaction"]
+        else
+          raise Device::CantEject, "udisks または udisks2 によって自動マウントされたデバイスではありません。"
+        end
+
+        commands.each do |command|
+          status, _stdout, stderr = systemu(command)
+          unless status.success?
+            raise Device::CantEject, "#{command}: #{stderr.strip}"
+          end
         end
       end
-      nil
     end
   end
 end

data/lib/downloader.rb

@@ -13,7 +13,6 @@ require_relative "template"
 require_relative "database"
 require_relative "inventory"
 require_relative "eventable"
-require_relative "narou/api"
 require_relative "html"
 require_relative "input"
 
@@ -214,10 +213,17 @@ class Downloader
   #
   # 小説サイトの定義ファイルを全部読み込む
   #
+  # スクリプト同梱の設定ファイルを読み込んだあと、ユーザの小説の管理ディレクトリ内にある
+  # webnovel ディレクトリからも定義ファイルを読み込む
+  #
   def self.load_settings
     settings = @@__settings_cache ||= []
     return settings unless settings.empty?
-    Dir.glob(File.join(Narou.get_script_dir, NOVEL_SITE_SETTING_DIR, "*.yaml")) do |path|
+    load_paths = [
+      File.join(Narou.get_script_dir, NOVEL_SITE_SETTING_DIR, "*.yaml"),
+      File.join(Narou.get_root_dir, NOVEL_SITE_SETTING_DIR, "*.yaml")
+    ].join("\0")
+    Dir.glob(load_paths) do |path|
       setting = SiteSetting.load_file(path)
       if setting["name"] == "小説家になろう"
         @@narou = setting
@@ -261,7 +267,8 @@ class Downloader
   # サブディレクトリ名を生成
   #
   def self.create_subdirecotry_name(title)
-    title.start_with?("n") ? title[1..2] : title[0..1]
+    name = title.start_with?("n") ? title[1..2] : title[0..1]
+    name.strip
   end
 
   if Narou.already_init?
@@ -364,6 +371,7 @@ class Downloader
   def run_download
     old_toc = @new_novel ? nil : load_toc_file
     latest_toc = get_latest_table_of_contents(old_toc)
+    latest_toc_subtitles = latest_toc["subtitles"]
     unless latest_toc
       @stream.error @setting["toc_url"] + " の目次データが取得出来ませんでした"
       return :failed
@@ -381,12 +389,12 @@ class Downloader
     end
     init_raw_dir
     if old_toc.empty? || @force
-      update_subtitles = latest_toc["subtitles"]
+      update_subtitles = latest_toc_subtitles
     else
-      update_subtitles = update_body_check(old_toc["subtitles"], latest_toc["subtitles"])
+      update_subtitles = update_body_check(old_toc["subtitles"], latest_toc_subtitles)
     end
 
-    if old_toc.empty? && update_subtitles.count == 0
+    if old_toc.empty? && update_subtitles.size.zero?
       @stream.error "#{@setting['title']} の目次がありません"
       return :failed
     end
@@ -414,7 +422,7 @@ class Downloader
         end
         update_database
         :ok
-      when old_toc["subtitles"].size > latest_toc["subtitles"].size
+      when old_toc["subtitles"].size > latest_toc_subtitles.size
         # 削除された節がある（かつ更新がない）場合
         @stream.puts "#{id_and_title} は一部の話が削除されています"
         :ok
@@ -430,6 +438,9 @@ class Downloader
       else
         :none
       end
+
+    @@database[@id]["general_all_no"] = latest_toc_subtitles.size
+
     save_novel_data(TOC_FILE_NAME, latest_toc)
     tags = @new_novel ? [] : @@database[@id]["tags"] || []
     if novel_end?
@@ -628,11 +639,7 @@ class Downloader
   end
 
   def get_novel_status
-    novel_status = if false # @setting["narou_api_url"]
-                     Narou::API.new(@setting, "nt-e")
-                   else
-                     NovelInfo.load(@setting)
-                   end
+    novel_status = NovelInfo.load(@setting, of: "nt-e")
     unless novel_status
       novel_status = {
         "novel_type" => NOVEL_TYPE_SERIES,
@@ -687,7 +694,7 @@ class Downloader
   #
   def get_title
     return @title if @title
-    @title = @setting["title"]
+    @title = @setting["title"] || @@database[@id]["title"]
     if @setting["title_strip_pattern"]
       @title = @title.gsub(/#{@setting["title_strip_pattern"]}/, "").gsub(/^[　\s]*(.+?)[　\s]*?$/, "\\1")
     end
@@ -736,7 +743,7 @@ class Downloader
           @setting = s
           toc_url = @setting["toc_url"]
         end
-        toc_source = Helper.restor_entity(Helper.pretreatment_source(toc_fp.read, @setting["encoding"]))
+        toc_source = Helper.restore_entity(Helper.pretreatment_source(toc_fp.read, @setting["encoding"]))
         raise DownloaderNotFoundError if Downloader.detect_error_message(@setting, toc_source)
       end
     rescue DownloaderForceRedirect
@@ -757,13 +764,7 @@ class Downloader
     toc_source = get_toc_source
     return nil unless toc_source
     @setting.multi_match(toc_source, "tcode")
-    #if @setting["narou_api_url"]
-    if false
-      # なろうAPIの出力がおかしいので直るまで使用中止
-      info = Narou::API.new(@setting, "t-s-gf-gl-nu-w")
-    else
-      info = NovelInfo.load(@setting, toc_source)
-    end
+    info = NovelInfo.load(@setting, toc_source: toc_source)
     if info
       raise DownloaderNotFoundError unless info["title"]
       @setting["title"] = info["title"]
@@ -1089,7 +1090,7 @@ class Downloader
     end
     raw = download_raw_data(subtitle_url)
     if @setting["is_narou"]
-      raw = Helper.restor_entity(raw)
+      raw = Helper.restore_entity(raw)
       save_raw_data(raw, subtitle_info)
       element = extract_elements_in_section(raw, subtitle_info["subtitle"])
       element["data_type"] = "text"
@@ -1136,7 +1137,7 @@ narou s download.wait-steps=5
     cookie = @setting["cookie"] || ""
     begin
       open_uri_options = make_open_uri_options("Cookie" => cookie, allow_redirections: :safe)
-      open(url, open_uri_options) do |fp|
+      open(url, "r:#{@setting["encoding"]}", open_uri_options) do |fp|
         raw = Helper.pretreatment_source(fp.read, @setting["encoding"])
       end
     rescue OpenURI::HTTPError => e