honyomi 0.2.0 → 1.0.0

data/lib/honyomi/web/app.rb

@@ -1,8 +1,17 @@
+# -*- coding: utf-8 -*-
 require 'haml'
 require 'honyomi/database'
 require 'honyomi/util'
 require 'sinatra'
-require 'sinatra/reloader' if ENV['SINATRA_RELOADER']
+if ENV['SINATRA_RELOADER']
+  require 'sinatra/reloader'
+  also_reload '../../**/*.rb'
+end
+
+SEARCH_RPAGE = 20
+
+BOOKMARK_RPAGE = 20
+BOOKMARK_COMMENT_LENGTH = 255
 
 include Honyomi
 
@@ -22,11 +31,23 @@ get '/' do
   end
 end
 
+get '/help' do
+  haml :help
+end
+
 post '/search' do
+  q = Query.new(params[:query])
+
   if params[:book_id] && !@params[:book_id].empty?
-    redirect "/v/#{@params[:book_id]}?query=#{escape(params[:query])}"
+    if q.key['book'][0] || q.key['title'][0]
+      redirect "/?query=#{escape(q.src)}"
+    elsif q.jump_page_no
+      redirect "/v/#{@params[:book_id]}?page=#{q.jump_page_no}&query=#{escape(q.src)}"
+    else
+      redirect "/v/#{@params[:book_id]}?query=#{escape(q.src)}"
+    end
   else
-    redirect "/?query=#{escape(params[:query])}"
+    redirect "/?query=#{escape(q.src)}"
   end
 end
 
@@ -47,6 +68,8 @@ get '/v/:id' do
     else
       if @params[:query] && !@params[:query].empty?
         search_book_home(book)
+      elsif @params[:b] == '1'
+        book_bookmark(book)
       else
         book_home(book)
       end
@@ -54,24 +77,56 @@ get '/v/:id' do
   end
 end
 
+post '/command' do
+  @database = $database
+
+  case params[:kind]
+  when 'favorite'
+    page = @database.pages["#{params[:id].to_i}:#{params[:page_no].to_i}"]
+
+    if params[:favorited] == 'true'
+      @database.add_bookmark(page)
+    else
+      @database.delete_bookmark(page)
+    end
+    ""
+
+  when 'favorite-update'
+    bm = @database.update_bookmark_comment(params[:id].to_i, params[:page_no].to_i, params[:comment])
+    Util.render_bookmark_comment_to_html(bm)
+
+  when 'title-form-save'
+    @database.change_book(params[:id].to_i,
+                          {
+                            title: params[:title],
+                            author: params[:author],
+                            url: params[:url],
+                          })
+    ""
+  end
+end
+
 helpers do
 
   def home
-    @header_info = %Q|#{@database.books.size} books, #{@database.pages.size} pages.|
-
-    r = @database.books.map { |book|
-      <<EOF
+    if @params[:b] == '1'
+      @header_info = %Q|<a href="/">#{@database.books.size}</a> books, <strong>#{@database.bookmarks.size}</strong> bookmarks.|
+      render_bookmarks(@database.bookmarks, [{key: "timestamp", order: "descending"}])
+    else
+      @header_info = %Q|<strong>#{@database.books.size}</strong> books, <a href="/?b=1">#{@database.bookmarks.size}</a> bookmarks.|
+      r = @database.books.map { |book|
+        <<EOF
 <li>#{book.id}: <a href="/v/#{book.id}">#{book.title}</a> (#{book.page_num}P)</li>
 EOF
-    }.reverse
+      }.reverse
 
-    @content = <<EOF
+      @content = <<EOF
 <ul>
 #{r.join("\n")}
 </ul>
 EOF
-
-    haml :index
+      haml :index
+    end
   end
 
   def search_home
@@ -82,18 +137,14 @@ EOF
   end
 
   def book_home(book)
-    @book_id = book.id
-    @header_title = header_title_book(book, @params[:query])
-    @header_info = header_info_book(book, @params[:query])
-    @content = ""
-    haml :index
+    text_page(book, 1)
   end
 
   def search_book_home(book)
     @book_id = book.id
     @header_title = header_title_book(book, @params[:query])
 
-    search_common(@params[:query] + " book: #{book.id}",
+    search_common(@params[:query] + " book:#{book.id}",
                   [["page_no", :asc]],
                   false
                   )
@@ -114,28 +165,60 @@ EOF
     haml :index
   end
 
+  PAGE_SIZE = 5
+
   def text_page(book, page_no)
-    page = @database.book_pages(book.id)[page_no]
     keywords = Util.extract_keywords(@params[:query])
+    page = @database.pages["#{book.id}:#{page_no}"]
 
     @book_id = book.id
     @header_title = header_title_book(book, @params[:query])
-    @header_info = header_info_book(book, @params[:query], page)
+    @header_info = header_info_book(book, @params[:query])
+    @content = ""
+
+    pages = @database.book_pages(@book_id)
+    page_index = page_no - 1
+
+    prev_link = ""
+    if page_index > 0
+      prev_link = <<EOF
+<ul class="pager">
+  <li><a href='#{url + "?page=#{[page_no - PAGE_SIZE, 1].max}"}' >Prev</a></li>
+</ul>
+EOF
+    end
+
+    main_contents = (pages.to_a[page_index, PAGE_SIZE] || []).map do |page|
+      render_page(page, keywords: keywords, with_number: true)
+    end
+
+    pagination_str = ""
+    if page_index + PAGE_SIZE < pages.count
+      pagination_str = <<EOF
+<ul class="pager">
+  <li><a href='#{url + "?page=#{page_no + PAGE_SIZE}"}' rel='next'>Next</a></li>
+</ul>
+EOF
+    end
 
-    @content = render_page(page, keywords: keywords)
+    @content = <<EOF
+#{prev_link}
+<div class="autopagerize_page_element">
+#{main_contents.join("\n")}
+</div>
+#{pagination_str}
+EOF
 
     haml :index
   end
 
-  RPAGE_SIZE = 20
-
   def search_common(query, sort_keys, is_filter)
-    results = @database.search(query)
+    results, snippet = @database.search(Query.new(query))
 
     rpage = @params[:rpage] ? @params[:rpage].to_i : 1
-    rpage_entries = results.paginate(sort_keys, :page => rpage, :size => RPAGE_SIZE)
+    rpage_entries = results.paginate(sort_keys, :page => rpage, :size => SEARCH_RPAGE)
     pagination_str = ""
-    if (rpage - 1) * RPAGE_SIZE + rpage_entries.count < results.count
+    if (rpage - 1) * SEARCH_RPAGE + rpage_entries.count < results.count
       pagination_str = <<EOF
 <ul class="pager">
   <li><a href='#{url + "?query=#{escape(@params[:query])}&rpage=#{rpage + 1}"}' rel='next'>Next</a></li>
@@ -143,15 +226,18 @@ EOF
 EOF
     end
 
-    snippet = results.expression.snippet([["<span class=\"highlight\">", "</span>"]], {html_escape: true, normalize: true, max_results: 5})
-
     books = {}
 
     results.each do |page|
       books[page.book.path] = 1
     end
 
-    @header_info = %Q|#{books.size} books, #{results.size} pages|
+    if is_filter
+      @header_info = %Q|#{books.size} books, #{results.size} pages|
+    else
+      @header_info = %Q|#{results.size} pages|
+    end
+
 
     r = rpage_entries.map do |page|
       if is_filter
@@ -162,15 +248,30 @@ EOF
         filter_str = ""
       end
 
+      bm = @database.bookmark_from_page(page)
+      comment_hits = snippet.execute(bm ? (bm.comment || "") : "")
+      text_hits = snippet.execute(page.text || "")
+
+      main_contents =
+        wrap_result_body_element(comment_hits) +
+        wrap_result_body_element(text_hits)
+
       <<EOF
   <div class="result">
-    <div class="title"><a href="/v/#{page.book.id}?query=#{escape(@params[:query])}&page=#{page.page_no}">#{page.book.title}</a> (P#{page.page_no})</div>
+    <div class="title">
+      <div class="ss-box">#{favstar(page)}</div>
+      <div><a href="/v/#{page.book.id}?query=#{escape(@params[:query])}&page=#{page.page_no}">#{page.book.title}</a> (P#{page.page_no})</div>
+      <div class="ss-end"></div>
+    </div>
+
     <div class="row info">
       #{filter_str}
     </div>
+
     <div class="main">
-      #{snippet.execute(page.text).map {|segment| "<div class=\"result-body-element\">" + segment.gsub("\n", "") + "</div>"}.join("\n") }
+      #{main_contents}
     </div>
+
   </div>
 EOF
     end
@@ -185,36 +286,159 @@ EOF
     haml :index
   end
 
+  def book_bookmark(book)
+    @book_id = book.id
+    @header_title = header_title_book(book, @params[:query])
+    @header_info = header_info_book(book, @params[:query])
+    render_bookmarks(@database.books_bookmark(book), [{key: "page.page_no", order: "ascending"}])
+  end
+
+  def render_bookmarks(bookmarks, sort_keys)
+    rpage = @params[:rpage] ? @params[:rpage].to_i : 1
+    sorted = bookmarks.sort(sort_keys, offset: (rpage - 1) * BOOKMARK_RPAGE, limit: BOOKMARK_RPAGE)
+
+    r = sorted.map { |bookmark|
+      page = bookmark.page
+      book = page.book
+      title = book.title
+
+      content = []
+      content << bookmark.comment if bookmark.comment
+      content << page.text if page.text
+
+      r = []
+      rest = BOOKMARK_COMMENT_LENGTH
+      content.each do |e|
+        if e.length > rest
+          r << e[0, rest]
+          break
+        else
+          r << e
+          rest -= e.length
+        end
+      end
+
+      content = r.map { |e| "<p>#{escape_html(e)}</p>" }.join("\n")
+
+      <<EOF
+  <div class="result">
+    <div class="title">
+      <div class="ss-box">#{favstar(page)}</div>
+      <div><a href="/v/#{book.id}?page=#{page.page_no}">#{book.title}</a> (P#{page.page_no})</div>
+      <div class="ss-end"></div>
+    </div>
+
+    <div class="main">
+      <div class="result-body-element">#{content}</div>
+    </div>
+  </div>
+EOF
+    }
+
+    pagination_str = ""
+    if rpage * BOOKMARK_RPAGE < bookmarks.count
+      pagination_str = <<EOF
+<ul class="pager">
+  <li><a href='#{url + "?b=1&rpage=#{rpage + 1}"}' rel='next'>Next</a></li>
+</ul>
+EOF
+    end
+    
+
+    @content = <<EOF
+<div class="autopagerize_page_element">
+#{r.join("\n")}
+</div>
+#{pagination_str}
+EOF
+    haml :index
+  end
+
   def header_title_book(book, query)
     query = query ? "?query=#{query}" : ""
-    "<a href='/#{query}'>HOME</a> &gt; <a href='/v/#{book.id}#{query}'>#{book.title}</a>"
+
+    <<EOF
+<div class="title">
+  <a href='/#{query}'>HOME</a> &gt; <a href='/v/#{book.id}#{query}' id="book-title" honyomi-book-id="#{book.id}">#{escape_html(book.title)}</a> <span class='edit-link'>- <a href="#">Edit</a></span>
+</div>
+<div class="etc">
+  <span id="book-author">#{escape_html(book.author)}</span>
+  <span><a id="book-url" href="#{book.url}">#{escape_html(book.url)}</a></span>
+</div>
+EOF
   end
 
-  def header_info_book(book, query, page = nil)
+  def header_info_book(book, query)
     query = query ? "&query=#{query}" : ""
     file_mb = File.stat(book.path).size / (1024 * 1024)
 
-    if page.nil?
-      %Q|#{book.page_num} pages. <a href="/v/#{book.id}?dl=1">Download</a> <span class="file-size">(#{file_mb}M)</span>&nbsp;&nbsp;&nbsp;<a href="/v/#{book.id}?pdf=1">Pdf</a>&nbsp;&nbsp;&nbsp;<a href="/v/#{book.id}?text=1#{query}">Text</a>|
+    pages = @params[:b] == '1' ? "<a href=\"/v/#{book.id}\">#{book.page_num}</a>" : "<strong>#{book.page_num}</strong>"
+
+    bm = @database.books_bookmark(book)
+    if @params[:b] == '1'
+      bm_text = ", <strong><span class=\"boomark-number\">#{bm.count}</span></strong> bookmarks. "
     else
-      %Q|<i class="fa fa-file-text-o"></i> P#{page.page_no} &nbsp;&nbsp;&nbsp;<a href="/v/#{book.id}?dl=1">Download</a> <span class="file-size">(#{file_mb}M)</span>&nbsp;&nbsp;&nbsp;<a href="/v/#{book.id}?pdf=1#page=#{page.page_no}">Pdf</a>&nbsp;&nbsp;&nbsp;<a href="/v/#{book.id}?text=1#{query}##{page.page_no}">Text</a>|
+      bm_text = ", <a href=\"/v/#{book.id}?b=1\"><span class=\"boomark-number\">#{bm.count}</span></a> bookmarks. "
     end
+
+    %Q|#{pages} pages#{bm_text}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="/v/#{book.id}?dl=1">Download</a> <span class="file-size">(#{file_mb}M)</span>&nbsp;&nbsp;&nbsp;<a href="/v/#{book.id}?pdf=1">Pdf</a>&nbsp;&nbsp;&nbsp;<a href="/v/#{book.id}?text=1#{query}">Text</a>|
   end
 
   def render_page(page, options = {})
-    with_number = options[:with_number] ? %Q|<div class="no"><i class="fa fa-file-text-o"></i> <a href="##{page.page_no}">P#{page.page_no}</a></div>| : ""
+    book = page.book
+    with_number = ""
+    if options[:with_number]
+      with_number = <<EOF
+<div class="no row">
+  <div class="col-xs-3"><div class="ss-box">#{favstar(page)}</div> <a href="##{page.page_no}">P#{page.page_no}</a></div>
+  <div class="col-xs-offset-8 col-xs-1"><a href="/v/#{book.id}?pdf=1#page=#{page.page_no}"><i class="fa fa-file-text-o"></i></a></div>
+</div>
+EOF
+    end
+
+    comment = ""
+
+    bm = @database.bookmark_from_page(page)
+
+    if  bm && bm.comment && !bm.comment.empty?
+      comment = <<EOF
+  <div class="comment">
+#{Util.render_bookmark_comment_to_html(bm)}
+  </div>
+EOF
+    end
 
-    text = escape_html(page.text)
-    text = Util.highlight_keywords(text, options[:keywords], 'highlight') if options[:keywords]
+    text = Util.highlight_keywords(page.text, options[:keywords], 'highlight')
     text = text.gsub("\n\n", "<br/><br/>")
 
 <<EOF
 <div class="page" id="#{page.page_no}">
   #{with_number}
+  #{comment}
   <div class="main">
     #{text}
   </div>
 </div>
 EOF
   end
+
+  def favstar(page)
+    classes = @database.bookmark?(page) ? "star favorited" : "star"
+    attr = []
+    attr << %Q|honyomi-id="#{page.book.id}"|
+    attr << %Q|honyomi-page-no="#{page.page_no}"|
+    attr << %Q|honyomi-title="#{page.book.title}"|
+    bm = @database.bookmark_from_page(page)
+    attr << %Q|honyomi-comment="#{escape_html(bm.comment).gsub("\n", "&#13;")}"| if bm && bm.comment
+
+    "<a href=\"javascript:\" id=\"star-#{page.book.id}-#{page.page_no}\" class=\"#{classes}\" #{attr.join(" ")}>Star</a>"
+  end
+
+  def wrap_result_body_element(hits)
+    r = hits.map { |segment|
+      "<div class=\"result-body-element\">" + segment.gsub("\n", "") + "</div>"
+    }.join("\n")
+
+    "<p>#{r}</p>"
+  end
 end

data/lib/honyomi/web/public/css/honyomi.css

@@ -3,10 +3,17 @@
 }
 
 .header .title {
-    font-size: 130%;
     margin: 0px 0px 10px 0px;
 }
 
+.header .title .title {
+    font-size: 130%;
+}
+
+.header .title .etc {
+    font-size: 100%;
+}
+
 .header .info {
     margin: 10px 0px 0px 5px;
 }
@@ -52,6 +59,13 @@
     padding: 20px 0px 10px 0px;
 }
 
+.page .comment {
+    background-color: #f0f0f0;
+    border: solid 1px #d0d0d0;
+    font-size: 95%;
+    margin-bottom: 2px;
+}
+
 .page .main {
     background-color: #fbfbfb;
     border: solid 1px #d0d0d0;
@@ -66,7 +80,49 @@
 .highlight {
     /* background-color: #B4D5FF; */
     /* background-color: #FFF17A; */
-    background-color: #FEEFA2;
+    /* background-color: #FEEFA2; */
+    background-color: #c0deff;
     font-weight: bold;
 }
 
+.ss-box {
+    float: left;
+    margin-right: 5px;
+}
+
+.ss-end {
+    clear: both;
+}
+
+.star {
+     text-indent: -5000px;
+     display: block;
+     background: transparent url("/image/star.png") 20px;
+     height: 20px;
+     width: 20px;
+}
+
+.star.favorited {
+     background-position: 0px;
+}
+
+input#clear {
+    /* margin-left: 0px; */
+    width: 64px;
+    height: 36px;
+    font-size: 12px;
+}
+
+.edit-link {
+    color: #8f8f8f;
+}
+
+.edit-link a {
+    color: #8f8f8f;
+}
+
+/* help */
+
+#help h3 {
+    font-size: 120%;
+}

data/lib/honyomi/web/public/js/honyomi.js

@@ -0,0 +1,155 @@
+function click_clear_button() {
+  $(".form-control").val("").focus();
+}
+
+$(document).ready(function() {
+  $(document).on('click', '.star', function(e) {
+    var id = $(this).attr('honyomi-id');
+    var page_no = $(this).attr('honyomi-page-no');
+    var title = $(this).attr('honyomi-title');
+
+    if (!$(this).hasClass('favorited')) {
+      // NEW
+      $(this).addClass('favorited');
+
+      var num = parseInt($(".boomark-number").text());
+      $(".boomark-number").text(num + 1);
+
+      // ajax
+      $.post(
+        '/command',
+        {
+          kind:      'favorite',
+          id:        id,
+          page_no:   page_no,
+          favorited: true
+        },
+        function(data) {
+          // Return a result of POST
+        }
+      );
+
+    } else {
+      // EDIT
+      $('#modal-bookmark-label').html(
+        "<span class=\"modal-bookmark-data hidden\" " +
+        "honyomi-id=\"" + id + "\" " +
+        "honyomi-page-no=\"" + page_no + "\" " +
+        "></span>" +
+        title + " (P" + page_no + ")"
+      );
+
+      $(".modal-body textarea").val($(this).attr('honyomi-comment'));
+
+      $('#modal-bookmark-edit').modal();
+    }
+
+    e.preventDefault();
+  });
+
+  var updateMemo = function () {
+    var id = $(".modal-bookmark-data").attr('honyomi-id');
+    var page_no = $(".modal-bookmark-data").attr('honyomi-page-no');
+    var comment = $(".modal-body textarea").val();
+
+    $("#star-" + id + "-" + page_no).attr("honyomi-comment", comment);
+
+    $.post(
+      '/command',
+      {
+        kind:      'favorite-update',
+        id:        id,
+        page_no:   page_no,
+        comment:   comment
+      },
+      function(data) {
+        var comment = $("#" + page_no + " .comment");
+
+        if (comment.size() == 0) {
+          $('<div class="comment">' + data + '</div>').insertBefore("#" + page_no + " .main");
+        } else {
+          comment.html(data);
+        }
+      }
+    );
+  }
+
+  $("#modal-bookmark-edit .btn-primary").click(function (e) {
+    updateMemo();
+  });
+
+  $(".modal-body textarea").keydown(function (e) {
+    if (e.ctrlKey && e.keyCode == 13) {
+      $('#modal-bookmark-edit').modal('hide');
+      updateMemo();
+    }
+  });
+
+  $("#modal-bookmark-edit .btn-danger").click(function (e) {
+    var id = $(".modal-bookmark-data").attr('honyomi-id');
+    var page_no = $(".modal-bookmark-data").attr('honyomi-page-no');
+
+    if (confirm("Delete this bookmark?")) {
+      $("#star-" + id + "-" + page_no).removeClass('favorited');
+      $("#" + page_no + " .comment").remove();
+
+      var num = parseInt($(".boomark-number").text());
+      $(".boomark-number").text(num - 1);
+
+      $.post(
+        '/command',
+        {
+          kind:      'favorite',
+          id:        id,
+          page_no:   page_no,
+          favorited: false
+        }
+      );
+    }
+  });
+
+  $(".edit-link").click(function (e) {
+    $(".title").addClass('hide');
+    $(".title-form").removeClass('hide');
+    $("#title-form-title").val($("#book-title").text());
+    $("#title-form-author").val($("#book-author").text());
+    $("#title-form-url").val($("#book-url").text());
+  });
+
+  var hideTitleForm = function() {
+    $(".title").removeClass('hide');
+    $(".title-form").addClass('hide');
+  }
+
+  $("#title-form-save").click(function (e) {
+    var id = $("#book-title").attr('honyomi-book-id');
+    var title = $("#title-form-title").val();
+    var author = $("#title-form-author").val();
+    var url = $("#title-form-url").val();
+
+    $("#book-title").text(title);
+    $("#book-author").text(author);
+    $("#book-url").attr('href', url);
+    $("#book-url").text(url);
+
+    $.post(
+      '/command',
+      {
+        kind:      'title-form-save',
+        id:        id,
+        title:     title,
+        author:    author,
+        url:       url
+      },
+      function(data) {
+        // Return a result of POST
+      }
+    );
+
+    hideTitleForm();
+  });
+
+  $("#title-form-cancel").click(function (e) {
+    hideTitleForm();
+  });
+});