narou 2.4.2 → 2.5.1

data/lib/template.rb

@@ -19,14 +19,14 @@ class Template
   # _binding      変数とか設定したいスコープの binding 変数を渡す
   # overwrite     上書きするか
   #
-  def self.write(src_filename, dest_filepath, _binding, overwrite = false)
+  def self.write(src_filename, dest_filepath, _binding, binary_version, overwrite = false)
     if File.directory?(dest_filepath)
       dest_filepath = File.join(dest_filepath, src_filename)
     end
     unless overwrite
       return if File.exist?(dest_filepath)
     end
-    result = get(src_filename, _binding) or return nil
+    result = get(src_filename, _binding, binary_version) or return nil
     if Helper.os_windows?
       File.write(dest_filepath, result)
     else
@@ -41,13 +41,13 @@ class Template
   # 1. root_dir/template
   # 2. script_dir/template
   #
-  def self.get(src_filename, _binding, binary_version = 1.0)
+  def self.get(src_filename, _binding, binary_version)
     @@binary_version = binary_version
     @@src_filename = src_filename
     [Narou.get_root_dir, Narou.get_script_dir].each do |dir|
       path = File.join(dir, TEMPLATE_DIR, src_filename + ".erb")
       next unless File.exist?(path)
-      src = open(path, "r:BOM|UTF-8") { |fp| fp.read }
+      src = Helper::CacheLoader.load(path)
       result = ERB.new(src, nil, "-").result(_binding)
       return result
     end

data/lib/version.rb

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

data/lib/web/appserver.rb

@@ -179,6 +179,8 @@ class Narou::AppServer < Sinatra::Base
   before do
     Narou::Worker.push_as_system_worker do
       Inventory.clear
+      Database.instance.refresh
+      Narou.load_global_replace_pattern
     end
   end
 
@@ -201,6 +203,7 @@ class Narou::AppServer < Sinatra::Base
     @view_invisible = params["view_invisible"] == "1"
     @setting_variables = Command::Setting.get_setting_variables
     @error_list = {}
+    @global_replace_pattern = @replace_pattern = Narou.global_replace_pattern
   end
 
   post "/settings" do
@@ -211,7 +214,7 @@ class Narou::AppServer < Sinatra::Base
       @setting_variables[scope].each do |name, info|
         param_data = params[name]
         argument = ""
-        if info[0] == :boolean
+        if info[:type] == :boolean
           # :boolean 用のフォームデータは on, off, nil で渡される。
           # ただしチェックボックスはチェックした時だけ on が渡されるので、
           # 何もデータが無い＝off を選択したと判断する。
@@ -222,6 +225,8 @@ class Narou::AppServer < Sinatra::Base
           else
             argument = "false"
           end
+        elsif param_data.kind_of?(Array)
+          argument = param_data.join(",")
         else
           argument = param_data
         end
@@ -245,6 +250,19 @@ class Narou::AppServer < Sinatra::Base
         end
       end
     end
+
+    # 置換設定保存
+    params_replace_pattern = params["replace_pattern"]
+    @global_replace_pattern.clear
+    if params_replace_pattern.kind_of?(Array)
+      params_replace_pattern.each do |pattern|
+        left, right = pattern["left"].strip, pattern["right"].strip
+        next if left == ""
+        @global_replace_pattern << [left, right]
+      end
+    end
+    Narou.save_global_replace_pattern
+
     if @error_list.empty?
       session[:alert] = [ "保存が完了しました", "success" ]
     else
@@ -285,28 +303,33 @@ class Narou::AppServer < Sinatra::Base
     @novel_title = @data["title"]
     @setting_variables = []
     @error_list = {}
-    @novel_setting = NovelSetting.load(@id, true)
-    @default_settings = NovelSetting::DEFAULT_SETTINGS
-    @force_settings = Inventory.load("local_setting", :local).select { |n| n.start_with?("force.") }
+    @novel_setting = NovelSetting.new(@id, true, true)    # 空っぽの設定を作成
+    @novel_setting.settings = @novel_setting.load_setting_ini["global"]
+    @original_settings = NovelSetting::ORIGINAL_SETTINGS
+    @force_settings = NovelSetting.load_force_settings
+    @default_settings = NovelSetting.load_default_settings
     @replace_pattern = @novel_setting.load_replace_pattern
   end
 
   post "/novels/:id/setting" do
     # 変換設定保存
-    @default_settings.each do |info|
+    @original_settings.each do |info|
       name, type = info[:name], info[:type]
       param_data = params[name]
       value = nil
       begin
-        case type
-        when :boolean
+        if type == :boolean
           if param_data
             value = convert_on_off_to_boolean(param_data)
           else
             value = false
           end
+        elsif param_data.kind_of?(Array)
+          value = param_data.join(",")
         else
-          value = Helper.string_cast_to_type(param_data, type)
+          if param_data.strip != ""
+            value = Helper.string_cast_to_type(param_data, type)
+          end
         end
         @novel_setting[name] = value
       rescue Helper::InvalidVariableType => e
@@ -482,16 +505,24 @@ class Narou::AppServer < Sinatra::Base
 
   post "/api/diff" do
     ids = select_valid_novel_ids(params["ids"]) or pass
+    number = params["number"] || "1"
     Narou::Worker.push do
       # diff コマンドは１度に一つのIDしか受け取らないので
       ids.each do |id|
         # セキュリティ的にWEB UIでは独自の差分表示のみ使う
-        CommandLine.run!(["diff", "--no-tool", id])
+        CommandLine.run!(["diff", "--no-tool", id, "--number", number])
         Helper.print_horizontal_rule
       end
     end
   end
 
+  get "/api/diff_list" do
+    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
+  end
+
   post "/api/inspect" do
     ids = select_valid_novel_ids(params["ids"]) or pass
     Narou::Worker.push do

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

@@ -181,12 +181,14 @@ var Narou = (function() {
   /*************************************************************************
    * コンテキストメニュー
    *************************************************************************/
-  var ContextMenu = Narou.ContextMenu = function(action, notification) {
+  var ContextMenu = Narou.ContextMenu = function(action, notification, tag) {
     this.action = action;
     this.notification = notification;
+    this.tag = tag;
     this.closed = true;
     this.initializeConsoleDialog();
     this.initializeMenuEvent();
+    this.initializeDiffListEvent();
   };
 
   $.extend(ContextMenu.prototype, {
@@ -223,6 +225,32 @@ var Narou = (function() {
       });
     },
 
+    openSelectDiffListDialog: function(target_id) {
+      $.get("/api/diff_list", { target: target_id }, function(html) {
+        bootbox.dialog({
+          title: "表示したい差分を選択して下さい",
+          message: html,
+          backdrop: true,
+          className: "diff-list-modal",
+          buttons: {
+            main: {
+              label: "閉じる",
+              className: "btn-default"
+            },
+          }
+        });
+      });
+    },
+
+    initializeDiffListEvent: function() {
+      $(document).on("click", ".diff-list-container .list .item", function() {
+        var target = $(this).parent().data("diffTarget");
+        var number = $(this).data("diffItemNumber");
+        $.post("/api/diff", { ids: [ target ], number: number });
+        bootbox.hideAll();
+      });
+    },
+
     initializeMenuEvent: function() {
       var $context_menu = $("#context-menu");
       var self = this;
@@ -258,6 +286,10 @@ var Narou = (function() {
           self.action.removeWithFile(self.target_id);
         });
       });
+      $("#context-menu-edit-tag").on("click", function(e) {
+        e.preventDefault();
+        self.tag.openEditor(self.target_id);
+      });
       $("#context-menu-convert").on("click", function(e) {
         e.preventDefault();
         self.openConsoleDialog(function() {
@@ -266,7 +298,7 @@ var Narou = (function() {
       });
       $("#context-menu-diff").on("click", function(e) {
         e.preventDefault();
-        self.action.diff(self.target_id);
+        self.openSelectDiffListDialog(self.target_id);
       });
       $("#context-menu-inspect").on("click", function(e) {
         e.preventDefault();
@@ -757,7 +789,7 @@ var Narou = (function() {
     },
 
     openEditor: function() {
-      var ids = Action.prototype._getSelectedIds.call(this);
+      var ids = Action.prototype._getSelectedIds.call(this, arguments);
       if (ids.length === 0) return;
       this._createEditorField(ids, function(field) {
         bootbox.dialog({

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

@@ -266,6 +266,7 @@ $(document).ready(function() {
       table.draw(false);
     },
     language: {
+      //lengthMenu: "_MENU_ 件分表示　<span id='icon-refresh-table' class='glyphicon glyphicon-repeat'></span>",
       lengthMenu: "_MENU_ 件分表示",
       zeroRecords: "データがひとつもないか、処理中です",
       info: "Page _PAGE_ of _PAGES_",
@@ -295,8 +296,8 @@ $(document).ready(function() {
   var action = new Narou.Action(table);
   var notification = Narou.Notification.instance();
   var stream_console = new Narou.Console(notification);
-  var context_menu = new Narou.ContextMenu(action, notification);
   var tag = new Narou.Tag(table);
+  var context_menu = new Narou.ContextMenu(action, notification, tag);
 
   notification.on("table.reload", function() {
     // リロードする前に現在の状態を保存
@@ -865,6 +866,12 @@ $(document).ready(function() {
     placement: "bottom",
   });
 
+  $("#icon-refresh-table").tooltip({
+    title: "リストを再読み込み",
+    animation: false,
+    container: "body",
+  });
+
   /*
    * ボタンを一時的に非アクティブ化
    */
@@ -1014,6 +1021,14 @@ $(document).ready(function() {
     action.backup();
   });
 
+  /*
+   * アイコン
+   *   ○件表示の横のリロードアイコン
+   */
+  $("#icon-refresh-table").on("click", function(e) {
+    notification.trigger("table.reload");
+  });
+
   /*
    * ショートカット設定
    * http://www.openjs.com/scripts/events/keyboard_shortcuts/index.php

data/lib/web/pushserver.rb

@@ -4,6 +4,7 @@
 #
 
 require "json"
+require "singleton"
 require_relative "web-socket-ruby/lib/web_socket"
 require_relative "../eventable"
 

data/lib/web/settingmessages.rb

@@ -7,9 +7,12 @@ module Narou
   # WEB UI > 環境設定画面で表示する各項目の説明
   # ここになければ元々の説明が表示される
   SETTING_VARIABLES_WEBUI_MESSAGES = {
-    "convert.multi-device" => "複数の端末用に同時に変換する。deviceよりも優先される。\n端末名をカンマ区切りで入力(" + Device::DEVICES.keys.join(", ") + ")\nただのEPUBを出力したい場合はepubを指定",
-    "device" => "変換、送信対象の端末(" + Device::DEVICES.keys.join(", ") + ")",
-    "difftool" => "Diffで使うツールのパスを指定する\n※WEB UIでは使われません"
+    "convert.multi-device" => "複数の端末用に同時に変換する。deviceよりも優先される。\nただのEPUBを出力したい場合はepubを指定",
+    "device" => "変換、送信対象の端末",
+    "difftool" => "Diffで使うツールのパスを指定する\n※WEB UIでは使われません",
+    "update.sort-by" => "アップデートを指定した項目順で行う",
+    "default.title_date_align" => "enable_add_date_to_title で付与する日付の位置",
+    "force.title_date_align" => "enable_add_date_to_title で付与する日付の位置",
   }
 end
 

data/lib/web/views/diff_list.haml

@@ -0,0 +1,11 @@
+.diff-list-container
+  .title #{@list[:title]}
+  .list{ "data-diff-target" => @list[:id] }
+    - @list[:list].each do |data|
+      - next if data[:objects].empty?
+      .item{ "data-diff-item-number" => data[:number] }
+        .date #{data[:time].strftime("%Y/%m/%d %H:%M")}
+        %ul.subtitles
+          - data[:objects].each do |object|
+            %li
+              第#{object[:index]}部分　#{object[:subtitle]}

data/lib/web/views/edit_replace_txt.haml

@@ -0,0 +1,59 @@
+:javascript
+  local_initialize_functions.push(function($) {
+    var tooltip_opt = {
+      animation: false,
+      container: "body",
+    };
+    // replace.txt 設定パネル
+    $(".btn-replace-remove").on("click", function(e) {
+      e.preventDefault();
+      if ($(".replace-pattern-tr").size() === 1) {
+        // 入力欄のtrが全部なくなると追加出来なくなるので、消す前に1個追加しておく
+        $("#btn-replace-add").trigger("click");
+      }
+      $(this).tooltip("destroy").closest("tr").remove();
+    });
+    $blank_tr = $(".replace-pattern-tr:last").clone(true);   // 読み込み直後の末尾は空なので流用
+    $("#btn-replace-add").on("click", function(e) {
+      e.preventDefault();
+      var $clone = $blank_tr.clone(true);
+      $clone.find("button").tooltip(tooltip_opt);
+      $(".replace-pattern-tr:last").after($clone);
+      $(this).tooltip("hide");
+    });
+    $("[data-toggle=remove-tooltip]").tooltip(tooltip_opt);
+  });
+
+#replace-panel.panel.panel-settings{ class: @replace_panel_var[:panel_class] }
+  .panel-heading
+    = @replace_panel_var[:title]
+  .panel-body{ class: @replace_panel_var[:body_class] }
+    = @replace_panel_var[:body].join("<br>")
+  .list-group
+    .list-group-item.form-group
+      .list-group-item-text
+        %table#replace-txt-table
+          %thead
+            %tr
+              %td 対象文字列
+              %td &nbsp;
+              %td 置き換える文字列
+              %td &nbsp;
+          %tbody
+            -# 末尾に新規入力用の空要素を追加
+            - (@replace_pattern + [["",""]]).each do |pattern|
+              %tr.replace-pattern-tr
+                %td
+                  %input{type:"text", name:"replace_pattern[][left]", value:pattern[0], class:"form-control"}
+                %td
+                  %span.glyphicon.glyphicon-chevron-right
+                %td
+                  %input{type:"text", name:"replace_pattern[][right]", value:pattern[1], class:"form-control"}
+                %td
+                  %button.btn-replace-remove.btn.btn-default(data-toggle="remove-tooltip" title="削除" data-placement="right")
+                    %span.glyphicon.glyphicon-remove
+            %tr
+              %td(colspan=4)
+                %button#btn-replace-add.btn.btn-default(data-toggle="tooltip" title="１行追加" data-placement="right")
+                  %span.glyphicon.glyphicon-plus
+

data/lib/web/views/help.haml

@@ -1,5 +1,5 @@
 :javascript
-  var local_initialize_function = function($) {
+  local_initialize_functions.push(function($) {
     $("[data-toggle=tooltip]").tooltip({
       animation: false,
       container: "body",
@@ -34,7 +34,7 @@
     }
 
     $("#bookmarklet").attr("href", createBookmarkletStrings(bookmarklet));
-  };
+  });
 
 .navbar.navbar-default.navbar-fixed-top(role="navigation")
   .container

data/lib/web/views/index.haml

@@ -218,20 +218,22 @@
 %ul#context-menu.dropdown-menu(role="menu")
   %li#context-menu-setting
     %a(href="#") 小説の変換設定
+  %li#context-menu-diff
+    %a(href="#" data-move-to="top") 差分を表示
+  %li#context-menu-edit-tag
+    %a(href="#") タグを編集
+  %li#context-menu-freeze-toggle
+    %a(href="#") 凍結 or 解凍
   %li#context-menu-update
     %a(href="#") 更新
   %li#context-menu-send
     %a(href="#") 送信
-  %li#context-menu-freeze-toggle
-    %a(href="#") 凍結 or 解凍
   %li#context-menu-remove
     %a(href="#") 削除
   %li#context-menu-remove-with-file
     %a(href="#") 完全に削除
   %li#context-menu-convert
     %a(href="#") 変換
-  %li#context-menu-diff
-    %a(href="#" data-move-to="top") 差分表示
   %li#context-menu-inspect
     %a(href="#") 調査状況ログを表示
   %li#context-menu-folder

data/lib/web/views/layout.haml

@@ -12,6 +12,7 @@
     %link{:href => "//cdn.datatables.net/plug-ins/725b2a2115b/integration/bootstrap/3/dataTables.bootstrap.css", :rel => "stylesheet"}/
     %link{:href => "//cdn.datatables.net/colreorder/1.1.2/css/dataTables.colReorder.css", :rel => "stylesheet"}/
     %link{:href => "//cdn.datatables.net/colvis/1.1.1/css/dataTables.colVis.css", :rel => "stylesheet"}/
+    %link{:href => "//cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.6.5/css/bootstrap-select.min.css", :rel => "stylesheet"}/
     %link{:href => "/resources/perfect-scrollbar.min.css", :rel => "stylesheet"}/
     %link{:href => "/resources/toggle-switch.css", :rel => "stylesheet"}/
     %link{:href => "/style.css", :rel => "stylesheet"}/
@@ -19,6 +20,9 @@
     /[if lt IE 9]
       <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
       <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    :javascript
+      var local_initialize_functions = [];
+      var slideNavbar;
   %body
     - if session[:alert]
       - message, type = session[:alert]
@@ -32,6 +36,7 @@
     %script{:src => "//cdn.datatables.net/1.10.2/js/jquery.dataTables.min.js"}
     %script{:src => "//cdn.datatables.net/plug-ins/725b2a2115b/integration/bootstrap/3/dataTables.bootstrap.js"}
     %script{:src => "//cdn.datatables.net/colreorder/1.1.2/js/dataTables.colReorder.min.js"}
+    %script{:src => "//cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.6.5/js/bootstrap-select.min.js"}
     %script{:src => "/resources/dataTables.colVis.js"}
     %script{:src => "/resources/bootbox.min.js"}
     %script{:src => "/resources/shortcut.js"}
@@ -42,8 +47,12 @@
     %script{:src => "/resources/narou.library.js"}
     %script{:src => "/resources/common.ui.js"}
     :javascript
-      var slideNavbar = $(".navbar-collapse").slideNavbar();
-      if (typeof local_initialize_function !== "undefined") local_initialize_function($);
+      $(document).ready(function($) {
+        slideNavbar = $(".navbar-collapse").slideNavbar();
+        $.each(local_initialize_functions, function() {
+          this($);
+        });
+      });
     - if env["PATH_INFO"] == "/"
       %script{:src => "/resources/narou.ui.js"}