narou 3.2.4 → 3.2.5

data/lib/command/setting.rb

@@ -383,6 +383,13 @@ module Command
                 "      ※注意：存在しないフォルダだとエラーになる",
           tab: :general
         },
+        "convert.copy-to-grouping" => {
+          type: :multiple,
+          help: "copy-toで指定したフォルダの中で更に指定の各種フォルダにまとめる",
+          select_keys: %w(device site),
+          select_summaries: %w(端末毎にまとめる 掲載サイト毎にまとめる),
+          tab: :general
+        },
         "convert.copy_to" => {
           type: :directory, help: "copy-toの昔の書き方(非推奨)", invisible: true
         },
@@ -421,10 +428,6 @@ module Command
           select_summaries: Device::DEVICES.values.map { |d| d::DISPLAY_NAME },
           tab: :general
         },
-        "convert.copy-to-grouping" => {
-          type: :boolean, help: "copy-toで指定したフォルダの中で更に端末毎にフォルダを振り分ける",
-          tab: :general
-        },
         "convert.filename-to-ncode" => {
           type: :boolean, help: "書籍ファイル名をNコードで出力する(ドメイン_Nコードの形式)",
           tab: :general

data/lib/converterbase.rb

@@ -474,6 +474,13 @@ class ConverterBase
     end
   end
 
+  def convert_prolonged_sound_mark_to_dash(data)
+    return unless @setting.enable_prolonged_sound_mark_to_dash
+    data.gsub!(/(ー{2,})/) do |match|
+      "―" * match.length
+    end
+  end
+
   #
   # 小説のルールに沿うように変換
   #
@@ -508,8 +515,9 @@ class ConverterBase
       end
     else
       data.gsub!(ENGLISH_SENTENCES_CHARACTERS) do |match|
-        if match.split(" ").size >= 2 \
-           || (match.length >= ENGLISH_SENTENCES_MIN_LENGTH && match.match(/[a-z]/i))
+        if match.split(" ").size >= 2 ||
+            (match.length >= ENGLISH_SENTENCES_MIN_LENGTH && match.match(/[a-z]/i)) ||
+            @setting.disable_alphabet_word_to_zenkaku
           @english_sentences << match
           "［＃英文＝#{@english_sentences.size - 1}］"
         else
@@ -858,7 +866,7 @@ class ConverterBase
   def auto_join_line(data)
     # 次の行の冒頭が開き記号だったら意図的な改行だと判断して連結しない
     # 行頭の全角スペースが２個以上の場合も連結しない
-    data.gsub!(/([^、])、\n　([^「『(（【<＜〈《≪・■…‥―　])/, "\\1、\\2")
+    data.gsub!(/([^、])、\n　([^「『(（【<＜〈《≪・■…‥―　１-９一-九])/, "\\1、\\2")
   end
 
   CHARACTER_OF_RUBY = "一-龠Ａ-Ｚａ-ｚA-Za-z"
@@ -1164,6 +1172,7 @@ class ConverterBase
     convert_fraction_and_date(data)
     modify_kana_ni_to_kanji_ni(data)
     convert_dakuten_char_to_font(data)
+    convert_prolonged_sound_mark_to_dash(data)
   end
 
   def before_convert(io)
@@ -1428,20 +1437,4 @@ class ConverterBase
     end
     result
   end
-
-  def dash_image_relative_paths(base_dir, output_text_dir)
-    DASH_FILES.map do |name|
-      pathname = Pathname(File.join(base_dir, name))
-      pathname.relative_path_from(Pathname(output_text_dir)).to_s
-    end
-  end
-
-  def copy_dash_images_to_local_setting_dir
-    DASH_FILES.each do |name|
-      path = File.join(Narou.local_setting_dir, name)
-      unless File.exist?(path)
-        FileUtils.copy(File.join(Narou.get_preset_dir, name), path)
-      end
-    end
-  end
 end

data/lib/downloader.rb

@@ -160,6 +160,11 @@ class Downloader
     YAML.load_file(File.join(archive_path, TOC_FILE_NAME))
   end
 
+  def self.get_toc_by_target(target)
+    dir = Downloader.get_novel_data_dir_by_target(target)
+    get_toc_data(dir)
+  end
+
   #
   # 指定の小説の目次ページのURLを取得する
   #
@@ -401,6 +406,10 @@ class Downloader
         # あらすじが更新されている場合
         @stream.puts "#{id_and_title} のあらすじが更新されています"
         :ok
+      when old_toc["author"] != latest_toc["author"]
+        # 作者名が更新されている場合
+        @stream.puts "#{id_and_title} の作者名が更新されています"
+        update_database
       else
         :none
       end
@@ -780,7 +789,7 @@ class Downloader
       "subtitles" => subtitles
     }
     toc_objects
-  rescue OpenURI::HTTPError, Errno::ECONNRESET => e
+  rescue OpenURI::HTTPError, Errno::ECONNRESET, Errno::ETIMEDOUT, Net::OpenTimeout => e
     raise if through_error   # エラー処理はしなくていいからそのまま例外を受け取りたい時用
     if e.message.include?("404")
       @stream.error "小説が削除されているか非公開な可能性があります"
@@ -1131,7 +1140,7 @@ narou s download.wait-steps=5
       open(url, "r:#{@setting["encoding"]}", open_uri_options) do |fp|
         raw = Helper.pretreatment_source(fp.read, @setting["encoding"])
       end
-    rescue OpenURI::HTTPError => e
+    rescue OpenURI::HTTPError, Errno::ECONNRESET, Errno::ETIMEDOUT, Net::OpenTimeout => e
       if e.message =~ /^503/
         if retry_count == 0
           @stream.error "上限までリトライしましたがファイルがダウンロード出来ませんでした"

data/lib/html.rb

@@ -111,4 +111,8 @@ class HTML
   def delete_ruby_tag(text = @string)
     text.gsub(%r!<\/?(?:ruby|rb|rp|rt)>!, "")
   end
+
+  def ln_to_br(text = @string)
+    text.to_s.gsub("\n", "<br>")
+  end
 end

data/lib/narou.rb

@@ -338,9 +338,9 @@ module Narou
   end
   memoize :kindlegen_path
 
-  def line_height
+  def line_height(default: LINE_HEIGHT_DEFAULT)
     global_setting = Inventory.load("global_setting", :global)
-    global_setting["line-height"] || LINE_HEIGHT_DEFAULT
+    global_setting["line-height"] || default
   end
 
  end

data/lib/novelsetting.rb

@@ -6,6 +6,7 @@
 require "fileutils"
 require_relative "ini"
 require_relative "downloader"
+require_relative "converterbase"
 
 class NovelSetting
   INI_NAME = "setting.ini"
@@ -256,7 +257,13 @@ class NovelSetting
       name: "enable_alphabet_force_zenkaku",
       type: :boolean,
       value: false,
-      help: "アルファベットを強制的に全角にする。falseの場合英文は半角、それ以外は全角になる"
+      help: "アルファベットを強制的に全角にする。false の場合は英文は半角、#{::ConverterBase::ENGLISH_SENTENCES_MIN_LENGTH}文字未満の英単語は全角になる"
+    },
+    {
+      name: "disable_alphabet_word_to_zenkaku",
+      type: :boolean,
+      value: false,
+      help: "enable_alphabet_force_zenkaku が false の場合に、#{::ConverterBase::ENGLISH_SENTENCES_MIN_LENGTH}文字未満の英単語を全角にする機能を抑制する。英文中にルビがふってあり、英文ではなく英単語と認識されて全角化されてしまう場合などに使用"
     },
     {
       name: "enable_half_indent_bracket",
@@ -450,6 +457,12 @@ $ntag 小説のタグをカンマ区切りにしたもの
       value: false,
       help: "完結済み小説のタイトルに(完結)と表示する"
     },
+    {
+      name: "enable_prolonged_sound_mark_to_dash",
+      type: :boolean,
+      value: false,
+      help: "長音記号を２つ以上つなげている場合に全角ダッシュに置換する"
+    },
     {
       name: "cut_old_subtitles",
       type: :integer,

data/lib/version.rb

@@ -4,5 +4,5 @@
 #
 
 module Narou
-  VERSION = "3.2.4"
+  VERSION = "3.2.5"
 end

data/lib/web/appserver.rb

@@ -419,6 +419,42 @@ class Narou::AppServer < Sinatra::Base
     end
   end
 
+  get "/novels/:id/author_comments" do
+    downloader = Downloader.new(@id)
+    toc = downloader.load_toc_file
+    @comments = []
+    introductions_count = 0
+    postscripts_count = 0
+    toc["subtitles"].each do |sub|
+      begin
+        element = YAML.load_file(downloader.create_section_file_path(sub))["element"]
+        data_type = element["data_type"] || "text"
+        introduction = element["introduction"] || ""
+        postscript = element["postscript"] || ""
+        if data_type == "html"
+          html = HTML.new
+          html.strip_decoration_tag = true
+          html.string = introduction
+          introduction = html.to_aozora
+          html.string = postscript
+          postscript = html.to_aozora
+        end
+        @comments.push(
+          sub: sub,
+          introduction: introduction,
+          postscript: postscript
+        )
+        introductions_count += 1 unless introduction.empty?
+        postscripts_count += 1 unless postscript.empty?
+      rescue Errno::ENOENT
+      end
+    end
+    total = toc["subtitles"].count.to_f
+    @introductions_ratio = (introductions_count / total * 100).round(2)
+    @postscripts_ratio = (postscripts_count / total * 100).round(2)
+    haml :"novels/author_comments"
+  end
+
   get "/notepad" do
     @title = "メモ帳"
     haml :notepad
@@ -850,6 +886,14 @@ class Narou::AppServer < Sinatra::Base
     ""
   end
 
+  get "/api/story" do
+    id = params["id"] or pass
+    toc = Downloader.get_toc_by_target(id)
+    story = toc["story"] || ""
+    html = HTML.new
+    json title: toc["title"], story: html.ln_to_br(story.strip)
+  end
+
   # -------------------------------------------------------------------------------
   # 一部分に表示するためのHTMLを取得する(パーシャル)
   # -------------------------------------------------------------------------------

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

@@ -58,6 +58,10 @@ var Narou = (function() {
    * ユーティリティ / Utility
    *************************************************************************/
   $.extend(Narou, {
+    // windows: はみ出したらカーソル位置がメニューの下端になるよう表示
+    // mac: はみ出したらメニュー下端とブラウザ下端が同じになるようにずれる
+    popupMenuStyle: storage.get("menu_style") || "windows",
+
     registerCloseHandler: function(callback) {
       // Chrome, IEですぐにclickイベントをバインドすると、メニュー表示時の
       // クリックに反応してしまう（表示上のズレによって、クリック時のマウス
@@ -70,17 +74,30 @@ var Narou = (function() {
     },
 
     popupMenu: function(menu_id, pos, close_menu_handler) {
-      var $menu = $(menu_id);
-      var left = $(window).width() < pos.x - $(document).scrollLeft() + $menu.outerWidth() ?
-                                     pos.x - $menu.outerWidth() : pos.x;
-      var top = $(window).height() < pos.y - $(document).scrollTop() + $menu.outerHeight() ?
-                                     pos.y - $menu.outerHeight() : pos.y;
-      $menu.show().offset({
-        left: left, top: top
-      });
+      var menu = $(menu_id);
+      var offset = this._calcMenuOffset(pos, menu);
+      menu.show().offset(offset);
       Narou.registerCloseHandler(close_menu_handler);
     },
 
+    _calcMenuOffset: function(pos, menu) {
+      var left = pos.x, top = pos.y;
+      if ($(window).width() < pos.x - $(document).scrollLeft() + menu.outerWidth()) {
+        left -= menu.outerWidth();
+      }
+      if ($(window).height() < pos.y - $(document).scrollTop() + menu.outerHeight()) {
+        if (this.popupMenuStyle === "windows") {
+          top -= menu.outerHeight();
+        }
+        else {
+          top -= (pos.y - $(document).scrollTop() + menu.outerHeight()) - $(window).height() + 5;
+        }
+      }
+      return {
+        left: left, top: top
+      };
+    },
+
     // http://qiita.com/osakanafish/items/c64fe8a34e7221e811d0
     formatDate: function(date, format) {
       if (!format) format = 'YYYY-MM-DD hh:mm:ss.SSS';
@@ -128,6 +145,10 @@ var Narou = (function() {
       }
       return num;
     },
+
+    tableReload: function() {
+      Notification.instance().trigger("table.reload");
+    },
   });
 
   /*************************************************************************
@@ -364,7 +385,7 @@ var Narou = (function() {
     _default_commands: [
       "setting", "diff", "edit_tag", "freeze_toggle", "update",
       "send", "remove", "convert", "inspect", "folder", "backup",
-      "mail"
+      "mail", "author_comments"
     ],
 
     items: [
@@ -383,6 +404,7 @@ var Narou = (function() {
       { label: "バックアップを作成", command: "backup" },
       { label: "再ダウンロード", command: "download_force" },
       { label: "メールで送信", command: "mail" },
+      { label: "作者コメント表示", command: "author_comments" },
     ],
 
     events: {
@@ -465,6 +487,11 @@ var Narou = (function() {
           this.action.mail(this.target_id);
         }.bind(this));
       },
+
+      author_comments: function() {
+        var authorCommentPath = "/novels/" + this.target_id + "/author_comments";
+        window.open(authorCommentPath);
+      },
     },
 
     initializeMenuEvents: function() {
@@ -873,6 +900,42 @@ var Narou = (function() {
     ejectNow: function() {
       $.post("/api/eject", { enqueue: false });
     },
+
+    displayStory: function(button, targetId) {
+      $.get("/api/story", { id: targetId }, function(json) {
+        button.popover({
+          container: "body",
+          placement: "left",
+          trigger: "focus",
+          html: true,
+          title: json.title,
+          content: json.story
+        });
+        button.popover("show");
+      });
+    },
+  });
+
+  /*************************************************************************
+   * メニューアクション
+   *************************************************************************/
+  var MenuAction = Narou.MenuAction = function() {
+  };
+
+  $.extend(MenuAction.prototype, {
+    toggleNovelListWide: function() {
+      $("#novel-list-container").
+        toggleClass("container").
+        toggleClass("container-fluid");
+      $("#action-view-novel-list-wide").toggleClass("active");
+    },
+
+    novelListToWiden: function() {
+      var isWide = storage.get("novel_list_is_wide");
+      storage.set("novel_list_is_wide", !isWide);
+      storage.save();
+      this.toggleNovelListWide();
+    },
   });
 
   /*************************************************************************

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

@@ -25,6 +25,7 @@ $(document).ready(function() {
         toc_url: false, novel_type: false, tags: false, status: false, menu: true,
         download: true, folder: false, update_button: false, general_lastup: false,
         general_all_no: false, last_check_date: false, length: false, average_length: false,
+        story: false,
       }
       // PC
     : {
@@ -32,6 +33,7 @@ $(document).ready(function() {
         toc_url: true, novel_type: false, tags: true, status: true, menu: true,
         download: false, folder: true, update_button: true, general_lastup: true,
         general_all_no: false, last_check_date: false, length: false, average_length: false,
+        story: false,
       });
 
   $.fn.dataTable.Api.register("fireChangeSelect()", function() {
@@ -91,10 +93,6 @@ $(document).ready(function() {
     });
   }
 
-  function tableReload() {
-    notification.trigger("table.reload");
-  }
-
   /*
    * 凍結の表示状態制御
    */
@@ -168,12 +166,17 @@ $(document).ready(function() {
     order: [[ 2, "desc" ]],   // 初期状態は「最新話掲載日」でソート
     columns: [
       // ID
-      { title: "ID",
-        data: "id", className: "column-id text-center", visible: cell_visible.id },
+      {
+        title: "ID",
+        data: "id", className: "column-id text-center", visible: cell_visible.id,
+        width: "25px"
+      },
       // UPDATEした日時
-      { title: "更新日",
+      {
+        title: "更新日",
         data: "last_update", className: "text-center",
         orderSequence: [ "desc", "asc" ], visible: cell_visible.last_update,
+        width: "35px",
         render: function(data, type, row) {
           if (type === "display" || type === "filter") {
             var now = new Date;
@@ -204,6 +207,7 @@ $(document).ready(function() {
         title: "最新話<br>掲載日",
         data: "general_lastup", className: "text-center",
         orderSequence: [ "desc", "asc" ], visible: cell_visible.general_lastup,
+        width: "35px",
         render: function(data, type, row) {
           if (type === "display" || type === "filter") {
             if (!data) return "";
@@ -237,6 +241,7 @@ $(document).ready(function() {
         title: "更新チェ<br>ック日",
         data: "last_check_date", className: "text-center",
         orderSequence: [ "desc", "asc" ], visible: cell_visible.last_check_date,
+        width: "35px",
         render: function(data, type, row) {
           if (type === "display" || type === "filter") {
             if (!data)
@@ -254,11 +259,16 @@ $(document).ready(function() {
         }
       },
       // タイトル
-      { title: "タイトル",
-        data: "title", visible: cell_visible.title },
+      {
+        title: "タイトル",
+        data: "title", visible: cell_visible.title,
+        width: "300px",
+      },
       // 作者名
-      { title: "作者名",
+      {
+        title: "作者名",
         data: "author", visible: cell_visible.author,
+        width: "100px",
         render: function(author, type, row) {
           if (author && type === "display") {
             return sprintf(
@@ -270,8 +280,10 @@ $(document).ready(function() {
         }
       },
       // 掲載サイト
-      { title: "掲載",
+      {
+        title: "掲載",
         data: "sitename", visible: cell_visible.sitename,
+        width: "60px",
         render: function(sitename, type, row) {
           if (sitename && type === "display") {
             return sprintf(
@@ -288,7 +300,7 @@ $(document).ready(function() {
         orderSequence: [ "desc", "asc" ], visible: cell_visible.novel_type },
       // タグ
       { title: "タグ",
-        data: "tags", orderSequence: [ "desc", "asc" ], width: "70px",
+        data: "tags", orderSequence: [ "desc", "asc" ], width: "80px",
         visible: cell_visible.tags },
       // 話数
       { title: "話数",
@@ -328,13 +340,17 @@ $(document).ready(function() {
         }
       },
       // 状態
-      { title: "状態",
-        data: "status", visible: cell_visible.status },
+      {
+        title: "状態",
+        data: "status", visible: cell_visible.status,
+        width: "40px"
+      },
       // 掲載URL
       {
         title: "リンク",
         data: "toc_url", className: "text-center",
         visible: cell_visible.toc_url,
+        width: "25px",
         render: function(data, type, row) {
           if (!data) return "";
 
@@ -359,11 +375,14 @@ $(document).ready(function() {
       {
         title: "ＤＬ",
         data: "download", className: "text-center", orderable: false,
-        searchable: false, visible: cell_visible.download },
+        searchable: false, visible: cell_visible.download,
+        width: "25px",
+      },
       {
         title: "保存先",
         data: "folder", className: "text-center", orderable: false,
         searchable: false, visible: cell_visible.folder,
+        width: "25px",
         defaultContent: '<button class="btn btn-default btn-xs">' +
                         '<span class="glyphicon glyphicon-folder-open"></span></button>',
         createdCell: function(td, cellData, rowData, rowIndex, colIndex) {
@@ -384,6 +403,7 @@ $(document).ready(function() {
         searchable: false, visible: cell_visible.update_button,
         defaultContent: '<button class="btn btn-default btn-xs">' +
                         '<span class="glyphicon glyphicon-refresh"></span></button>',
+        width: "25px",
         createdCell: function(td, cellData, rowData, rowIndex, colIndex) {
           $(td).children("button")
             .data("targetId", rowData.id)
@@ -396,12 +416,34 @@ $(document).ready(function() {
         },
         render: function() {}
       },
+      // あらすじ
+      {
+        title: "あらすじ",
+        data: "story", visible: cell_visible.story, className: "text-center",
+        searchable: false, orderable: false,
+        width: "25px",
+        render: function () {},
+        defaultContent: '<button class="btn btn-default btn-xs n-popover">' +
+                        '<span class="glyphicon glyphicon-info-sign"></span></button>',
+        createdCell: function(td, cellData, rowData, rowIndex, colIndex) {
+          var popoverToggled = false;
+          var beforeTargetId = null;
+          $(td).children("button")
+            .data("targetId", rowData.id)
+            .one("click", function(e) {
+              var $this = $(this);
+              var targetId = $this.data("targetId");
+              action.displayStory($this, targetId);
+            })
+        },
+      },
       {
         title: "個別",
         data: "menu", className: "text-center",
         defaultContent: '<button class="btn btn-default btn-xs">' +
                         '<span class="glyphicon glyphicon-option-horizontal"></span></button>',
         visible: cell_visible.menu,
+        width: "25px",
         createdCell: function(td, cellData, rowData, rowIndex, colIndex) {
           $(td).children("button")
             .data("targetId", rowData.id)
@@ -494,13 +536,14 @@ $(document).ready(function() {
         // initComplete イベントが発火する前に一度この reorderCallback が発火されるので、
         // 無駄なリロードをしないように初期化後のみ有効にする
         if (datatables_init_completed) {
-          tableReload();
+          Narou.tableReload();
         }
       },
     },
   });
 
   var action = new Narou.Action(table);
+  var menuAction = new Narou.MenuAction();
   var notification = Narou.Notification.instance();
   var stream_console = new Narou.Console;
   var search = Narou.Search.get(table);
@@ -565,6 +608,13 @@ $(document).ready(function() {
       $(".eject-group").addClass("hide");
   });
 
+  /*
+   * 小説リストの幅を変更
+   */
+  if (storage.get("novel_list_is_wide")) {
+    menuAction.toggleNovelListWide();
+  }
+
   /*************************************************************
    * 小説の選択関係
    *************************************************************/
@@ -824,6 +874,7 @@ $(document).ready(function() {
           table.fireChangeSelect();
           $("#rect-select-menu").hide();
           selected_rect_element.hide();
+          $(".n-popover").blur();
         };
         if (not_clicked_yet) {
           // 範囲選択開始
@@ -938,6 +989,16 @@ $(document).ready(function() {
     colvis._fnCollectionShow();
   });
 
+  /*
+   * メニュー
+   *   表示＞小説リストの幅を広げる
+   */
+  $("#action-view-novel-list-wide").on(click_event_name, function(e) {
+    e.preventDefault();
+    slideNavbar.slide();
+    menuAction.novelListToWiden();
+  });
+
   /*
    * メニュー
    *   表示＞凍結中以外を表示
@@ -948,7 +1009,7 @@ $(document).ready(function() {
     $(this).toggleClass("active");
     toggleVisibilityNonFrozen();
     saveVisibilityFrozen();
-    tableReload();
+    Narou.tableReload();
   });
 
   /*
@@ -961,7 +1022,7 @@ $(document).ready(function() {
     $(this).toggleClass("active");
     toggleVisibilityFrozen();
     saveVisibilityFrozen();
-    tableReload();
+    Narou.tableReload();
   });
 
   /*
@@ -1011,6 +1072,39 @@ $(document).ready(function() {
       $("#footer-navbar").addClass("hide");
   });
 
+  /*
+   * メニュー
+   *   表示＞個別メニューの表示スタイルを選択
+   */
+  var _menuStyleRenderer = _.template(
+    (function () {/*
+<div class="radio"><label>
+<input type="radio" value="windows" name="select-menu-style" <% if (style == "windows") { %>checked<% } %>>
+Windows スタイル：<br>メニューが画面外にはみ出そうとしたら、カーソルの上側に表示する
+</label></div>
+<div class="radio"><label>
+<input type="radio" value="mac" name="select-menu-style" <% if (style == "mac") { %>checked<% } %>>
+Mac スタイル：<br>メニューが画面外にはみ出そうとしたら、メニューがはみ出ないよう上にずれる
+</label></div>
+    */}).toString().replace(/(\n)/g, '').split('*')[1]
+  );
+
+  $("#action-view-select-menu-style").on(click_event_name, function(e) {
+    e.preventDefault();
+    slideNavbar.slide();
+    var menuStyle = storage.get("menu_style") || "windows";
+    var box = bootbox.alert({
+      title: "個別メニューの表示スタイルを選択",
+      message: _menuStyleRenderer({ style: menuStyle }),
+      callback: function() {
+        menuStyle = box.find("input:checked").val();
+        storage.set("menu_style", menuStyle);
+        storage.save();
+        Narou.popupMenuStyle = menuStyle;
+      }
+    });
+  });
+
   /*
    * メニュー
    *   表示＞表示設定を全てリセット
@@ -1464,7 +1558,7 @@ $(document).ready(function() {
    *   ○件表示の横のリロードアイコン
    */
   $("#icon-refresh-table").on("click", function(e) {
-    tableReload();
+    Narou.tableReload();
   });
 
   /*
@@ -1497,6 +1591,13 @@ $(document).ready(function() {
         shortcut.add(keys[i], callback, options);
       }
     };
+
+    var click = function(id) {
+      return function() {
+        $(id).trigger("click");
+      };
+    };
+
     add("Ctrl+A", "Meta+A", function() { action.selectView(); });
     add("Shift+A", function() { action.selectAll(); });
     add("Ctrl+Shift+A", "Meta+Shift+A", function() { action.selectClear(); });
@@ -1511,9 +1612,13 @@ $(document).ready(function() {
         action.selectClear();
       }
     });
-    add("S", function() { $("#action-select-mode-single").trigger("click"); });
-    add("R", function() { $("#action-select-mode-rect").trigger("click"); });
-    add("H", function() { $("#action-select-mode-hybrid").trigger("click"); });
+    add("S", click("#action-select-mode-single"));
+    add("R", click("#action-select-mode-rect"));
+    add("H", click("#action-select-mode-hybrid"));
+    add("W", click("#action-view-novel-list-wide"));
+    add("F", click("#action-view-frozen"));
+    add("Shift+F", click("#action-view-nonfrozen"));
+    add("T", click("#action-tag-edit"));
   };
   if (!touchable_device) {
     initialize_shortcut();