milkode 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/milkode/cdstk/cdstk.rb

@@ -636,12 +636,12 @@ EOF
       end
         
       # データベースからも削除
-      dir = File.expand_path(dir)
+      # dir = File.expand_path(dir)
 
       alert("rm_package", dir)
       @package_count += 1
 
-      Database.instance.remove([File.basename(dir)]) do |record|
+      Database.instance.remove_fpath(dir) do |record|
         alert_info("rm_record", record.path)
         @file_count += 1
       end

data/lib/milkode/cdstk/milkode_yaml.rb

@@ -59,6 +59,11 @@ EOF
       @contents.find {|v| v.same_name?(name)}
     end
 
+    # 指定キーワードにマッチする全てのパッケージを返す
+    def match_all(keyword)
+      @contents.find_all {|p| p.name.include? keyword }
+    end
+
     # ディレクトリ名が同じパッケージを検索
     def find_dir(directory)
       @contents.find {|v| v.directory == directory}

data/lib/milkode/cdstk/yaml_file_wrapper.rb

@@ -56,6 +56,10 @@ module Milkode
       @data.find_name(name)
     end
 
+    def match_all(keyword)
+      @data.match_all(keyword)
+    end
+
     def find_dir(dir)
       @data.find_dir(dir)
     end

data/lib/milkode/cdweb/lib/database.rb

@@ -52,7 +52,18 @@ module Milkode
       return table.records[0]
     end
 
-    def search(patterns, packages, fpaths, suffixs, offset = 0, limit = -1)
+    def search(patterns, packages, current_path, fpaths, suffixs, offset = 0, limit = -1)
+      # パッケージ名から絶対パスに変換
+      unless packages.empty?
+        packages = convert_packages(packages)
+
+        # キーワードがパッケージ名にマッチしなければ検索しない
+        return [], 0 if packages.empty?
+      else
+        # パッケージ名未指定の時は現在位置もfpathsに含める
+        fpaths << current_path + "/" unless current_path == ""
+      end
+      
       # @todo fpathを厳密に検索するには、検索結果からさらに先頭からのパスではないものを除外する
       records, total_records = searchMain(patterns, packages, fpaths, suffixs, offset, limit)
     end
@@ -131,14 +142,13 @@ module Milkode
       paths
     end
     
-    # コンテンツの削除
-    # @todo パッケージ名完全一致になっていないので直す
-    def remove(packages)
+    # 指定したfpathにマッチするレコードを削除する
+    def remove_fpath(fpath)
       # データベースを開き直す
       reopen_patch
       
-      # 削除したコンテンツをインデックスから削除
-      records, total_records = search([], packages, [], [])
+      # 削除したいコンテンツを検索
+      records, total_records = searchMain([], [], [fpath], [], 0, -1)
 
       # 検索結果はHashのレコードなので、これを直接deleteしても駄目
       # 1. Record#record_idを使って主キー(Groonga#Arrayのレコード)を取り出し
@@ -222,23 +232,15 @@ module Milkode
       end
 
       # スコアとタイムスタンプでソート
-      records = table.sort([{:key => "_score", :order => "descending"},
-                            {:key => "timestamp", :order => "descending"}],
-                           :offset => offset,
-                           :limit => limit)
-      
-      # ファイル名でソート
-      # @todo 本当はこっちが望ましいが、パッケージ検索を正確にしないことには出来ない
-      # records = table.sort([{:key => "shortpath", :order => "ascending"}],
+      # records = table.sort([{:key => "_score", :order => "descending"},
+      #                       {:key => "timestamp", :order => "descending"}],
       #                      :offset => offset,
       #                      :limit => limit)
-
-      # パッケージの条件追加
-      if (packages.size > 0)
-        records.delete_if do |record|
-          !packages.any?{|package| record.shortpath.split('/')[0] =~ /#{package}/ }
-        end
-      end
+      
+      # ファイル名でソート
+      records = table.sort([{:key => "shortpath", :order => "ascending"}],
+                           :offset => offset,
+                           :limit => limit)
 
       # マッチ数
       total_records = table.size
@@ -281,5 +283,15 @@ module Milkode
     end
     private :suffix_expression
     
+    def convert_packages(packages)
+      packages.inject([]) {|r, p| r += expand_packages(p)}
+    end
+
+    def expand_packages(keyword)
+      @yaml.match_all(keyword).map{|p| p.directory}
+    end
+
+    # --- error ---
+    class NotFoundPackage < RuntimeError ; end
   end
 end

data/lib/milkode/cdweb/lib/search_contents.rb

@@ -34,9 +34,7 @@ module Milkode
       @offset = params[:offset].to_i
       @line = params[:line].to_i
       @is_onematch = params[:onematch]
-      fpaths = @q.fpaths
-      fpaths << path + "/" unless path == ""
-      @records, @total_records, @elapsed = Database.instance.search(@q.keywords, @q.packages, fpaths, @q.suffixs, @offset, LIMIT_NUM)
+      @records, @total_records, @elapsed = Database.instance.search(@q.keywords, @q.packages, path, @q.fpaths, @q.suffixs, @offset, LIMIT_NUM)
       grep_contents
     end
 

data/lib/milkode/cdweb/lib/search_files.rb

@@ -23,13 +23,10 @@ module Milkode
       
       @offset = params[:offset].to_i
 
-      fpaths = @q.fpaths
-      fpaths << path + "/" unless path == ""
-
-      if (fpaths.include?("*"))
+      if (@q.fpaths.include?("*"))
         @records, @total_records = Database.instance.selectAll(@offset, DISP_NUM)
       else
-        @records, @total_records = Database.instance.search(@q.keywords, @q.packages, fpaths, @q.suffixs, @offset, DISP_NUM)
+        @records, @total_records = Database.instance.search(@q.keywords, @q.packages, path, @q.fpaths, @q.suffixs, @offset, DISP_NUM)
       end
     end
 

data/lib/milkode/cdweb/views/search_form.haml

@@ -10,13 +10,13 @@
     %br
     %label
       = create_radio('all', params[:shead])
-      全体を検索
+      全て
     %label
       = create_radio('package', params[:shead])
-      = package_name(@path) + '以下'
+      パッケージ(おすすめ)
     %label
       = create_radio('directory', params[:shead])
-      = current_name(@path) + '以下'
+      ディレクトリ
     %label
       = create_checkbox('onematch', params[:onematch])
       = '1ファイル1マッチ'

data/lib/milkode/common/util.rb

@@ -89,7 +89,7 @@ module Milkode
     end
 
     def larger_than_oneline(content)
-      content.count("\n") > 1
+      content.count($/) > 1      
     end
 
     def normalize_filename(str)

data/test/test_cdstk.rb

@@ -66,6 +66,8 @@ class TestCdstk < Test::Unit::TestCase
         # obj.update([], {})
       end
 
+      Database.instance.yaml_reload
+
       io.puts('--- remove ---')
       obj.remove(['findgrep'], {:force => true})
       obj.remove([], {:force => true})

data/test/test_database.rb

@@ -66,8 +66,8 @@ module Milkode
 
     def t_remove
       db = Database.instance
-      db.remove(['test'])
-      db.remove(['lib'])
+      db.remove_fpath(File.expand_path '../../test')
+      db.remove_fpath(File.expand_path '../../lib')
       assert_equal 0, db.totalRecords
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkode
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - ongaeshi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-15 00:00:00 +09:00
+date: 2012-03-17 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency