epub-search 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b13b7b323e7bac69c408b9fddae5c6a1032336b
-  data.tar.gz: 5b365484dc01ebb3e354e9997121f0df75bbefa0
+  metadata.gz: 4ed411d6029d1a65837e0c574e68a698e069da58
+  data.tar.gz: e6d33b7d2c5d246ae7b5fbe66973fb058a3db5a6
 SHA512:
-  metadata.gz: a8c64c2c72bd1907bc4b20c1a4e66e147c3165a463dc9bbf7dd7bf7604e990bb2b566d1ca4e69af559bbafc9a310d964c851498b5696df6b584bf6b8313d82f0
-  data.tar.gz: 31067155ad835d1d717fadd98b64b0ede7d3accb9886d8a8dad7784fd5d08c5a83fd2a94ec1561757faa4476d6e7bbaf11c01515eaad5db89731f7c9aff8ae5b
+  metadata.gz: 0e1694e9a1adb8108eea54288e5117d3f062206ff1e39afb3f44103814add105ccb59bba79b3ecd91eade825ca01f598411bb3b346783fba04bfee6332295a87
+  data.tar.gz: bb52658436263d8b3d8647a0d905f347b3c96a3f4132ea0d58d23acd1f07d017374f898fc0b384201fcd4ce452f9ace0048b34a88ff1142a510202e0cfcf6566

data/CHANGELOG.markdown

@@ -4,6 +4,9 @@ Change Log
 0.0.3
 -----
 * Specify the version of Listen gem as '>= 1.0.0' to aopt to changed API
+* Use monitor for thread safety
+* Remove record for book which was removed during watcher was sleeping
+* Add recored of book which was added during watcher was sleeping
 
 0.0.2
 -----

data/README.markdown

@@ -27,7 +27,7 @@ Usage
 
 To watch directories in backend:
 
-    $ epub-search watch >/dev/null 2>&1 &
+    $ epub-search watch --daemonize
 
 Configuration
 -------------

data/app/watch.rb

@@ -13,11 +13,8 @@ class Watch
 
   def run(notify_on_change: true, daemonize: false, debug: false)
     @notify, @daemonize, @debug = notify_on_change, daemonize, debug
-    if @debug
-      $stderr.puts "notify_on_change: #{@notify}"
-      $stderr.puts "daemonize: #{@daemonize}"
-      $stderr.puts "debug: #{@debug}"
-    end
+
+    log_run_parameters if @debug
 
     $PROGRAM_NAME = File.basename($PROGRAM_NAME)
     $stderr.puts 'start to watch:'
@@ -30,52 +27,7 @@ class Watch
     EPUB::Search::Database::Actor.supervise_as :db, @db
 
     catch_up
-    begin
-      Listen.to! *@directories, :filter => EPUB_RE do |modified, added, removed|
-        modified.each do |file_path|
-          next unless file_path =~ EPUB_RE
-          file_path.force_encoding 'UTF-8'
-          begin
-            $stderr.puts "update #{file_path}"
-            Celluloid::Actor[:db].async.update file_path
-            title = EPUB::Parser.parse(file_path).title
-            notify %Q|UPDATED: #{title}\n#{file_path}|
-            FileUtils.touch exit_time_file
-          rescue => error
-            $stderr.puts error
-            $stderr.puts error.backtrace if @debug
-          end
-        end
-        added.each do |file_path|
-          next unless file_path =~ EPUB_RE
-          file_path.force_encoding 'UTF-8'
-          begin
-            Celluloid::Actor[:db].async.add file_path
-            title = EPUB::Parser.parse(file_path).title
-            notify %Q|ADDED: #{title}\n#{file_path}|
-            FileUtils.touch exit_time_file
-          rescue => error
-            $stderr.puts error
-            $stderr.puts error.backtrace if @debug
-          end
-        end
-        removed.each do |file_path|
-          next unless file_path =~ EPUB_RE
-          file_path.force_encoding 'UTF-8'
-          begin
-            Celluloid::Actor[:db].async.remove file_path
-            notify %Q|REMOVED:\n#{file_path}|
-            FileUtils.touch exit_time_file
-          rescue => error
-            $stderr.puts error
-            $stderr.puts error.backtrace if @debug
-          end
-        end
-      end
-    ensure
-      pid_file.delete
-      FileUtils.touch exit_time_file
-    end
+    start_watch
   end
 
   private
@@ -97,26 +49,58 @@ class Watch
   end
 
   def catch_up
+    locations = @db.locations
     @directories.each do |dir|
       Dir["#{dir}/**/*.epub"].each do |file_path|
-        next if File.file? exit_time_file and File.mtime(file_path) < exit_time
-        begin
-          removed = Celluloid::Actor[:db].remove(file_path)
-          Celluloid::Actor[:db].async.add file_path
-          operation = removed.zero? ? 'ADDED' : 'UPDATED'
-          title = EPUB::Parser.parse(file_path).title
-          notify "#{operation}: #{title}\n#{file_path}"
-          FileUtils.touch exit_time_file
-        rescue => error
-          $stderr.puts error
-          $stderr.puts error.backtrace if @debug
+        if locations.include? file_path
+          next if File.file? exit_time_file and File.mtime(file_path) < exit_time
+          begin
+            removed = Celluloid::Actor[:db].remove(file_path)
+            Celluloid::Actor[:db].async.add file_path
+            operation = removed.zero? ? 'ADDED' : 'UPDATED'
+            title = EPUB::Parser.parse(file_path).title
+            notify "#{operation}: #{title}\n#{file_path}"
+            FileUtils.touch exit_time_file
+          rescue => error
+            $stderr.puts error
+            $stderr.puts error.backtrace if @debug
+          end
+        else
+          on_file_changed file_path, :add, 'ADDED'
         end
       end
     end
-  rescue
+    locations.each do |location|
+      on_file_changed location.dup, :remove, 'REMOVED' unless File.exist? location
+    end
+  rescue => err
+    $stderr.puts err
     pid_file.unlink
   end
 
+  def start_watch
+    Listen.to! *@directories, :filter => EPUB_RE do |modified, added, removed|
+      modified.each do |file_path|
+        on_file_changed file_path, :update, 'UPDATED'
+      end
+      added.each do |file_path|
+        on_file_changed file_path, :add, 'ADDED'
+      end
+      removed.each do |file_path|
+        on_file_changed file_path, :remove, 'REMOVED'
+      end
+    end
+  ensure
+    pid_file.delete
+    FileUtils.touch exit_time_file
+  end
+
+  def log_run_parameters
+    $stderr.puts "notify_on_change: #{@notify}"
+    $stderr.puts "daemonize: #{@daemonize}"
+    $stderr.puts "debug: #{@debug}"
+  end
+
   def write_pid_file
     if pid_file.exist?
       pid = pid_file.read.to_i
@@ -132,6 +116,19 @@ class Watch
     end
   end
 
+  def on_file_changed(file_path, operation, label)
+    file_path.force_encoding 'UTF-8'
+    begin
+      Celluloid::Actor[:db].async.__send__ operation, file_path
+      title = operation == :remove ? '' : EPUB::Parser.parse(file_path).title
+      notify %Q|#{label}: #{title}\n#{file_path}|
+      FileUtils.touch exit_time_file
+    rescue => error
+      $stderr.puts error
+      $stderr.puts error.backtrace if @debug
+    end
+  end
+
   def notify(message)
     $stderr.puts message
     Notify.notify $PROGRAM_NAME, message if notify?

data/lib/epub/search/database.rb

@@ -1,12 +1,17 @@
+require 'monitor'
+
 module EPUB
   module Search
     class Database
+      include MonitorMixin
+
       DIR_NAME  = 'db'
       FILE_NAME = 'epub-search.db'
 
       attr_reader :db_dir
 
       def initialize(db_dir)
+        super()
         @db_dir = Pathname === db_dir ? db_dir : Pathname.new(db_dir)
         Groonga::Context.default_options = {:encoding => :utf8}
       end
@@ -49,22 +54,25 @@ module EPUB
         file_path = Pathname.new(file_path) unless file_path.kind_of? Pathname
         location = file_path.expand_path
         book = EPUB::Parser.parse(location)
-        record_count = 0
-        open do
-          book.each_content do |content|
-            next unless content.media_type == 'application/xhtml+xml'
-            doc = Nokogiri.XML(content.read)
-            page_title = doc.search('title').first.text
-            body = Nokogiri.XML(doc.search('body').first.to_xml).content
-            pages.add('location'   => location.to_s,
-                      'iri'        => content.href.to_s,
-                      'book_title' => book.title,
-                      'page_title' => page_title,
-                      'content'    => body)
-            record_count += 1
+        contents = book.each_content.select {|content|
+          content.media_type == 'application/xhtml+xml'
+        }
+        contents.each do |content|
+          doc = Nokogiri.XML(content.read)
+          title_elem = doc.search('title').first
+          page_title = title_elem ? title_elem.text : ''
+          body = Nokogiri.XML(doc.search('body').first.to_xml).content
+          synchronize do
+            open do
+              pages.add('location'   => location.to_s,
+                        'iri'        => content.href.to_s,
+                        'book_title' => book.title,
+                        'page_title' => page_title,
+                        'content'    => body)
+            end
           end
         end
-        record_count
+        contents.length
       end
 
       # @param [Pathname|String] file_path path of book
@@ -73,13 +81,15 @@ module EPUB
         file_path = Pathname.new(file_path) unless file_path.kind_of? Pathname
         location = file_path.expand_path
         record_count = 0
-        open do
-          records = pages.select {|record|
-            record.location == location.to_path
-          }
-          records.each do |record|
-            record.key.delete
-            record_count += 1
+        synchronize do
+          open do
+            records = pages.select {|record|
+              record.location == location.to_path
+            }
+            records.each do |record|
+              record.key.delete
+              record_count += 1
+            end
           end
         end
         record_count
@@ -110,6 +120,12 @@ module EPUB
         end
       end
 
+      def locations
+        open do
+          pages.group_by(&:location).collect {|location, records| location}
+        end
+      end
+
       private
 
       def open

data/lib/epub/search/version.rb

@@ -1,5 +1,5 @@
 module EPUB
   module Search
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epub-search
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - KITAITI Makoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-27 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: epub-parser
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Full text search for EPUB books