narou 2.6.1 → 2.7.0

data/lib/novelsetting.rb

@@ -101,7 +101,7 @@ class NovelSetting
   # { name: value, ... } 形式のハッシュとして返す
   #
   def self.load_settings_by_pattern(pattern)
-    res = Inventory.load("local_setting", :local).map { |name, value|
+    res = Inventory.load("local_setting").map { |name, value|
       if name =~ /^#{pattern}\.(.+)$/
         [$1, value]
       else
@@ -430,6 +430,12 @@ class NovelSetting
       value: false,
       help: "HTMLの装飾系タグを削除する（主にArcadiaの作品に影響）"
     },
+    {
+      name: "enable_double_dash_to_image",
+      type: :boolean,
+      value: false,
+      help: "２倍ダッシュ（――）を画像に差し替える。Kindleのデフォルトフォントみたいにダッシュが太くて気になる人用"
+    },
   ]
 
   ORIGINAL_SETTINGS_KEY_INDEXES = {}.tap { |hash|

data/lib/version.rb

@@ -3,5 +3,5 @@
 # Copyright 2013 whiteleaf. All rights reserved.
 #
 
-Version = "2.6.1"
+Version = "2.7.0"
 

data/lib/web/appserver.rb

@@ -419,6 +419,10 @@ class Narou::AppServer < Sinatra::Base
     json json_objects
   end
 
+  post "/api/cancel" do
+    Narou::Worker.cancel
+  end
+
   post "/api/convert" do
     ids = select_valid_novel_ids(params["ids"]) or pass
     Narou::Worker.push do
@@ -428,7 +432,7 @@ class Narou::AppServer < Sinatra::Base
 
   post "/api/download" do
     targets = params["targets"] or pass
-    targets = targets.split
+    targets = targets.kind_of?(Array) ? targets : targets.split
     pass if targets.size == 0
     Narou::Worker.push do
       CommandLine.run!(["download"] + targets)
@@ -527,6 +531,14 @@ class Narou::AppServer < Sinatra::Base
     haml :diff_list, layout: false
   end
 
+  post "/api/diff_clean" do
+    target = params["target"] or pass
+    id = Downloader.get_id_by_target(target) or pass
+    Narou::Worker.push do
+      CommandLine.run!(%W(diff --clean #{id}))
+    end
+  end
+
   post "/api/inspect" do
     ids = select_valid_novel_ids(params["ids"]) or pass
     Narou::Worker.push do
@@ -554,7 +566,9 @@ class Narou::AppServer < Sinatra::Base
     result = '<div><span class="tag label label-default" data-tag="">タグ検索を解除</span></div>'
     tagname_list = Command::Tag.get_tag_list.keys
     tagname_list.each do |tagname|
-      result << "<div>#{decorate_tags([tagname])}</div>"
+      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>"
     end
     result
   end
@@ -622,14 +636,69 @@ class Narou::AppServer < Sinatra::Base
     end
   end
 
+  post "/api/change_tag_color" do
+    tag = params["tag"] or pass
+    color = params["color"] or pass
+    tag_colors = Inventory.load("tag_colors")
+    tag_colors[tag] = color
+    tag_colors.save
+    @@push_server.send_all(:"table.reload")
+    @@push_server.send_all(:"tag.updateCanvas")
+  end
+
+  get "/api/csv/download" do
+    content_type "application/csv"
+    attachment "novels.csv"
+
+    Command::Csv.new.generate
+  end
+
+  post "/api/csv/import" do
+    files = params["files"] or pass
+    csv = Command::Csv.new
+    files.each do |file|
+      csv.import(file[:tempfile])
+    end
+    ""
+  end
+
+  # ダウンロード登録すると同時にグレーのボタン画像を返す
+  get "/api/download4ie" do
+    Narou::Worker.push do
+      CommandLine.run!(%W(download #{params["target"]}))
+      @@push_server.send_all(:"table.reload")
+    end
+    redirect "/resources/images/dl_button1.gif"
+  end
+
+  get "/api/validate_url_regexp_list" do
+    json Downloader.load_settings.map { |setting|
+      "(#{setting["url"].gsub(/\?<.+?>/, "?:").gsub("\\", "\\\\")})"
+    }
+  end
+
+  # -------------------------------------------------------------------------------
+  # 一部分に表示するためのHTMLを取得する
+  # -------------------------------------------------------------------------------
+
+  get "/parts/csv_import" do
+    haml :"parts/csv_import", layout: false
+  end
+
+  get "/parts/download_form" do
+    haml :"parts/download_form", layout: false
+  end
+
   # -------------------------------------------------------------------------------
   # ウィジット関係
   # -------------------------------------------------------------------------------
 
+  BOOKMARKLET_MODE = %w(download insert_button)
+
   get "/js/widget.js" do
-    if %w(download).include?(params["mode"])
+    if BOOKMARKLET_MODE.include?(params["mode"])
       content_type :js
-      erb :"js/widget"
+      erb :"bookmarklet/#{params['mode']}.js"
     else
       error("invaid mode")
     end
@@ -646,9 +715,6 @@ class Narou::AppServer < Sinatra::Base
     from = params["from"]
     if ALLOW_HOSTS.include?(from)
       headers "X-Frame-Options" => "ALLOW-FROM http://#{from}/"
-    else
-      headers "X-Frame-Options" => "DENY"
-      halt
     end
   end
 
@@ -658,7 +724,11 @@ class Narou::AppServer < Sinatra::Base
       CommandLine.run!(["download", target])
       @@push_server.send_all(:"table.reload")
     end
-    haml :widget, :layout => nil
+    haml :"widget/download", layout: nil
+  end
+
+  get "/widget/drag_and_drop" do
+    haml :"widget/drag_and_drop", layout: nil
   end
 end
 

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

@@ -28,45 +28,6 @@ $(document).ready(function() {
    */
   $("#fadeout-alert").delay(2000).animate({ opacity: "hide" }, 1500);
 
-  /*
-   * キューに積まれた数を表示
-   */
-  var notification = Narou.Notification.instance();
-  var $queue = $("#queue");
-  function highlightQueuBoxIcon(size) {
-    if (size > 0) {
-      $("#queue-text").addClass("active");
-    }
-    else {
-      $("#queue-text").removeClass("active");
-    }
-  }
-  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(),
-    });
-    $(".navbar").append($plus);
-    $plus.delay(100).animate({
-      top: - $plus.outerHeight(),
-      opacity: 0,
-    }, 3000, function() {
-      $(this).remove();
-    });
-  });
-  $.get("/api/get_queue_size", function(json) {
-    $queue.text(json.size);
-    highlightQueuBoxIcon(json.size);
-  });
-
   /*************************************************************************
    * Webサーバの方から入力を求められた時にモーダルを表示して返事を返す
    *************************************************************************/

data/lib/web/public/resources/dataTables.colVis.js

@@ -605,7 +605,7 @@ ColVis.prototype = {
 				'<li '+(dt.bJUI ? 'class="ui-button ui-state-default"' : '')+'>'+
 					'<label>'+
 						'<input type="checkbox" />'+
-						'<span>'+title+'</span>'+
+						'<span>'+title.replace("<br>", "")+'</span>'+
 					'</label>'+
 				'</li>'
 			)

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

@@ -3,7 +3,7 @@
   background-color: rgba(248,248,248,0.93);
 }
 @media (max-width:767px) {
-  .navbar.navbar-collapse {
+  .navbar .navbar-collapse {
     background-color: rgba(248,248,248,0.93);
   }
 }

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

@@ -10,6 +10,13 @@ var Narou = (function() {
   var storage_cache = null;
   var storage = null;
 
+  $.ajaxSetup({
+    cache: false   // IE でキャッシュさせないため
+  });
+
+  // jQuery はデフォルトだと dataTransfer オブジェクトをコピーしないので
+  $.event.props.push("dataTransfer");
+
   /*************************************************************************
    * ローカルストレージ
    *************************************************************************/
@@ -90,6 +97,24 @@ var Narou = (function() {
       }
       return format;
     },
+
+    get_event_position: function(e) {
+      if (e.type !== "touchstart") {
+        return { x: e.pageX, y: e.pageY };
+      }
+      else {
+        return { x: e.originalEvent.touches[0].pageX,
+          y: e.originalEvent.touches[0].pageY };
+      }
+    },
+
+    noScroll: function() {
+      $("html, body").css("overflow", "hidden");
+    },
+
+    allowScroll: function() {
+      $("html, body").css("overflow", "");
+    },
   });
 
   /*************************************************************************
@@ -202,11 +227,17 @@ var Narou = (function() {
         $(document).trigger("click");
       }
       this.closed = false;
+      var caller = function() {
+        if (typeof callback === "function")
+          callback();
+      };
+      $(document).one("show.bs.dropdown", function() {
+        $("#context-menu").hide();
+        caller();
+      });
       Narou.popupMenu("#context-menu", pos, function() {
         $("#context-menu").hide();
-        if (typeof callback === "function") {
-          callback();
-        }
+        caller();
       });
     },
 
@@ -230,12 +261,25 @@ var Narou = (function() {
 
     openSelectDiffListDialog: function(target_id) {
       $.get("/api/diff_list", { target: target_id }, function(html) {
-        bootbox.dialog({
+        var diff_modal = bootbox.dialog({
           title: "表示したい差分を選択して下さい",
           message: html,
           backdrop: true,
           className: "diff-list-modal",
           buttons: {
+            clear: {
+              label: "差分を消去",
+              className: "btn-danger",
+              callback: function() {
+                bootbox.confirm("本当に消去してよろしいですか？", function(result) {
+                  if (result) {
+                    $.post("/api/diff_clean", { target: target_id });
+                  }
+                  diff_modal.modal("hide");
+                });
+                return false;   // 親モーダルはこの時点では閉じさせない
+              }
+            },
             main: {
               label: "閉じる",
               className: "btn-default"
@@ -351,28 +395,39 @@ var Narou = (function() {
     },
 
     download: function() {
-      var download_modal = bootbox.dialog({
-        title: "ダウンロードする小説のURL、もしくはNコードを入力(複数可)",
-        message: '<textarea id="download-input" class="form-control" rows="3"></textarea>',
-        backdrop: true,
-        buttons: {
-          cancel: {
-            label: "キャンセル",
-            className: "btn-default"
-          },
-          main: {
-            label: "OK",
-            className: "btn-primary",
-            callback: function() {
-              var targets = $("#download-input").val();
-              $.post("/api/download", { targets: targets });
-            }
-          }
-        }
-      });
-      download_modal.one("shown.bs.modal", function () {
-        $("#download-input").focus();
-      });
+      var urls = [];
+      if (typeof arguments !== "undefined" && arguments.length > 0) {
+        urls = Array.prototype.slice.call(arguments);
+      }
+      if (urls.length == 0) {
+        $.get("/parts/download_form")
+          .done(function(html) {
+            var download_modal = bootbox.dialog({
+              title: "ダウンロードする小説のURL、もしくはNコードを入力(複数可)",
+              message: html,
+              backdrop: true,
+              buttons: {
+                cancel: {
+                  label: "キャンセル",
+                  className: "btn-default"
+                },
+                main: {
+                  label: "ダウンロード",
+                  className: "btn-primary",
+                  callback: function() {
+                    $("#download-link-submit").click();
+                  }
+                }
+              }
+            });
+            download_modal.one("shown.bs.modal", function () {
+              $("#download-input").focus();
+            });
+          });
+      }
+      else {
+        $.post("/api/download", { targets: urls });
+      }
     },
 
     downloadForce: function() {
@@ -529,6 +584,28 @@ var Narou = (function() {
       if (ids.length === 0) return;
       $.post("/api/setting_burn", { "ids": ids });
     },
+
+    csvImport: function() {
+      $.get("/parts/csv_import", function(html) {
+        var box = bootbox.dialog({
+          title: "CSVファイルからのインポート",
+          message: html,
+          buttons: {
+            cancel: {
+              label: "キャンセル",
+              className: "btn-default",
+            },
+            main: {
+              label: "インポート",
+              className: "btn-primary",
+              callback: function() {
+                $("#csv-import-files").click();
+              }
+            }
+          }
+        });
+      });
+    },
   });
 
   /*************************************************************************
@@ -576,6 +653,9 @@ var Narou = (function() {
       $(this.options.buttons_id + " .console-trash").on("click", function(e) {
         self.trash_console();
       });
+      $(this.options.buttons_id + " .queue-cancel").on("click", function(e) {
+        $.post("/api/cancel");
+      });
     },
 
     init_events: function() {
@@ -600,15 +680,14 @@ var Narou = (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" aria-valuenow="' + percent + '" aria-valuemin="0" aria-valuemax="100" style="width:' + percent + '%"></div></div>';
+        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.attr("aria-valuenow", step)
-                 .width(step + "%");
+        $progress.width(step + "%");
       };
       this.notification.on("progressbar.init", function() {
         initializeProgressbar(0);
@@ -623,13 +702,8 @@ var Narou = (function() {
       });
       this.notification.on("progressbar.clear", function() {
         if (!$progress) return;
-        // 表示と通信のタイムラグで100%付近のが表示されないまま消えてしまうので、
-        // 演出的にプログレスバーの消去を遅らせて、100%付近まで表示する
-        setProgressValue(100);
         $progress = null;
-        setTimeout(function() {
-          $(".progress").parent("div").remove();
-        }, 500);
+        $(".progress").parent("div").remove();
       });
     },
 
@@ -740,6 +814,7 @@ var Narou = (function() {
       $.post("/api/clear_history");
     },
 
+    // コンソールの内容をクリア
     clear: function() {
       this.console.find("div.console-line").remove();
     }
@@ -750,13 +825,13 @@ var Narou = (function() {
    *************************************************************************/
   var Tag = Narou.Tag = (function(table) {
     this.table = table;
+    this.registerEvents($("#tag-list-canvas"));
     this.updateCanvas();
   });
 
   $.extend(Tag.prototype, {
     updateCanvas: function() {
       var $canvas = $("#tag-list-canvas");
-      this.registerEvents($canvas);
       $.get("/api/tag_list", function(source) {
         $canvas.html(source);
       });
@@ -773,6 +848,7 @@ var Narou = (function() {
         storage.set("tag_search", tag_name);
         storage.save();
         self.table.draw();
+        self.table.$("[data-toggle=tooltip]").tooltip("hide");
       }).on("mousedown", ".tag", args, function(e) {
         // 範囲選択モードでもクリック出来るように
         if (e.data.stop_bubbling) e.stopPropagation();
@@ -882,6 +958,162 @@ var Narou = (function() {
     },
   });
 
+  /*************************************************************************
+   * タグの色選択機能
+   *************************************************************************/
+  var SelectColorMenu = Narou.SelectColorMenu = (function() {
+    this.initializeEvents();
+    this.initializeMenuEvents();
+    this.$menu = $("#select-color-menu");
+  });
+
+  $.extend(SelectColorMenu.prototype, {
+    open: function(target_tag, pos, callback) {
+      var self = this;
+      this.target_tag = target_tag;
+      var caller = function() {
+        if (typeof callback === "function")
+          callback();
+      };
+      $(document).one("hide.bs.dropdown", function() {
+        self.$menu.hide();
+      });
+      Narou.popupMenu("#select-color-menu", pos, function() {
+        self.$menu.hide();
+        caller();
+      });
+    },
+
+    initializeEvents: function() {
+      var self = this;
+      $(document).on("click", ".select-color-button", function(e) {
+        e.stopPropagation();
+        var $this = $(this);
+        var pos = {
+          x: $this.offset().left + $this.width() + 10,
+          y: $this.offset().top - 20
+        }
+        self.open($(this).data("targetTag"), pos, function() {
+        });
+      });
+    },
+
+    initializeMenuEvents: function() {
+      var self = this;
+      var colors = ["green", "yellow", "blue", "magenta", "cyan", "red", "white"];
+      $.each(colors, function(i, color) {
+        $("#select-color-menu-" + color).on("click", function(e) {
+          e.preventDefault();
+          e.stopPropagation();
+          $.post("/api/change_tag_color", {
+            tag: self.target_tag,
+            color: color
+          });
+          self.$menu.hide();
+        });
+      });
+    },
+  });
+
+  /*************************************************************************
+   * ドラッグ＆ドロップ関係
+   *************************************************************************/
+  var DragDrop = Narou.DragDrop = (function() {
+     this.initializeValidateUrlRegexpList();
+  });
+
+  $.extend(DragDrop.prototype, {
+    initializeValidateUrlRegexpList: function() {
+      if (typeof this.validate_url_regexp_list !== "undefined") return;
+      var self = this;
+      this.validate_url_regexp_list = [];
+      $.ajax({
+        type: "GET",
+        url: "/api/validate_url_regexp_list",
+        dataType: "json",
+        success: function(json) {
+          $.each(json, function(i, value) {
+            self.validate_url_regexp_list.push(value);
+          });
+        }
+      });
+    },
+
+    isValidNovelUrl: function(url) {
+      var result = false;
+      $.each(this.validate_url_regexp_list, function(i, regexp) {
+        if (url.match(regexp)) {
+          result = true;
+          return false;   // break
+        }
+      });
+      return result;
+    },
+
+    getLinkText: function(event, callback) {
+      var self = this;
+      var data_transfer = event.dataTransfer;
+      $.each(data_transfer.types, function(i, type) {
+        if (type === "Files") {
+          // ショートカットファイルがドラッグされた場合は中身からリンクを抜き出す
+          $.each(data_transfer.files, function(i, file) {
+            if (!self.isSupportFile(file.name)) return;
+            var reader = new FileReader;
+            reader.onload = function(e) {
+              var link = self.parseLink(file.name, reader.result);
+              if (link) callback(link);
+            };
+            reader.readAsText(file);
+          });
+        }
+        else {
+          // TextはIE用
+          if (type === "text/plain" || type === "Text") {
+            var link = data_transfer.getData(type);
+            if (link.length > 0) {
+              callback(link);
+            }
+          }
+        }
+      });
+      return;
+    },
+
+    isSupportFile: function(filename) {
+      return !!filename.match(/\.(?:url|webloc)$/i);
+    },
+
+    parseLink: function(filename, text) {
+      filename.toLowerCase().match(/\.(url|webloc)$/);
+      var link = null;
+      switch (RegExp.$1) {
+      case "url":
+        link = this.parseLinkDotURL(text);
+        break;
+      case "webloc":
+        link = this.parseLinkDotWebloc(text);
+        break;
+      }
+      return link;
+    },
+
+    // OSX で使われる .webloc 形式のショートカット
+    parseLinkDotWebloc: function(text) {
+      if (text.match(/<string>(.+?)<\/string>/i)) {
+        return RegExp.$1;
+      }
+      return null;
+    },
+
+    // Windows で使われる .URL 形式のショートカット
+    parseLinkDotURL: function(text) {
+      if (text.match(/URL=(.+)/i)) {
+        return RegExp.$1;
+      }
+      return null;
+    },
+  });
+
   return Narou;
 })();