narou 3.2.5.1 → 3.3.0

data/lib/web/helper4web.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
@@ -8,18 +9,22 @@ require_relative "../helper"
 module Helper
   module_function
 
+  HR_TAG = "<hr>"
+
   class << self
     alias :original_print_horizontal_rule :print_horizontal_rule
   end
 
-  def print_horizontal_rule
+  def print_horizontal_rule(io = $stdout)
     # タグがキャプチャーされると困るので、キャプチャ専用の出力とWEBへの出力は分ける
     if $stdout.capturing
       $stdout.silence do
-        original_print_horizontal_rule
+        original_print_horizontal_rule($stdout)
       end
+    else
+      io.append_log("#{HR_TEXT}\n")
     end
-    $stdout.push_server.send_all(echo: "<hr>")
+    io.push_streaming(HR_TAG)
+    io.original_write(HR_TAG)
   end
 end
-

data/lib/web/progressbar4web.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 #
 # Copyright 2013 whiteleaf. All rights reserved.
 #
@@ -17,16 +18,19 @@ class ProgressBar
 
   def initialize(*args)
     original_initialize(*args)
-    @@push_server.send_all("progressbar.init" => true)
+    @@push_server.send_all("progressbar.init" => { target_console: io.target_console })
   end
 
   def output(num)
     percent = calc_ratio(num) * 100
-    @@push_server.send_all("progressbar.step" => percent)
+    @@push_server.send_all("progressbar.step" => {
+      percent: percent,
+      target_console: io.target_console
+    })
   end
 
   def clear
-    @@push_server.send_all("progressbar.clear" => true)
+    @@push_server.send_all("progressbar.clear" => { target_console: io.target_console })
   end
 end
 

data/lib/web/public/resources/default-style.css

@@ -27,11 +27,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/resources/narou.library.js

@@ -149,6 +149,13 @@ var Narou = (function() {
     tableReload: function() {
       Notification.instance().trigger("table.reload");
     },
+
+    concurrencyIsEnabled: function() {
+      if (typeof this.__concurrencyIsEnabled === "undefined") {
+        this.__concurrencyIsEnabled = $("#concurrency-enabled").val() === "true";
+      }
+      return this.__concurrencyIsEnabled;
+    },
   });
 
   /*************************************************************************
@@ -419,21 +426,15 @@ var Narou = (function() {
       },
 
       update: function() {
-        this.openConsoleDialog(function() {
-          this.action.update(this.target_id);
-        }.bind(this));
+        this.action.update(this.target_id);
       },
 
       update_force: function() {
-        this.openConsoleDialog(function() {
-          this.action.updateForce(this.target_id);
-        }.bind(this));
+        this.action.updateForce(this.target_id);
       },
 
       send: function() {
-        this.openConsoleDialog(function() {
-          this.action.send(this.target_id);
-        }.bind(this));
+        this.action.send(this.target_id);
       },
 
       freeze_toggle: function() {
@@ -441,9 +442,7 @@ var Narou = (function() {
       },
 
       remove: function() {
-        this.openConsoleDialog(function() {
-          this.action.remove(this.target_id);
-        }.bind(this));
+        this.action.remove(this.target_id);
       },
 
       edit_tag: function() {
@@ -451,9 +450,7 @@ var Narou = (function() {
       },
 
       convert: function() {
-        this.openConsoleDialog(function() {
-          this.action.convert(this.target_id);
-        }.bind(this));
+        this.action.convert(this.target_id);
       },
 
       diff: function() {
@@ -461,9 +458,7 @@ var Narou = (function() {
       },
 
       inspect: function() {
-        this.openConsoleDialog(function() {
-          this.action.inspect(this.target_id);
-        }.bind(this));
+        this.action.inspect(this.target_id);
       },
 
       folder: function() {
@@ -471,21 +466,15 @@ var Narou = (function() {
       },
 
       backup: function() {
-        this.openConsoleDialog(function() {
-          this.action.backup(this.target_id);
-        }.bind(this));
+        this.action.backup(this.target_id);
       },
 
       download_force: function() {
-        this.openConsoleDialog(function() {
-          this.action.downloadForce(this.target_id);
-        }.bind(this));
+        this.action.downloadForce(this.target_id);
       },
 
       mail: function() {
-        this.openConsoleDialog(function() {
-          this.action.mail(this.target_id);
-        }.bind(this));
+        this.action.mail(this.target_id);
       },
 
       author_comments: function() {
@@ -914,6 +903,10 @@ var Narou = (function() {
         button.popover("show");
       });
     },
+
+    backupBookmark: function() {
+      $.post("/api/backup_bookmark");
+    },
   });
 
   /*************************************************************************
@@ -946,7 +939,9 @@ var Narou = (function() {
       restore: true,   // コンソールの大きさを復元・保存するか
       buttons: true,   // 拡大縮小等のコントロールボタンを使用するか
       id: "#console",  // コンソールのID名
-      buttons_id: "#console-buttons"   // コントロールボタンを格納している要素のID名
+      buttons_id: "#console-buttons",   // コントロールボタンを格納している要素のID名
+      sync_shape_console: null,
+      stream_id: "stdout"
     }, options);
     this.initialize();
   };
@@ -958,6 +953,7 @@ var Narou = (function() {
       this.notification = Notification.instance();
       this.last_char_was_return = true;
       this.console = $(this.options.id);
+      this.sync_shape_console = this.options.sync_shape_console;
       this.init_scrollbar();
       if (this.options.buttons) this.init_buttons();
       this.init_events();
@@ -976,14 +972,18 @@ var Narou = (function() {
 
     init_buttons: function() {
       var self = this;
+      var buttons = $(this.options.buttons_id);
       this.console.css("min-height", this.original_height);
-      $(this.options.buttons_id + " .console-expand").on("click", function(e) {
+      buttons.find(".console-expand").on("click", function(e) {
         self.expand_console();
       });
-      $(this.options.buttons_id + " .console-trash").on("click", function(e) {
+      buttons.find(".console-history").on("click", function(e) {
+        self.reloadHistory();
+      });
+      buttons.find(".console-trash").on("click", function(e) {
         self.trash_console();
       });
-      $(this.options.buttons_id + " .queue-cancel").on("click", function(e) {
+      buttons.find(".queue-cancel").on("click", function(e) {
         $.post("/api/cancel");
       });
     },
@@ -1006,41 +1006,48 @@ var Narou = (function() {
       });
     },
 
+    createProgressHtml: function(percent) {
+      return '<div class="progress"><div class="progress-bar progress-bar-success progress-bar-striped active" role="progressbar" style="width:' + percent + '%"></div></div>';
+    },
+
+    initializeProgressBar: function(percent) {
+      this.puts(this.createProgressHtml(percent));
+      this.progress = this.console.find(".progress-bar");
+    },
+
+    setProgressValue: function(percent) {
+      if (!this.progress)
+        this.initializeProgressBar(percent);
+      this.progress.width(percent + "%");
+    },
+
+    removeProgressBar: function() {
+      if (!this.progress) return;
+      this.progress.parent().parent().remove();
+      this.progress = null;
+    },
+
     init_events_progressbar: function() {
       var self = this;
-      var $progress = null;
-      var createProgressHtml = function(percent) {
-        return '<div class="progress"><div class="progress-bar progress-bar-success progress-bar-striped active" role="progressbar" style="width:' + percent + '%"></div></div>';
-      };
-      var initializeProgressbar = function(percent) {
-        self.puts(createProgressHtml(percent));
-        $progress = self.console.find(".progress > div");
-      };
-      var setProgressValue = function(step) {
-        $progress.width(step + "%");
-      };
-      this.notification.on("progressbar.init", function() {
-        initializeProgressbar(0);
+      this.notification.on("progressbar.init", function(json) {
+        if (json.target_console !== self.options.stream_id) return;
+        self.initializeProgressBar(0);
       });
-      this.notification.on("progressbar.step", function(value) {
-        if ($progress) {
-          setProgressValue(value);
-        }
-        else {
-          initializeProgressbar(value);
-        }
+      this.notification.on("progressbar.step", function(json) {
+        if (json.target_console !== self.options.stream_id) return;
+        self.setProgressValue(json.percent);
       });
-      this.notification.on("progressbar.clear", function() {
-        if (!$progress) return;
-        $progress = null;
-        $(".progress").parent("div").remove();
+      this.notification.on("progressbar.clear", function(json) {
+        if (json.target_console !== self.options.stream_id) return;
+        self.removeProgressBar();
       });
     },
 
     init_notification: function() {
       var self = this;
-      this.notification.on("echo", function(message) {
-        self.print(message);
+      this.notification.on("echo", function(echo) {
+        if (echo.target_console === self.options.stream_id)
+          self.print(echo.body);
       });
     },
 
@@ -1063,6 +1070,8 @@ var Narou = (function() {
       var data = storage.get("console");
       if (data) {
         this.console.height(data.height);
+        if (this.sync_shape_console)
+          this.sync_shape_console.restore_console_shape();
         if (data.expanded) this.toggle_expanded();
       }
     },
@@ -1123,6 +1132,8 @@ var Narou = (function() {
         calced_height = ($(window).height() - top) * 0.8;
       }
       var was_bottom = this.position_is_bottom();
+      if (this.sync_shape_console)
+        this.sync_shape_console.expand_console();
       this.console.stop().animate({ height: calced_height }, this.animate_duration,
           // after do
           function() {
@@ -1135,18 +1146,33 @@ var Narou = (function() {
 
     toggle_expanded: function() {
       this.console.toggleClass("expanded");
-      $(".console-expand > span").toggleClass("hide");
+      if (this.options.buttons) {
+        var buttons = $(this.options.buttons_id);
+        buttons.find(".console-expand > span").toggleClass("hide");
+      }
+    },
+
+    reloadHistory: function() {
+      $.get("/api/history", { stream: this.options.stream_id }, function(history) {
+        this.clear();
+        this.puts(history);
+      }.bind(this));
+      if (this.sync_shape_console)
+        this.sync_shape_console.reloadHistory();
     },
 
     // コンソールのログを削除すると同時に、サーバの履歴も削除する
     trash_console: function() {
       this.clear();
+      if (this.sync_shape_console) this.sync_shape_console.clear();
       $.post("/api/clear_history");
     },
 
     // コンソールの内容をクリア
     clear: function() {
       this.console.find("div.console-line").remove();
+      this.last_char_was_return = true;
+      this.progress = null;
     }
   });
 
@@ -1442,7 +1468,7 @@ var Narou = (function() {
         }
       }
 
-      $.get("/api/taginfo.json", { ids: ids }, function(taginfo) {
+      $.post("/api/taginfo.json", { ids: ids }, function(taginfo) {
         _.each(taginfo, function(info) {
           var label = $('<label><input type="checkbox" data-tagname="' + info.tag.replace(/"/g, "&quot;") +
             '" data-default-checkstate=' + calcState(info.count) + '> ' + info.html + '&nbsp;&nbsp;</label>');
@@ -1591,7 +1617,7 @@ var Narou = (function() {
 
     _createEditorField: function(callback) {
       var field = $("<div id=update-by-tag-field class=form-group>");
-      $.get("/api/taginfo.json", { ids: [0], with_exclusion: true }, function(taginfo) {
+      $.post("/api/taginfo.json", { ids: [0], with_exclusion: true }, function(taginfo) {
         var div = $("<div><p>更新したい小説のタグにチェックを入れて下さい。</p>");
         _.each(taginfo, function(info) {
           var label = $('<label><input type="checkbox" data-tagname="' + info.tag.replace(/"/g, "&quot;") + '"> ' +

data/lib/web/public/resources/narou.queue.js

@@ -6,46 +6,40 @@
 /*
  * キュー関係のコード
  */
-$(document).ready(function() {
+$(function() {
   "use strict";
 
   /*
    * キューに積まれた数を表示
    */
   var notification = Narou.Notification.instance();
-  var $queue = $("#queue");
-  function highlightQueuBoxIcon(size) {
-    if (size > 0) {
-      $("#queue-text").addClass("active");
+  var $queue = $(".queue");
+  var $queueSizes = $(".queue__sizes");
+  var $queueSizeDefault = $(".queue__size--default");
+  var $queueSizeConvert = $(".queue__size--convert");
+
+  function highlightQueuBoxIcon(sizes) {
+    if (sizes[0] || sizes[1]) {
+      $queue.addClass("active");
     }
     else {
-      $("#queue-text").removeClass("active");
+      $queue.removeClass("active");
+    }
+  }
+
+  function setQueueSizesText(sizes) {
+    $queueSizeDefault.text(sizes[0]);
+    if (Narou.concurrencyIsEnabled()) {
+      $queueSizeConvert.text(sizes[1]);
     }
+    highlightQueuBoxIcon(sizes);
   }
-  notification.on("notification.queue", function(data) {
-    var before_size = $queue.text();
-    $queue.text(data);
-    highlightQueuBoxIcon(data);
-    // キューのスタック数の横に +1 が浮かび上がって消えるアニメーション
-    var diff = data - before_size;
-    if (diff <= 0) return;
-    var $plus = $("<span>+" + diff + "</span>");
-    $plus.addClass("queue-plus").css({
-      position: "absolute",
-      left: $queue.offset().left + $queue.outerWidth() + 1 - $(document).scrollLeft(),
-      top: $queue.offset().top - 3 - $(document).scrollTop(),
-    });
-    $("#header-navbar").append($plus);
-    $plus.delay(100).animate({
-      top: - $plus.outerHeight(),
-      opacity: 0,
-    }, 3000, function() {
-      $(this).remove();
-    });
+
+  notification.on("notification.queue", function(sizes) {
+    setQueueSizesText(sizes);
   });
-  $.get("/api/get_queue_size", function(json) {
-    $queue.text(json.size);
-    highlightQueuBoxIcon(json.size);
+
+  $.get("/api/get_queue_size", function(sizes) {
+    setQueueSizesText(sizes);
   });
 });
-

data/lib/web/public/resources/narou.ui.js

@@ -3,7 +3,7 @@
  * Copyright 2013 whiteleaf. All rights reserved.
  */
 var t;   // for debugging
-$(document).ready(function() {
+$(function() {
   "use strict";
 
   var touchable_device = "ontouchstart" in window;
@@ -364,7 +364,7 @@ $(document).ready(function() {
           switch (type) {
           case "display":
             return sprintf(
-                '<a href="%(url)s" class="btn btn-default btn-xs" target="_blank" ' +
+                '<a href="%(url)s" class="btn btn-default btn-xs" target="_blank" rel="noreferrer" ' +
                 'data-toggle="tooltip" data-placement="top" title="%(url)s">' +
                 '<span class="glyphicon glyphicon-link"></span></a>',
                 { url: data }
@@ -552,7 +552,17 @@ $(document).ready(function() {
   var action = new Narou.Action(table);
   var menuAction = new Narou.MenuAction();
   var notification = Narou.Notification.instance();
-  var stream_console = new Narou.Console;
+  var consoleStdout2 = null;
+  if (Narou.concurrencyIsEnabled()) {
+    consoleStdout2 = new Narou.Console({
+      id: "#console-stdout2",
+      restore: false,
+      buttons: false,
+      buttons_id: "#console-convert-buttons",
+      stream_id: "stdout2"
+    });
+  }
+  new Narou.Console({ sync_shape_console: consoleStdout2 });
   var search = Narou.Search.get(table);
   var tag = new Narou.Tag(table);
   var context_menu = new Narou.ContextMenu(action, tag);
@@ -1451,6 +1461,15 @@ Mac スタイル：<br>メニューが画面外にはみ出そうとしたら、
     action.send("hotentry");
   });
 
+  /*
+   * ボタン
+   *   Send > 端末の栞データをバックアップする
+   */
+  $(".button-send-backup-bookmark").on("click", function(e) {
+    e.preventDefault();
+    action.backupBookmark();
+  });
+
   /*
    * ボタン
    *   Freeze > 選択した小説を凍結