narou 2.8.3.1 → 2.9.0

data/lib/narou.rb

@@ -21,6 +21,7 @@ module Narou
   GLOBAL_REPLACE_NAME = "replace.txt"
   EXIT_ERROR_CODE = 127
   EXIT_INTERRUPT = 126
+  EXIT_REQUEST_REBOOT = 125
 
   UPDATE_SORT_KEYS = {
     "id" => "ID", "last_update" => "更新日", "title" => "タイトル", "author" => "作者名",
@@ -275,5 +276,24 @@ module Narou
     type == 2 ? "短編" : "連載"
   end
 
+  #
+  # Narou.rb gem の最新バージョン番号を取得する
+  #
+  # rubygems公式APIによる取得は、WindowsでのSSL証明書問題で取得出来ない
+  # 環境があるため、gemコマンド経由で取得する
+  #
+  def latest_version
+    response = `gem search ^narou$`.split("\n")
+    if response.last =~ /\Anarou \((.+?)\)\z/
+      $1
+    end
+  end
+
+  def commit_version
+    cv_path = File.expand_path("commitversion", get_script_dir)
+    File.read(cv_path) if File.exist?(cv_path)
+  end
+  memoize :commit_version
+
  end
 end

data/lib/novelconverter.rb

@@ -23,8 +23,6 @@ class NovelConverter
   NOVEL_TEXT_TEMPLATE_NAME = "novel.txt"
   NOVEL_TEXT_TEMPLATE_NAME_FOR_IBUNKO = "ibunko_novel.txt"
 
-  attr_reader :use_dakuten_font
-
   if Narou.already_init?
     @@site_settings = Downloader.load_settings
   end
@@ -41,10 +39,7 @@ class NovelConverter
     setting = NovelSetting.load(target, options[:ignore_force], options[:ignore_default])
     if setting
       novel_converter = new(setting, options[:output_filename], options[:display_inspector])
-      return {
-        converted_txt_path: novel_converter.convert_main,
-        use_dakuten_font: novel_converter.use_dakuten_font
-      }
+      return novel_converter.convert_main
     end
     nil
   end
@@ -72,22 +67,8 @@ class NovelConverter
     if options[:encoding]
       text.force_encoding(options[:encoding]).encode!(Encoding::UTF_8)
     end
-    {
-      converted_txt_path: novel_converter.convert_main(text),
-      use_dakuten_font: novel_converter.use_dakuten_font
-    }
-  end
-
-  def self.stash_aozora_fonts_directory
-    fonts_path = File.join(File.dirname(Narou.get_aozoraepub3_path), "template/OPS/fonts")
-    return unless File.exist?(fonts_path)
-    FileUtils.mv(fonts_path, fonts_path + "_hide")
-  end
 
-  def self.visible_aozora_fonts_directory
-    fonts_path = File.join(File.dirname(Narou.get_aozoraepub3_path), "template/OPS/fonts")
-    return unless File.exist?(fonts_path + "_hide")
-    FileUtils.mv(fonts_path + "_hide", fonts_path)
+    novel_converter.convert_main(text)
   end
 
   #
@@ -100,7 +81,7 @@ class NovelConverter
   #
   # 返り値：正常終了 :success、エラー終了 :error、AozoraEpub3が見つからなかった nil
   #
-  def self.txt_to_epub(filename, use_dakuten_font = false, dst_dir = nil, device = nil, verbose = false)
+  def self.txt_to_epub(filename, dst_dir = nil, device = nil, verbose = false)
     abs_srcpath = File.expand_path(filename)
     src_dir = File.dirname(abs_srcpath)
 
@@ -149,14 +130,12 @@ class NovelConverter
     if Helper.os_windows?
       command = "cmd /c " + command.encode(Encoding::Windows_31J)
     end
-    stash_aozora_fonts_directory unless use_dakuten_font
     print "AozoraEpub3でEPUBに変換しています"
     begin
       res = Helper::AsyncCommand.exec(command) do
         print "."
       end
     ensure
-      visible_aozora_fonts_directory unless use_dakuten_font
       Dir.chdir(pwd)
     end
 
@@ -267,7 +246,6 @@ class NovelConverter
   #
   def self.convert_txt_to_ebook_file(txt_path, options)
     options = {
-      use_dakuten_font: false,
       dst_dir: nil,
       device: nil,
       verbose: false,
@@ -283,8 +261,7 @@ class NovelConverter
     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])
+    status = NovelConverter.txt_to_epub(txt_path, options[:dst_dir], device, options[:verbose])
     return nil if status != :success
     if device && device.kobo?
       epub_ext = device.ebook_file_ext
@@ -340,7 +317,6 @@ class NovelConverter
     @inspector = Inspector.new(@setting)
     @illustration = Illustration.new(@setting, @inspector)
     @display_inspector = display_inspector
-    @use_dakuten_font = false
     @converter = create_converter
     @converter.output_text_dir = output_text_dir
     @data = @novel_id ? Database.instance.get_data("id", @novel_id) : {}
@@ -415,11 +391,13 @@ class NovelConverter
   end
 
   #
-  # 2045年くらいまでの残り時間を10分単位の36進数で取得する
+  # 2035年くらいまでの残り時間を10分単位の36進数で取得する
   # hyff のような文字列が取得可能
+  # 小説家になろうで、もっとも古い作品が2004年5月1日11時49分なので、
+  # その小説がちょうど4桁の zzzz となるように調整してある
   #
   def calc_reverse_short_time(time)
-    ((2396736000 - time.to_i) / (10 * 60)).to_s(36).rjust(4, "0")
+    ((2091149000 - time.to_i) / (10 * 60)).to_s(36).rjust(4, "0")
   end
 
   #
@@ -427,7 +405,7 @@ class NovelConverter
   # 日付の種類は title_date_target で指定する
   #
   # strftime の書式の他に拡張書式として $s, $t をサポートする
-  # $s 2045年くらいまでの残り時間を10分単位の36進数（4桁）
+  # $s 2035年くらいまでの残り時間を10分単位の36進数（4桁）
   # $t タイトル自身。書式の中で自由な位置にタイトルを埋め込める
   # $ns 小説が掲載されているサイト名
   # $nt 小説種別（短編 or 連載）
@@ -562,8 +540,6 @@ class NovelConverter
     # 表紙の挿絵注記を3行目に挟み込む
     converted_text = [splited[0], splited[1], create_cover_chuki, splited[2]].join("\n")
 
-    @use_dakuten_font = @converter.use_dakuten_font
-
     converted_text
   end
 
@@ -623,8 +599,10 @@ class NovelConverter
         section["chapter"] = @converter.convert(section["chapter"], "chapter")
       end
       @inspector.subtitle = section["subtitle"]
+      section["subtitle"] = @converter.convert(section["subtitle"], "subtitle")
       element = section["element"]
       data_type = element.delete("data_type") || "text"
+      @converter.data_type = data_type
       element.each do |text_type, elm_text|
         if data_type == "html"
           html.string = elm_text
@@ -632,10 +610,8 @@ class NovelConverter
         end
         element[text_type] = @converter.convert(elm_text, text_type)
       end
-      section["subtitle"] = @converter.convert(section["subtitle"], "subtitle")
       sections << section
     end
-    @use_dakuten_font = @converter.use_dakuten_font
     sections
   ensure
     trigger(:"convert_main.finish")

data/lib/novelinfo.rb

@@ -11,36 +11,47 @@ class NovelInfo
   REFRESH_INTERVAL = 10 * 60   # キャッシュを捨てて再取得するまでの時間(s)
   @@novel_info_parameters = {}
 
-  def self.load(setting)
-    info = new(setting)
+  def self.load(setting, toc_source = nil)
+    info = new(setting, toc_source)
     info.parse_novel_info
   end
 
-  def initialize(setting)
+  def initialize(setting, toc_source = nil)
     @setting = setting
     @ncode = @setting["ncode"]
+    @toc_source = toc_source
     @@novel_info_parameters[@setting["name"]] ||= {}
   end
 
   def parse_novel_info
     info_url = @setting["novel_info_url"] or return nil
     result = @@novel_info_parameters[@setting["name"]][@ncode] ||= {}
+    need_reload = false
     unless result.empty?
       # WEB UI でプロセスが常駐している間に小説情報（タイトルやあらすじ等）が
       # 変更される場合があるので、一定時間過ぎたら再取得をする必要がある
       if Time.now < result["last_load_time"] + REFRESH_INTERVAL
         return result   # まだ一定時間過ぎていないのでキャッシュを返す
       end
+      need_reload = true
     end
     of = "t-nt-ga-s-gf-nu-gl-w"
     request_output_parameters = of.split("-")
     info_source = ""
-    cookie = @setting["cookie"] || ""
-    open_uri_options = make_open_uri_options("Cookie" => cookie, allow_redirections: :safe)
-    open(info_url, open_uri_options) do |fp|
-      info_source = Helper.restor_entity(Helper.pretreatment_source(fp.read, @setting["encoding"]))
-      raise Downloader::DownloaderNotFoundError if Downloader.detect_error_message(@setting, info_source)
+
+    if @setting["novel_info_url"] == @setting["toc_url"] && @toc_source && !need_reload
+      # 目次ページのHTML（オプション）。目次と小説情報が同じページにある場合、
+      # 同じページを二度取得するのは非効率なので、使い回す
+      info_source = @toc_source
+    else
+      cookie = @setting["cookie"] || ""
+      open_uri_options = make_open_uri_options("Cookie" => cookie, allow_redirections: :safe)
+      open(info_url, open_uri_options) do |fp|
+        info_source = Helper.restor_entity(Helper.pretreatment_source(fp.read, @setting["encoding"]))
+        raise Downloader::DownloaderNotFoundError if Downloader.detect_error_message(@setting, info_source)
+      end
     end
+
     @setting.multi_match(info_source, *request_output_parameters)
     result["last_load_time"] = Time.now
     result["title"] = @setting["title"]

data/lib/novelsetting.rb

@@ -354,12 +354,6 @@ class NovelSetting
       value: 10,
       help: "ここで設定した値が `enable_convert_page_break` に反映される"
     },
-    {
-      name: "enable_dakuten_font",
-      type: :boolean,
-      value: true,
-      help: "濁点フォントを使用する。false の場合は縦中横による擬似表現を使用する"
-    },
     {
       name: "enable_display_end_of_book",
       type: :boolean,

data/lib/version.rb

@@ -3,4 +3,4 @@
 # Copyright 2013 whiteleaf. All rights reserved.
 #
 
-Version = "2.8.3.1"
+Version = "2.9.0"

data/lib/web/appserver.rb

@@ -6,10 +6,8 @@
 require "socket"
 require "sinatra/base"
 require "sinatra/json"
-if $debug
-  require "sinatra/reloader"
-  require "pry"
-end
+require "sinatra/reloader" if $development
+require "better_errors" if $debug
 require "tilt/erubis"
 require "tilt/haml"
 require "tilt/sass"
@@ -25,7 +23,7 @@ module Narou::ServerHelpers
   # タグをHTMLで装飾する
   #
   def decorate_tags(tags)
-    tags.map do |tag|
+    tags.sort.map do |tag|
       %!<span class="tag label label-#{Command::Tag.get_color(tag)}" data-tag="#{escape_html(tag)}">#{escape_html(tag)}</span>!
     end.join(" ")
   end
@@ -103,12 +101,20 @@ module Narou::ServerHelpers
       value
     end
   end
+
+  def notepad_text_path
+    File.join(Narou.get_local_setting_dir, "notepad.txt")
+  end
 end
 
 class Narou::AppServer < Sinatra::Base
-  register Sinatra::Reloader if $debug
+  register Sinatra::Reloader if $development
   helpers Narou::ServerHelpers
 
+  @@request_reboot = false
+  @@already_update_system = false
+  @@gem_update_last_log = ""
+
   configure do
     set :app_file, __FILE__
     set :erb, trim: "-"
@@ -119,13 +125,31 @@ class Narou::AppServer < Sinatra::Base
       Command::Version.create_version_string
     end
 
-    set :environment, :production unless $debug
+    set :environment, :production unless $development
+    set :server, :webrick
+
+    if $debug
+      use BetterErrors::Middleware
+      BetterErrors.application_root = Narou.get_script_dir
+    end
   end
 
   def self.push_server=(server)
     @@push_server = server
   end
 
+  def self.push_server
+    @@push_server
+  end
+
+  def self.request_reboot
+    @@request_reboot = true
+  end
+
+  def self.request_reboot?
+    @@request_reboot
+  end
+
   #
   # サーバのアドレスを生成
   #
@@ -173,6 +197,30 @@ class Narou::AppServer < Sinatra::Base
     }.call
   end
 
+  def initialize
+    super
+    puts_hello_messages
+    start_device_ejectable_event
+  end
+
+  def puts_hello_messages
+    puts "<white>Narou.rb version #{::Version}</white>".termcolor
+  end
+
+  def start_device_ejectable_event
+    return unless Device.support_eject?
+    Thread.new do
+      loop do
+        if @@push_server.connections.count > 0
+          device = Narou.get_device
+          @@push_server.send_all(:"device.ejectable" => device && device.ejectable?)
+        end
+
+        sleep 2
+      end
+    end
+  end
+
   # ===================================================================
   # ルーティング
   # ===================================================================
@@ -291,7 +339,7 @@ class Narou::AppServer < Sinatra::Base
   get "/about" do
     @narourb_version = settings.version
     @ruby_version = build_ruby_version
-    haml :about, layout: false
+    haml :_about, layout: false
   end
 
   post "/shutdown" do
@@ -299,6 +347,36 @@ class Narou::AppServer < Sinatra::Base
     "シャットダウンしました。再起動するまで操作は出来ません"
   end
 
+  post "/reboot" do
+    self.class.request_reboot
+    self.class.quit!
+    haml :_rebooting, layout: false
+  end
+
+  post "/update_system" do
+    Thread.new do
+      buffer = `gem update --no-document narou`
+      @@gem_update_last_log = buffer.strip!
+      if buffer =~ /Nothing to update\z/
+        @@push_server.send_all("server.update.nothing" => buffer)
+      elsif buffer.include?("Gems updated: narou")
+        @@already_update_system = true
+        @@push_server.send_all("server.update.success" => buffer)
+      else
+        @@push_server.send_all("server.update.failure" => buffer)
+      end
+    end
+  end
+
+  post "/gem_update_last_log" do
+    content_type "text/plain"
+    @@gem_update_last_log
+  end
+
+  post "/check_already_update_system" do
+    json({ result: @@already_update_system })
+  end
+
   before "/novels/:id/*" do
     @id = params[:id]
     not_found unless @id =~ /^\d+$/
@@ -376,12 +454,26 @@ class Narou::AppServer < Sinatra::Base
     ext = device ? device.ebook_file_ext : ".epub"
     path = Narou.get_ebook_file_path(@id, ext)
     if File.exist?(path)
-      send_file(path, filename: File.basename(path))
+      send_file(path, filename: File.basename(path), type: "application/octet-stream")
     else
       not_found
     end
   end
 
+  get "/notepad" do
+    @title = "メモ帳"
+    haml :notepad
+  end
+
+  get "/edit_menu" do
+    @title = "個別メニューの編集"
+    haml :edit_menu
+  end
+
+  not_found do
+    "not found"
+  end
+
   # -------------------------------------------------------------------------------
   # API's
   # -------------------------------------------------------------------------------
@@ -411,7 +503,7 @@ class Narou::AppServer < Sinatra::Base
             tags.include?("end") ? "完結" : nil,
             tags.include?("404") ? "削除" : nil,
           ].compact.join(", "),
-          download: %!<a href="/novels/#{id}/download" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-book"></span></a>!,
+          download: %!<a href="/novels/#{id}/download" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-download-alt"></span></a>!,
           frozen: Narou.novel_frozen?(id),
           new_arrivals_date: data["new_arrivals_date"].tap { |m| break m.to_i if m },
           general_lastup: data["general_lastup"].tap { |m| break m.to_i if m }
@@ -529,7 +621,7 @@ class Narou::AppServer < Sinatra::Base
     target = params["target"] or return ""
     id = Downloader.get_id_by_target(target) or return ""
     @list = Command::Diff.new.get_diff_list(id)
-    haml :diff_list, layout: false
+    haml :_diff_list, layout: false
   end
 
   post "/api/diff_clean" do
@@ -564,9 +656,11 @@ class Narou::AppServer < Sinatra::Base
   end
 
   get "/api/tag_list" do
-    result = '<div><span class="tag label label-default" data-tag="">タグ検索を解除</span></div>'
+    result =
+      '<div><span class="tag label label-default" data-tag="">タグ検索を解除</span></div>' \
+      '<div class="text-muted" style="font-size:10px">Altキーを押しながらで除外検索</div>'
     tagname_list = Command::Tag.get_tag_list.keys
-    tagname_list.each do |tagname|
+    tagname_list.sort.each do |tagname|
       result << "<div>#{decorate_tags([tagname])} " \
                 "<span class='select-color-button' data-target-tag='#{h tagname}'>" \
                 "<span class='#{Command::Tag.get_color(tagname)}'>a</span></span></div>"
@@ -683,11 +777,32 @@ class Narou::AppServer < Sinatra::Base
   end
 
   get "/api/version/latest.json" do
-    open("https://rubygems.org/api/v1/versions/narou/latest.json?#{Time.now.to_i}") do |fp|
-      fp.read
+    json({ version: Narou.latest_version })
+  end
+
+  get "/api/notepad/read" do
+    content_type "text/plain"
+    if File.exist?(notepad_text_path)
+      File.read(notepad_text_path)
+    else
+      ""
     end
   end
 
+  post "/api/notepad/save" do
+    File.write(notepad_text_path, params["text"])
+    @@push_server.send_all("notepad.change" => {
+      text: params["text"], object_id: params["object_id"]
+    })
+    ""
+  end
+
+  post "/api/eject" do
+    device = Narou.get_device
+    device.eject if device
+    ""
+  end
+
   # -------------------------------------------------------------------------------
   # 一部分に表示するためのHTMLを取得する(パーシャル)
   # -------------------------------------------------------------------------------
@@ -741,5 +856,9 @@ class Narou::AppServer < Sinatra::Base
   get "/widget/drag_and_drop" do
     haml :"widget/drag_and_drop", layout: nil
   end
+
+  get "/widget/notepad" do
+    haml :"widget/notepad", layout: nil
+  end
 end