honyomi 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c387aa69369e0ac0b0c92d5ce0c56a0d6f9b782
-  data.tar.gz: 36bd6672cc22367b2a368eb913122e96bd2ff322
+  metadata.gz: f785777fac05f71e8de95f2a030a5da69b791a4d
+  data.tar.gz: fbe61872b4dff870f4699de33df9a1278fbaa8e9
 SHA512:
-  metadata.gz: 53df1091d9e29ba8d7fbabb7b0b4ba27d1080b74d29cc2f5af2afdb5f6947689f279094bffb0fb7c4e75d37c17b3c1eed0d324db88af83893eb6cd60890ebb99
-  data.tar.gz: 00b79ec2b4122df5b55d7c869f102f1916dbf5406bb202f073806f8e2afb61ef5d3bb3e7a74955c8adc31a41df5e8805a35d533f9bf6686958bb1ca22e732fa1
+  metadata.gz: dfbec7c05b178b935ae27189c276382b9f7f67e1f46cf519609cb1b47a73f99dc08b45e1dffc68e734a59b6610fe511a0ef68fc8b7663d9c626f2a7481c121bc
+  data.tar.gz: 11d2d1af46f7515451e04c8bfd90983cca3c11245889423979ca13d9f055eb989bf4c3dad31be50686eb5881a953301738798b1077684cff16b483e241db07d3

data/HISTORY.md

@@ -1,5 +1,21 @@
 # HISTORY - Honyomi
 
+## 1.2 - 2015-07-03
+
+* Add image command
+  * It can be inline display of page on browser
+  * Need 'pdftoppm'
+* Remove duplicated :type => :boolean
+
+* Add book on web
+  * Drag & drop OR Dialog
+  * If you want to disable this feature, set ENV["HONYOMI_DISABLE_WEB_ADD"]
+    * $ HONYOMI_DISABLE_WEB_ADD=1 honyomi web
+
+* Fix encode error
+  * Specify file encoding in File.read
+  * Add String#scrub
+
 ## 1.1 - 2015-06-23
 
 * Add book on web

data/lib/honyomi/cli.rb

@@ -120,7 +120,7 @@ module Honyomi
     end
 
     desc "web", "Web search interface"
-    option :no_browser, :type => :boolean, :default => false, :aliases => '-n', :type => :boolean, :desc => 'Do not launch browser.'
+    option :no_browser, :type => :boolean, :default => false, :aliases => '-n', :desc => 'Do not launch browser.'
     option :host, :default => '127.0.0.1', :aliases => '-o', :desc => 'Listen on HOST.'
     option :port, :default => 9295, :aliases => '-p', :desc => 'Use PORT.'
     option :server, :default => 'thin', :aliases => '-s', :desc => 'Use SERVER.'
@@ -130,6 +130,16 @@ module Honyomi
       core.web(options)
     end
 
+    desc "image book_id1 [book_id2 ...]", "Generate page images (Need pdftoppm)"
+    def image(*args)
+      core = Core.new
+      core.load_database
+
+      args.each do |id|
+        core.image(id.to_i, { verbose: true })
+      end
+    end
+
     no_tasks do
       # Override method for support -h 
       # defined in /lib/thor/invocation.rb

data/lib/honyomi/core.rb

@@ -120,6 +120,13 @@ EOF
       end
     end
 
+    def image(id, options = {})
+      pdf = Pdf.new(@database.books[id].path)
+      output_dir = File.join(image_dir, id.to_s)
+      pdf.generate_images(output_dir)
+      puts "Generated images to '#{output_dir}'" if options[:verbose]
+    end
+
     def db_dir
       File.join(home_dir, 'db')
     end
@@ -138,5 +145,9 @@ EOF
       
       @home_dir
     end
+
+    def image_dir
+      File.join(home_dir, "image")
+    end
   end
 end

data/lib/honyomi/pdf.rb

@@ -1,24 +1,31 @@
+# coding: utf-8
 require 'honyomi'
 require 'tmpdir'
+require 'fileutils'
 
 module Honyomi
   class Pdf
     def initialize(filename)
       @filename = filename
+    end
 
+    def pages
       Dir.mktmpdir do |dir|
         outfile = File.join(dir, "pdf.txt")
-        system("pdftotext", filename, outfile) # Need pdftotext (poppler, xpdf)
+        system("pdftotext", @filename, outfile) # Need pdftotext (poppler, xpdf)
         @text = File.read(outfile, encoding: Encoding::UTF_8)
         if String.method_defined? :scrub
           @text = @text.scrub('?')
         end
       end
-    end
 
-    def pages
       @text.split("\f")
     end
+
+    def generate_images(output_dir)
+      FileUtils.mkdir_p output_dir
+      system("pdftoppm", "-jpeg", @filename, File.join(output_dir, "book"))
+    end
   end
 end
 

data/lib/honyomi/util.rb

@@ -101,5 +101,14 @@ module Honyomi
     def default_home
       File.expand_path '~'
     end
+
+    def count_digit(num)
+      num.to_s.length
+    end
+
+    def image_path(page)
+      zerofill = format("%0#{count_digit(page.book.page_num)}d", page.page_no)
+      "#{home_dir}/image/#{page.book.id}/book-#{zerofill}.jpg"
+    end
   end
 end

data/lib/honyomi/version.rb

@@ -1,3 +1,3 @@
 module Honyomi
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/honyomi/web/app.rb

@@ -93,12 +93,13 @@ get '/v/:id' do
 
   book = @database.books[params[:id].to_i]
 
-  if params[:text] == '1'
-    text_all(book)
-  elsif params[:pdf] == '1'
+  if params[:pdf] == '1'
     send_file(book.path, :disposition => 'inline')
   elsif params[:dl] == '1'
     send_file(book.path, :disposition => 'download')
+  elsif params[:image] == '1'
+    page = @database.pages["#{params[:id].to_i}:#{params[:page].to_i}"]
+    send_file(Util.image_path(page))
   else
     if params[:page]
       text_page(book, params[:page].to_i)
@@ -293,6 +294,12 @@ EOF
         wrap_result_body_element(comment_hits) +
         wrap_result_body_element(text_hits)
 
+      image_path = Util.image_path(page)
+
+      if File.exist? image_path
+        main_contents += %|<div><img src="/v/#{page.book.id}?image=1&page=#{page.page_no}" width="100%"/></div>|
+      end
+
       <<EOF
   <div class="result">
     <div class="title">
@@ -339,9 +346,12 @@ EOF
       book = page.book
       title = book.title
 
+      image_path = Util.image_path(page)
+      has_image = File.exist? image_path
+
       content = []
       content << bookmark.comment if bookmark.comment
-      content << page.text if page.text
+      content << page.text if !has_image && page.text
 
       r = []
       rest = BOOKMARK_COMMENT_LENGTH
@@ -357,6 +367,10 @@ EOF
 
       content = r.map { |e| "<p>#{escape_html(e)}</p>" }.join("\n")
 
+      if has_image
+        content += %|<p><img src="/v/#{page.book.id}?image=1&page=#{page.page_no}" width="100%"/></p>|
+      end
+
       <<EOF
   <div class="result">
     <div class="title">
@@ -418,21 +432,28 @@ EOF
       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>|
+    %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>|
   end
 
   def render_page(page, options = {})
     book = page.book
+
+    # with_number
     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 class="col-xs-8">
+    <div class="ss-box">#{favstar(page)}</div>
+    <a href="##{page.page_no}">P#{page.page_no}</a>
+    &nbsp;&nbsp;&nbsp;<a href="javascript:" class="page-text-toggle">Text</a>
+    &nbsp;&nbsp;&nbsp;<a href="/v/#{book.id}?pdf=1#page=#{page.page_no}">Pdf</a>
+  </div>
 </div>
 EOF
     end
 
+    # comment
     comment = ""
 
     bm = @database.bookmark_from_page(page)
@@ -445,17 +466,33 @@ EOF
 EOF
     end
 
-    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}
+  #{render_page_main(page, options)}
+</div>
+EOF
+  end
+
+  def render_page_main(page, options)
+    image_path = Util.image_path(page)
+
+    text = Util.highlight_keywords(page.text, options[:keywords], 'highlight').gsub("\n\n", "<br/><br/>")
+
+    if File.exist?(image_path)
+      body = <<EOF
+<div class="page-text hidden">#{text}</div>
+<div><img src="/v/#{page.book.id}?image=1&page=#{page.page_no}" width="100%"/></div>
+EOF
+    else
+      body = text
+    end
+
+    <<EOF
   <div class="main">
-    #{text}
+    #{body}
   </div>
-</div>
 EOF
   end
 

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

@@ -1,3 +1,8 @@
+/* bootstrap custom */
+.container {
+    width: auto;
+}
+
 /* header */
 .header {
 }

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

@@ -3,6 +3,18 @@ function click_clear_button() {
 }
 
 $(document).ready(function() {
+  $(document).on('click', '.page-text-toggle', function(e) {
+    var node = $(this).parent().parent().parent().find(".page-text");
+
+    if (node.hasClass('hidden')) {
+      node.removeClass("hidden");
+    } else {
+      node.addClass("hidden");
+    }
+
+    e.preventDefault();
+  });
+
   $(document).on('click', '.star', function(e) {
     var id = $(this).attr('honyomi-id');
     var page_no = $(this).attr('honyomi-page-no');

data/test/test_pdf.rb

@@ -24,4 +24,15 @@ class TestPdf < MiniTest::Test
       assert_equal 3, pdf.pages.size
     end
   end
+
+  def test_generate_images
+    Dir.mktmpdir do |dir|
+      pdf = Honyomi::Pdf.new(test_pdf)
+      pdf.generate_images(dir)
+
+      Dir.chdir(dir) do
+        assert_equal %w(book-1.jpg book-2.jpg book-3.jpg), Dir.glob("*")
+      end
+    end
+  end
 end

data/test/test_util.rb

@@ -10,4 +10,11 @@ class TestUtil < MiniTest::Test
     assert_equal %w(aa), Util::extract_keywords("aa -bb a:c")
   end
 
+  def test_count_digit
+    assert_equal 1, Util::count_digit(0)
+    assert_equal 1, Util::count_digit(1)
+    assert_equal 2, Util::count_digit(10)
+    assert_equal 3, Util::count_digit(100)
+    assert_equal 4, Util::count_digit(9999)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honyomi
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - ongaeshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grn_mini