narou 3.2.5.1 → 3.3.0

data/lib/web/public/theme/Cerulean/style.css

@@ -25,10 +25,11 @@
   }
 }
 
-#queue-text {
+.queue {
   color: #fff !important;
 }
-#queue {
+
+.queue__sizes {
   color: #2FA4E7 !important;
   background-color: #fff !important;
 }
@@ -38,12 +39,11 @@
   font-weight: bold;
 }
 
-#queue-text.active {
+.queue.active {
   color: #d9534f !important;
 }
 
-#queue-text.active #queue {
+.queue.active .queue__sizes {
   color: white !important;
   background-color: #d9534f !important;
 }
-

data/lib/web/public/theme/Darkly/style.css

@@ -29,10 +29,11 @@ body {
   }
 }
 
-#queue-text {
+.queue {
   color: #fff !important;
 }
-#queue {
+
+.queue__sizes {
   color: #375a7f !important;
   background-color: #fff !important;
 }
@@ -42,12 +43,11 @@ body {
   font-weight: bold;
 }
 
-#queue-text.active {
+.queue.active {
   color: #d9534f !important;
 }
 
-#queue-text.active #queue {
+.queue.active .queue__sizes {
   color: white !important;
   background-color: #d9534f !important;
 }
-

data/lib/web/public/theme/Readable/style.css

@@ -29,10 +29,11 @@ body {
   }
 }
 
-#queue-text {
+.queue {
   color: #4582ec !important;
 }
-#queue {
+
+.queue__sizes {
   color: #fff !important;
   background-color: #4582ec !important;
 }
@@ -42,12 +43,11 @@ body {
   font-weight: bold;
 }
 
-#queue-text.active {
+.queue.active {
   color: #d9534f !important;
 }
 
-#queue-text.active #queue {
+.queue.active .queue__sizes {
   color: white !important;
   background-color: #d9534f !important;
 }
-

data/lib/web/public/theme/Slate/style.css

@@ -30,11 +30,10 @@
   font-weight: bold;
 }
 
-#queue-text.active {
+.queue.active {
   color: #d9534f !important;
 }
 
-#queue-text.active #queue {
+.queue.active .queue__sizes {
   background-color: #d9534f !important;
 }
-

data/lib/web/public/theme/Superhero/style.css

@@ -30,11 +30,10 @@
   font-weight: bold;
 }
 
-#queue-text.active {
+.queue.active {
   color: #d9534f !important;
 }
 
-#queue-text.active #queue {
+.queue.active .queue__sizes {
   background-color: #d9534f !important;
 }
-

data/lib/web/public/theme/United/style.css

@@ -24,10 +24,11 @@
   }
 }
 
-#queue-text {
+.queue {
   color: #fff !important;
 }
-#queue {
+
+.queue__sizes {
   color: #DD4814 !important;
   background-color: #fff !important;
 }
@@ -37,11 +38,10 @@
   font-weight: bold;
 }
 
-#queue-text.active {
+.queue.active {
   color: yellow !important;
 }
 
-#queue-text.active #queue {
+.queue.active .queue__sizes {
   background-color: yellow !important;
 }
-

data/lib/web/pushserver.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
@@ -13,7 +14,7 @@ module Narou
     include Singleton
     include Eventable
 
-    HISTORY_SAVED_COUNT = 30   # 保存する履歴の数
+    HISTORY_SAVED_COUNT = 60 # 保存する履歴の数
 
     attr_accessor :port, :host
     attr_reader :accepted_domains, :connections
@@ -59,7 +60,10 @@ module Narou
                   trigger(name, value, ws)
                 end
               rescue JSON::ParserError => e
-                ws.send(JSON.generate(echo: e.message))
+                ws.send(JSON.generate(echo: {
+                  target_console: "#console",
+                  body: e.message
+                }))
               end
             end
           rescue Errno::ECONNRESET => e
@@ -107,16 +111,15 @@ module Narou
     end
 
     def stack_to_history(message)
-      if message == "." && @history[-1] =~ /\A\.+\z/
+      return if message[:no_history]
+      if message[:body] == "." && (last = @history[-1])[:body] =~ /\A\.+\z/
         # 進行中を表す .... の出力でヒストリーが消費されるのを防ぐため、
         # 連続した . は一つにまとめる
-        @history[-1] << "."
+        last[:body] = "#{last[:body]}."
       else
         @history.push(message)
         @history.shift
       end
     end
-
   end
 end
-

data/lib/web/server_helpers.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
@@ -132,4 +133,18 @@ module Narou::ServerHelpers
       haml(template_file_name, options)
     end
   end
+
+  def embed_concurrency_enabled
+    <<~HTML
+      <input type="hidden" id="concurrency-enabled" value="#{Narou.concurrency_enabled?}">
+    HTML
+  end
+
+  def concurrency_push(&block)
+    if Narou.concurrency_enabled?
+      yield
+    else
+      Narou::WebWorker.push(&block)
+    end
+  end
 end

data/lib/web/settingmessages.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
@@ -9,7 +10,7 @@ module Narou
   SETTING_VARIABLES_WEBUI_MESSAGES = {
     "convert.multi-device" => "複数の端末用に同時に変換する。deviceよりも優先される。\nただのEPUBを出力したい場合はepubを指定",
     "device" => "変換、送信対象の端末",
-    "difftool" => "Diffで使うツールのパスを指定する\n※WEB UIでは使われません",
+    "difftool" => "%%ORIG%%。※WEB UIでは使われません",
     "update.sort-by" => "アップデートを指定した項目順で行う",
     "default.title_date_align" => "enable_add_date_to_title で付与する日付の位置",
     "force.title_date_align" => "enable_add_date_to_title で付与する日付の位置",
@@ -17,13 +18,15 @@ module Narou
                       "特殊な変数\n" \
                       "<b>%NEW</b> : 最新データの差分用ファイルパス\n" \
                       "<b>%OLD</b> : 古い方の差分用ファイルパス",
-    "no-color" => "コンソールのカラー表示を無効にする\n※要WEB UIサーバ再起動",
+    "no-color" => "コンソールのカラー表示を無効にする\n※要サーバ再起動",
     "economy" => "容量節約に関する設定",
     "send.without-freeze" => "一括送信時に凍結された小説は対象外にする。（個別送信時は凍結済みでも送信可能）",
-    "server-digest-auth.enable" => "WEBサーバでDigest認証を使用するかどうか\n" \
-                                   "※digest-auth関連の設定を変更した場合WEB UIサーバの再起動が必要",
-    "server-digest-auth.hashed-password" => "WEBサーバのDigest認証のパスワードを、Realmを\"narou.rb\"としてハッシュにしたもの。\n" \
+    "server-digest-auth.enable" => "%%ORIG%%\n※digest-auth関連の設定を変更した場合サーバの再起動が必要",
+    "server-digest-auth.hashed-password" => "サーバのDigest認証のパスワードを、Realmを\"narou.rb\"としてハッシュにしたもの。\n" \
                                             "https://tgws.plus/app/digest/ などで生成できる",
+    "concurrency" => "%%ORIG%% ※要サーバ再起動",
+    "logging" => "%%ORIG%%\n※要サーバ再起動",
+    "logging.format-filename" => "%%ORIG%%\n※要サーバ再起動",
+    "logging.format-timestamp" => "%%ORIG%%\n※要サーバ再起動",
   }
 end
-

data/lib/web/streaminginput.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #

data/lib/web/streaminglogger.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
@@ -22,47 +23,59 @@ end
 #
 # $stdout を介した出力は echo イベントとして全てのクライアントへ送信される
 #
-class Narou::StreamingLogger < StringIO
-  include Narou::LoggerModule
+module Narou
+  class StreamingLogger < StringIO
+    include Narou::LoggerModule
 
-  attr_reader :push_server
+    attr_reader :push_server, :target_console
 
-  def initialize(push_server = nil)
-    super()
-    @push_server = push_server
-  end
+    def initialize(push_server, original_stream = $stdout, target_console: "stdout")
+      super()
+      @push_server = push_server
+      @target_console = target_console
+      self.log_postfix = original_stream.log_postfix
+      original_stream.string.clear
+    end
 
-  def tty?
-    false
-  end
+    def tty?
+      false
+    end
 
-  def copy_instance
-    self.class.new(@push_server).tap do |obj|
-      obj.silent = silent
+    def copy_instance
+      self.class.new(@push_server).tap do |obj|
+        obj.silent = silent?
+      end
     end
-  end
 
-  def strip_color(str)
-    if $disable_color
-      str
-    else
-      str.gsub(%r!</?span.*?>!, "")
+    def strip_color(str)
+      if $disable_color
+        str
+      else
+        str.gsub(%r!</?span.*?>!, "")
+      end
     end
-  end
 
-  def push_streaming(str)
-    unless @is_silent
-      @push_server.send_all(echo: str) if @push_server
+    def push_streaming(str, no_history: false)
+      return if silent?
+      @push_server&.send_all(echo: build_echo(str, no_history))
     end
-  end
 
-  def write(str)
-    str = str.to_s
-    if str.encoding == Encoding::ASCII_8BIT
-      str.force_encoding(Encoding::UTF_8)
+    def build_echo(str, no_history)
+      {
+        target_console: target_console,
+        body: str,
+        no_history: no_history
+      }
+    end
+
+    def write(str)
+      str = str.to_s
+      if str.encoding == Encoding::ASCII_8BIT
+        str.force_encoding(Encoding::UTF_8)
+      end
+      super(str)
+      push_streaming(str)
+      append_log(str)
     end
-    super(str)
-    push_streaming(str)
   end
 end
-

data/lib/web/views/_about.haml

@@ -153,12 +153,15 @@
 
   }();
 
-%div.link-to-changelog-in-about
+.link-to-changelog-in-about
+  %a.btn.btn-default.btn-sm{ href: "https://jbbs.shitaraba.net/computer/44668/", target: "_blank" }
+    掲示板
+    %span.glyphicon.glyphicon-new-window
   %a.btn.btn-default.btn-sm(href="https://github.com/whiteleaf7/narou/blob/master/ChangeLog.md" target="_blank")
     更新履歴
     %span.glyphicon.glyphicon-new-window
 
-%div(style="text-align:center")
+.text-center
   %h1
     %strong Narou.rb
   %div
@@ -167,7 +170,7 @@
     Copyright © 2013-#{Narou.last_commit_year} whiteleaf. All rights reserved.
   #result-of-version-checking(style="margin-top:10px")
     .checking
-      %span.rotate-progress
+      %p.rotate-progress
         %span.icon
         %span.text アップデートを確認しています...
     .version-is-latest

data/lib/web/views/_header.haml

@@ -22,6 +22,5 @@
       - if enable_save_settings
         .navbar-form.navbar-left
           %input.btn.btn-info(type="submit" value="設定を保存" style="margin-left: 50px")
-      %p#queue-text.navbar-text.navbar-right(data-toggle="tooltip" title="キューに積まれた処理の数" data-placement="bottom")
-        %span.glyphicon.glyphicon-inbox
-        %span#queue 0
+          %button#btn-reboot.btn.btn-default サーバを再起動
+      = partial :queue

data/lib/web/views/_move_to_top.haml

@@ -0,0 +1,2 @@
+.move-to-top{ "data-move-to": "top" }
+  %i.glyphicon.glyphicon-arrow-up.icon

data/lib/web/views/_queue.haml

@@ -0,0 +1,7 @@
+%p.queue.navbar-text.navbar-right(data-toggle="tooltip" title="キューに積まれた処理の数" data-placement="bottom")
+  %span.glyphicon.glyphicon-inbox
+  %span.queue__sizes
+    %span.queue__size.queue__size--default> 0
+    - if Narou.concurrency_enabled?
+      %span.queue__size.queue__size--divider
+      %span.queue__size.queue__size--convert> 0

data/lib/web/views/bookmarklet/insert_button.js.erb

@@ -2,7 +2,7 @@
 var insertButtonBookmarklet = (function() {
   "DLボタン設置ブックマークレット v2.0";
   var site_settings = [
-    <%- SiteSetting.settings.each.with_index do |s, i| -%>
+    <%- SiteSetting.settings.each_value.with_index do |s, i| -%>
       <% setting = s.clone %>
       {
         <%- case setting["domain"] -%>

data/lib/web/views/index.haml

@@ -180,9 +180,7 @@
                 %span
                   %span.glyphicon.glyphicon-off
                   サーバをシャットダウン
-      %p#queue-text.navbar-text.navbar-right(data-toggle="tooltip" title="キューに積まれた処理の数")
-        %span.glyphicon.glyphicon-inbox
-        %span#queue 0
+      = partial :queue
       .navbar-form.navbar-right(role="search")
         .form-group
           .input-group
@@ -207,13 +205,23 @@
 
   -# コンソール
   #console-container
-    #console.console
-    #console-buttons.console-buttons
-      %span.queue-cancel.glyphicon.glyphicon-remove-circle(data-toggle="tooltip" title="処理を中断")
-      %span.console-trash.glyphicon.glyphicon-trash(data-toggle="tooltip" title="ログと履歴を削除")
-      %span.console-expand
-        %span.glyphicon.glyphicon-resize-full(data-toggle="tooltip" title="拡大")
-        %span.glyphicon.glyphicon-resize-small.hide(data-toggle="tooltip" title="縮小")
+    - console_stdout = capture_haml do
+      #console.console
+      #console-buttons.console-buttons
+        %span.queue-cancel.glyphicon.glyphicon-remove-circle(data-toggle="tooltip" title="処理を中断")
+        %span.console-history.glyphicon.glyphicon-cloud-download(data-toggle="tooltip" title="全ての履歴を取得")
+        %span.console-trash.glyphicon.glyphicon-trash(data-toggle="tooltip" title="表示と履歴を削除")
+        %span.console-expand
+          %span.glyphicon.glyphicon-resize-full(data-toggle="tooltip" title="拡大")
+          %span.glyphicon.glyphicon-resize-small.hide(data-toggle="tooltip" title="縮小")
+    - if Narou.concurrency_enabled?
+      .row
+        .col-xs-7.console-col-left
+          = console_stdout
+        .col-xs-5.console-col-right
+          #console-stdout2.console
+    - else
+      = console_stdout
 
   -# 操作パネル
   #control-panel
@@ -250,13 +258,22 @@
           %span.glyphicon.glyphicon-refresh
       .btn-group
         %button.button-send.btn.btn-warning(type="button" data-toggle="tooltip") Send
-        - if Inventory.load("local_setting")["hotentry"]
+        :ruby
+          menus = []
+          if Inventory.load["hotentry"]
+            menus << ["button-send-hotentry", "hotentry を送信"]
+          end
+          if Inventory.load["device"] == "kindle"
+            menus << ["button-send-backup-bookmark", "端末の栞データをバックアップ"]
+          end
+        - unless menus.empty?
           %button.btn.btn-warning.dropdown-toggle(type="button" data-toggle="dropdown")
             %span.caret
             %span.sr-only Toggle Dropdown
           %ul.dropdown-menu(role="menu")
-            %li
-              %a.button-send-hotentry(href="#") hotentry を送信
+            - menus.each do |klass, label|
+              %li
+                %a{ href: "#", class: klass }= label
       .btn-group
         %button.btn.btn-info.dropdown-toggle.enable-selected(type="button" data-toggle="dropdown")
           Freeze
@@ -318,20 +335,6 @@
   %li#rect-select-menu-cancel
     %a(href="#") キャンセル
 
--# 個別表示用コンソール
-#console-dialog.modal.fade(tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true")
-  .modal-dialog
-    .modal-content
-      .modal-header
-        %button(type="button" class="close" data-dismiss="modal")
-          %span(aria-hidden="true") &times;
-          %span.sr-only Close
-        %h4.modal-title サブコンソール
-      .modal-body
-        #each-console.console
-      .modal-footer
-        %button.btn.btn-primary(type="button" data-dismiss="modal") 閉じる
-
 %ul#select-color-menu.dropdown-menu(role="menu")
   %li
     %a#select-color-menu-green(href="#")