narou 3.2.5.1 → 3.3.0

data/lib/web/views/layout.haml

@@ -30,6 +30,7 @@
       var local_initialize_functions = [];
       var slideNavbar;
   %body
+    = embed_concurrency_enabled
     - if session[:alert]
       - message, type = session[:alert]
       - session[:alert] = nil
@@ -37,6 +38,7 @@
         .fadeout-alert.alert(class="alert-#{type}")
           &= message
     != yield
+    = partial :move_to_top
     %script{:src => "//code.jquery.com/jquery-1.11.1.min.js"}
     %script{:src => "//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"}
     %script{:src => "//cdn.datatables.net/1.10.10/js/jquery.dataTables.min.js"}

data/lib/web/views/novels/setting.haml

@@ -2,7 +2,8 @@
 :javascript
   local_initialize_functions.push(function($) {
     var stream_console = new Narou.Console({
-      restore: false, buttons: false
+      restore: false, buttons: false,
+      stream_id: Narou.concurrencyIsEnabled() ? "stdout2" : "stdout"
     });
     var action = new Narou.Action(null);
     var storage = new Narou.Storage;
@@ -66,9 +67,7 @@
           %input.btn.btn-info(type="submit" value="設定を保存" style="margin-left: 50px")
           %button#btn-convert.btn.btn-default この小説を変換
           %button#btn-folder.btn.btn-default フォルダを開く
-        %p#queue-text.navbar-text.navbar-right(data-toggle="tooltip" title="キューに積まれた処理の数" data-placement="bottom")
-          %span.glyphicon.glyphicon-inbox
-          %span#queue 0
+        = partial :queue
 
   .container.container-main.theme-showcase(role="main")
     %p.visible-xs-inline

data/lib/web/views/settings.haml

@@ -1,6 +1,10 @@
 -# このページ内専用のjavascriptでjQueryオブジェクトを参照したい場合この関数に記述
 :javascript
   local_initialize_functions.push(function($) {
+    var storage = new Narou.Storage;
+    var action = new Narou.Action(null);
+    var notification = Narou.Notification.instance();
+
     $("[data-toggle=tooltip]").tooltip({
       animation: false,
       container: "body",
@@ -11,7 +15,6 @@
       width: "100%"
     });
 
-    var storage = new Narou.Storage;
     // 直前に開いていたタブを復元
     var related_active_tab = storage.get("related_active_tab");
     if (related_active_tab) {
@@ -23,10 +26,18 @@
       storage.set("related_active_tab", active_tab);
       storage.save();
     })
+
+    notification.on("server.rebooted", function() {
+      location.href = "/";
+    });
+
+    $("#btn-reboot").on("click", function(e) {
+      e.preventDefault();
+      action.rebootDialog();
+    });
   });
 
 :ruby
-  Inventory.clear
   inventory = Inventory.load("local_setting").merge(Inventory.load("global_setting", :global))
   local_and_global_variables = @setting_variables[:local].merge(@setting_variables[:global])
   tab_info = Command::Setting.get_setting_tab_info
@@ -68,12 +79,15 @@
                   = tab_info[key]
               .list-group
                 - local_and_global_variables.each do |name, value|
-                  - next if value[:tab] != key
-                  - item = inventory[name]
-                  - need_clear = false
-                  - message = Narou::SETTING_VARIABLES_WEBUI_MESSAGES[name] || value[:help]
-                  - message = message.strip.gsub("\n", "<br>")
-                  - error_style = {class: "has-error", style: "background-color:#f2dede"}
+                  :ruby
+                    next if value[:tab] != key
+                    item = inventory[name]
+                    need_clear = false
+                    msg_for_web = Narou::SETTING_VARIABLES_WEBUI_MESSAGES[name]
+                    message = msg_for_web || value[:help]
+                    message = message.gsub("%%ORIG%%", value[:help]) if msg_for_web
+                    message = message.strip.gsub("\n", "<br>")
+                    error_style = { class: "has-error", style: "background-color: #f2dede" }
                   .list-group-item.form-group{@error_list[name] ? error_style : {}}
                     %h4.list-group-item-heading #{name}
                     .list-group-item-text

data/lib/web/views/style.scss

@@ -691,6 +691,11 @@ $console-color: white;
     margin-bottom: 7px;
   }
 }
+
+#console-stdout2 .progress {
+  width: 100%;
+}
+
 .console-buttons {
   position: absolute;
   top: 3px;
@@ -698,11 +703,19 @@ $console-color: white;
   color: $console-color;
   cursor: pointer;
 
+  text-shadow: 1px 1px 2px #000, -1px 1px 2px #000, 1px -1px 2px #000, -1px -1px 2px #000;
+
   span:hover {
     color: mix($console-color, red, 80%);
   }
 }
 
+.console-col-left,
+.console-col-right {
+  padding-left: 1px;
+  padding-right: 1px;
+}
+
 /*
  * ツールチップ
  */
@@ -723,7 +736,7 @@ $console-color: white;
     left: auto;
   }
   /* Freifox で表示が崩れる対策 */
-  ul.dropdown-menu {
+  .navbar-nav ul.dropdown-menu {
     min-width: 260px;
 
     & > li {
@@ -836,12 +849,13 @@ $console-color: white;
 /*
  * キュー
  */
-#queue-text {
+.queue {
   position: relative;
   margin-right: 0;
   cursor: default;
 }
-#queue {
+
+.queue__sizes {
   position: relative;
   font-size: 0.8em;
   vertical-align: top;
@@ -858,6 +872,26 @@ $console-color: white;
   top: -3px;
 }
 
+.queue__size {
+}
+
+.queue__size--default {
+}
+
+.queue__size--divider {
+  padding-right: 1px;
+  padding-left: 1px;
+  position: relative;
+  top: -1px;
+
+  &::before {
+    content: ':';
+  }
+}
+
+.queue__size--convert {
+}
+
 /*
  * ヘルプ画面
  */
@@ -1157,3 +1191,20 @@ $console-color: white;
 .popover {
   max-width: 50%;
 }
+
+.move-to-top {
+  position: fixed;
+  right: 6px;
+  bottom: 6px;
+  width: 40px;
+  height: 40px;
+  background-color: black;
+  border-radius: 5px;
+  font-size: 26px;
+  color: white;
+  padding-top: 4px;
+  padding-left: 6px;
+  cursor: pointer;
+  @include opacity(0.3);
+  z-index: 1040;
+}

data/lib/web/views/widget/download.haml

@@ -22,7 +22,7 @@
         margin: 0;
         padding: 0;
       }
-      #queue-text {
+      .queue {
         position: absolute;
         top: 3px;
         right: 3px;
@@ -31,10 +31,16 @@
         padding: 0;
       }
 
+    = embed_concurrency_enabled
+
     #console.console.fullscreen
-    #queue-text.navbar-text.navbar-right
+    .queue.navbar-text.navbar-right
       %span.glyphicon.glyphicon-inbox
-      %span#queue 0
+      %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
 
     %script{:src => "//code.jquery.com/jquery-1.11.1.min.js"}
     %script{:src => "//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"}

data/lib/web/views/widget/drag_and_drop.haml

@@ -36,7 +36,7 @@
         opacity: 0.17;
         filter: alpha(opacity=17);
       }
-      #queue-text {
+      .queue {
         position: absolute;
         top: 3px;
         right: 3px;
@@ -45,13 +45,20 @@
         padding: 0;
       }
 
+    = embed_concurrency_enabled
+
     #console.console.fullscreen
     #information
       このウィンドウ内にダウンロードしたい<br>
       小説のリンクをドラッグ＆ドロップ
-    #queue-text.navbar-text.navbar-right
+    .queue.navbar-text.navbar-right
       %span.glyphicon.glyphicon-inbox
-      %span#queue 0
+      %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
+
     #link-drop-here
       .inner
         .glyphicon.glyphicon-download-alt
@@ -95,4 +102,3 @@
             $("#link-drop-here").hide();
           });
       });
-

data/lib/web/web_worker.rb

@@ -0,0 +1,132 @@
+# frozen_string_literal: true
+
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+require "singleton"
+require_relative "pushserver"
+require_relative "../mixin/all"
+
+module Narou
+  class WebWorker
+    include Singleton
+    include Mixin::OutputError
+
+    attr_reader :size
+
+    def self.run
+      instance.start
+    end
+
+    def initialize
+      @queue = Queue.new
+      @size = 0
+      @mutex = Mutex.new
+      @worker_thread = nil
+      @push_server = Narou::PushServer.instance
+      @cancel_signal = false
+      @thread_of_block_executing = nil
+    end
+
+    def running?
+      !@worker_thread.!
+    end
+
+    def start
+      return if running?
+      @worker_thread = Thread.new do
+        loop do
+          begin
+            q = @queue.pop
+            if canceled?
+              @queue.clear
+              @cancel_signal = false
+            else
+              @thread_of_block_executing = Thread.new do
+                q[:block].call
+              end
+              @thread_of_block_executing.join
+              @thread_of_block_executing = nil
+            end
+          rescue SystemExit
+          rescue Exception => e
+            # WebWorkerスレッド内での例外は表示するだけしてスレッドは生かしたままにする
+            output_error($stdout, e)
+          ensure
+            if q && q[:counting]
+              countdown
+            end
+          end
+        end
+      end
+    end
+
+    def self.cancel
+      instance.cancel
+    end
+
+    def cancel
+      @mutex.synchronize do
+        if @size > 0
+          @cancel_signal = true
+          @size = 0
+          @thread_of_block_executing&.raise(Interrupt)
+        end
+      end
+      Thread.pass
+    end
+
+    def self.canceled?
+      instance.canceled?
+    end
+
+    def canceled?
+      @cancel_signal
+    end
+
+    def self.stop
+      instance.stop
+    end
+
+    def stop
+      @worker_thread&.kill
+      @worker_thread = nil
+    end
+
+    #
+    # システム用のワーカー追加。内部カウントは増やさない
+    #
+    def self.push_as_system_worker(&block)
+      instance.push(false, &block)
+    end
+
+    def self.push(&block)
+      instance.push(&block)
+    end
+
+    def push(counting = true, &block)
+      countup if counting
+      @queue.push(block: block, counting: counting)
+    end
+
+    def notification_queue
+      @push_server.send_all("notification.queue" => [@size, Narou::Worker.size])
+    end
+
+    def countup
+      @mutex.synchronize do
+        @size += 1
+        notification_queue
+      end
+    end
+
+    def countdown
+      @mutex.synchronize do
+        @size -= 1
+        @size = 0 if @size < 0
+        notification_queue
+      end
+    end
+  end
+end

data/lib/worker.rb

@@ -0,0 +1,142 @@
+# frozen_string_literal: true
+
+#
+# Copyright 2013 whiteleaf. All rights reserved.
+#
+
+require "singleton"
+require_relative "mixin/all"
+
+module Narou
+  class Worker
+    include Singleton
+    include Mixin::OutputError
+
+    attr_accessor :queue, :mutex, :size, :worker_thread, :cancel_signal, :thread_of_block_executing,
+                  :push_server
+
+    class << self
+      extend Forwardable
+
+      def_delegators :instance, :push_server=, :join, :cancel, :canceled?, :stop, :push, :size
+
+      def run
+        instance.start
+      end
+    end
+
+    def initialize
+      self.queue = Queue.new
+      self.mutex = Mutex.new
+      self.size = 0
+      self.worker_thread = nil
+      self.cancel_signal = false
+      self.thread_of_block_executing = nil
+    end
+
+    def running?
+      worker_thread.present?
+    end
+
+    def start
+      return if running?
+      self.worker_thread = Thread.new do
+        loop do
+          begin
+            q = queue.pop
+            self.cancel_signal = false
+            self.thread_of_block_executing = Thread.new do
+              q[:block].call
+            end
+            thread_of_block_executing.join
+            self.thread_of_block_executing = nil
+          rescue SystemExit
+          rescue Interrupt
+            thread_of_block_executing&.raise(Interrupt)
+            self.thread_of_block_executing = nil
+            sleep 0.1
+          rescue Exception => e
+            output_error($stdout2, e)
+          ensure
+            countdown
+          end
+        end
+      end
+    end
+
+    def join
+      until size.zero?
+        unless thread_of_block_executing
+          Thread.pass
+          next
+        end
+        thread_of_block_executing&.join
+      end
+    rescue Interrupt
+      thread_of_block_executing&.raise(Interrupt)
+      self.thread_of_block_executing = nil
+      sleep 0.1
+    end
+
+    def cancel
+      mutex.synchronize do
+        if size > 0
+          self.cancel_signal = true
+          self.size = 0
+          thread_of_block_executing&.raise(Interrupt)
+          self.thread_of_block_executing = nil
+          queue.clear
+        end
+      end
+      Thread.pass
+    end
+
+    def canceled?
+      cancel_signal
+    end
+
+    def stop
+      cancel
+      worker_thread&.kill
+      self.worker_thread = nil
+    end
+
+    def push(&block)
+      countup
+      queue.push(block: block)
+    end
+
+    def notification_queue
+      push_server&.send_all("notification.queue" => [Narou::WebWorker.instance.size, size])
+    end
+
+    def countup
+      mutex.synchronize do
+        self.size += 1
+        notification_queue
+      end
+    end
+
+    def countdown
+      mutex.synchronize do
+        self.size -= 1
+        self.size = 0 if size < 0
+        notification_queue
+      end
+    end
+  end
+end
+
+if Narou.concurrency_enabled?
+  Thread.abort_on_exception = true
+  Narou::Worker.run
+
+  at_exit do
+    next if Narou.web?
+    # ここまでたどり着いた時点でダウンロードとかは終わってるので変換ログを普通に表示する
+    $stdout2.silent = false
+    Narou::Worker.join
+    Narou::Worker.stop
+    Command::Convert.display_sending_error_list
+  end
+end