milkode 0.7.1 → 0.8.0

data/lib/milkode/cdstk/milkode_yaml.rb

@@ -74,7 +74,7 @@ EOF
     def package_root(dir)
       nd = Util::normalize_filename dir
       @contents.find do |v|
-        v if nd =~ /^#{v.directory}/
+        v if nd =~ /^#{Regexp.escape(v.directory)}/
       end
     end
 

data/lib/milkode/cdweb/app.rb

@@ -15,15 +15,17 @@ require 'milkode/cdweb/lib/database'
 require 'milkode/cdweb/lib/command'
 require 'milkode/cdweb/lib/mkurl'
 require 'milkode/cdweb/lib/web_setting'
+require 'milkode/cdweb/lib/package_list'
 
 set :haml, :format => :html5
 
 get '/' do
   @setting = WebSetting.new
-  @version = "0.7.0"
+  @version = "0.8.0"
   @package_num = Database.instance.yaml_package_num
   @file_num = Database.instance.totalRecords
-  haml :index
+  @package_list = PackageList.new(Database.instance.grndb)
+  haml :index, :layout => false
 end
 
 def package_path(path)
@@ -56,7 +58,13 @@ get '/home*' do |path|
   path = path.sub(/^\//, "")
   record = Database.instance.record(path)
 
-  if (record)
+  if path.empty?
+    if (params[:query] and !params[:query].empty?)
+      search(path, params, before)
+    else
+      packages(params, before)
+    end
+  elsif (record)
     view(record, params, before)
   else
     if (params[:query] and !params[:query].empty?)

data/lib/milkode/cdweb/lib/command.rb

@@ -28,6 +28,7 @@ module Milkode
       @record_content = CodeRayWrapper.new(record.content, record.shortpath).to_html
     end
     
+    Database.instance.touch_viewtime(@path)
     @elapsed = Time.now - before
     haml :view
   end
@@ -61,12 +62,54 @@ module Milkode
     @record_content = fileList.map do |v|
       "<dt class='result-file'>#{file_or_dirimg(v[1])}<a href='#{Mkurl.new('/home/' + v[0], params).inherit_query_shead}'>#{File.basename v[0]}</a></dt>"
     end.join
+    Database.instance.touch_viewtime(path)
     @elapsed = Time.now - before
     haml :filelist
   end
 
+  def packages(params, before)
+    @setting = WebSetting.new
+    @title = "Package List"
+    @path = ""
+    packages = Database.instance.packages(params["sort"])
+    @total_records = packages.size
+
+    @sort_change_content =
+      [
+       sort_change_content(params["sort"], '名前'),
+       '|',
+       sort_change_content(params["sort"], '最近使った', 'viewtime'),
+       '|',
+       sort_change_content(params["sort"], '追加順'    , 'addtime'),
+       '|',
+       sort_change_content(params["sort"], '更新順'    , 'updatetime'),
+       '|',
+       sort_change_content(params["sort"], 'お気に入り', 'favtime'),
+      ].join("\n")
+
+    @record_content = packages.map do |v|
+      "<dt class='result-file'>#{file_or_dirimg(false)}<a href='#{Mkurl.new('/home/' + v, params).inherit_query_shead}'>#{File.basename v}</a></dt>"
+    end.join
+    @elapsed = Time.now - before
+    haml :packages
+  end
+
+  private
+  
   def file_or_dirimg(is_file)
     src = (is_file) ? '/images/file.png' : '/images/directory.png'
     "<img alt='' style='vertical-align:bottom; border: 0; margin: 1px;' src='#{src}'>"
   end
+
+  def sort_change_content(current_value, text, sort_kind = nil)
+    if (current_value != sort_kind)
+      if (sort_kind)
+        "<a href='#{Mkurl.new('/home', params).inherit_query_shead_set_sort(sort_kind)}'>#{text}</a>"
+      else
+        "<a href='#{Mkurl.new('/home', params).inherit_query_shead}'>#{text}</a>"
+      end
+    else
+      text
+    end
+  end
 end

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

@@ -11,9 +11,11 @@ require 'singleton'
 require 'groonga'
 require 'milkode/common/dbdir'
 require 'milkode/cdstk/yaml_file_wrapper'
+require 'milkode/database/groonga_database'
 include Milkode
 
 module Milkode
+  # @todo データベースアクセスは将来的にはGroongaDatabaseに収束させる
   class Database
     include Singleton
 
@@ -28,93 +30,73 @@ module Milkode
     end
 
     attr_reader :yaml
+    attr_reader :grndb
 
     def initialize
-      open(Database.dbdir)
+      open
     end
 
     def yaml_reload
       # @yaml = YamlFileWrapper.load_if(@@db_dir || Dbdir.default_dir)
     end
 
-    def open(db_dir)
-      dbfile = Dbdir.expand_groonga_path(db_dir)
-      
-      if File.exist? dbfile
-        Groonga::Database.open(dbfile)
-      else
-        raise "error    : #{dbfile} not found!!"
+    def open
+      if !@grndb || @grndb.closed?
+        @grndb = GroongaDatabase.new
+        @grndb.open(Database.dbdir)
+        @grndb.yaml_sync(yaml_load.contents)
+        @documents = @grndb.documents
       end
-      
-      @documents = Groonga::Context.default["documents"]
     end
 
     def record(shortpath)
-      reopen_patch
-      table = @documents.select { |record| record.shortpath == shortpath }
-      return table.records[0]
+      DocumentRecord.create @documents.find_shortpath(shortpath)
     end
 
     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に含める
-        if current_path != ""
-          fpaths << path2fpath(current_path)
-        end
-      end
-      
-      # @todo fpathを厳密に検索するには、検索結果からさらに先頭からのパスではないものを除外する
-      records, total_records = searchMain(patterns, packages, fpaths, suffixs, offset, limit)
-    end
-
-    def path2fpath(path)
-      pa = path.split("/")
-      File.join(convert_packages([pa[0]])[0], pa[1..-1].join('/'))
-    end
-
-    def selectAll(offset = 0, limit = -1)
-      table = @documents.select
+      paths = []
 
-      # マッチ数
-      total_records = table.size
-      
-      # @todo ここが速度低下の原因？と思ったけど、ここは全て選択の部分だけか・・・
+      # パッケージ名未指定の時は現在位置を検索条件に追加
+      if packages.empty? && current_path != ''
+        package, restpath = Util::divide_shortpath(current_path)
 
-      # 2010/10/29 ongaeshi
-      # 本当はこのようにgroongaAPIでソートしたいのだが上手くいかなかった
-      #       # ファイル名順にソート
-      #       records = table.sort([{:key => "shortpath", :order => "descending"}],
-      #                            :offset => offset,
-      #                            :limit => limit)
+        # PackageRecord#directory をキーに検索する
+        directory = @grndb.packages[package].directory
 
-      # ソート
-      if (limit != -1)
-        records = table.records.sort_by{|record| record.shortpath.downcase }[offset, limit]
-      else
-        records = table.records.sort_by{|record| record.shortpath.downcase }[offset..limit]
+        if restpath
+          paths << File.join(directory, restpath)
+        else
+          paths << directory
+        end
       end
 
-      return records, total_records
+      # 検索
+      result = @documents.search(
+        :patterns  => patterns,
+        # :keywords  => ,
+        :paths     => paths,
+        :packages  => packages,
+        :restpaths => fpaths,
+        :suffixs   => suffixs,
+        :offset    => offset,
+        :limit     => limit
+      )
+
+      # 結果
+      return result.map{|r| DocumentRecord.new(r)}, result.size
     end
 
-    def selectAll2(offset = 0, limit = -1)
-      records, total_records = selectAll(offset, limit)
-      records
+    def selectAll(offset, limit)
+      @documents.select_all_sort_by_shortpath(offset, limit)
     end
-    
+
     # レコード数を得る
     def totalRecords
-      reopen_patch
-      @documents.select.size      
+      @documents.size
     end
 
     # yamlからパッケージの総数を得る
+    # @todo PackageTableから取得するように変更する
     def yaml_package_num
       yaml_load.contents.size
     end
@@ -128,17 +110,13 @@ module Milkode
       if (base_depth == 0)
         return yaml_load.contents.sort_by{|v| v.name}.map{|v| [v.name, false] }
       end
-      
-      # shortpathにマッチするものだけに絞り込む
-      if (base == "")
-        records = @documents.select.records
-      else
-        records = @documents.select {|record| record.shortpath =~ base }.to_a
-      end
+
+      # base/以下のファイルを全て取得
+      records = @documents.find_shortpath_below(base)
 
       # ファイルリストの生成
       paths = records.map {|record|
-        record.shortpath.split("/")
+        DocumentRecord.new(record).shortpath.split("/")
       }.find_all {|parts|
         parts.length > base_depth and parts[0, base_depth] == base_parts
       }.map {|parts|
@@ -151,161 +129,31 @@ module Milkode
       
       paths
     end
-    
-    # 指定したfpathにマッチするレコードを削除する
-    def remove_fpath(fpath)
-      # データベースを開き直す
-      reopen_patch
-      
-      # 削除したいコンテンツを検索
-      records, total_records = searchMain([], [], [fpath], [], 0, -1)
-
-      # 検索結果はHashのレコードなので、これを直接deleteしても駄目
-      # 1. Record#record_idを使って主キー(Groonga#Arrayのレコード)を取り出し
-      # 2. Record#delete で削除
-      records.each do |r|
-        yield r if block_given?
-        r.record_id.delete
-      end
-    end
 
-    # 実体の存在しないデータを削除
-    def cleanup
-      # データベースを開き直す
-      reopen_patch
+    def packages(sort_kind)
+      sorted = nil
 
-      # クリーンアップ
-      records = selectAll2
-
-      records.each do |r|
-        unless File.exist? r.path
-          yield r if block_given?
-          r.record_id.delete
-        end
-      end
-    end
-
-    private 
-
-    def reopen_patch
-      # 削除系のコマンドが上手く動作しないためのパッチ
-      # 本質的な解決にはなっていないと思う
-      open(Database.dbdir)
-    end
-
-    def searchMain(patterns, packages, fpaths, suffixs, offset, limit)
-      table = @documents.select do |record|
-        expression = nil
-
-        # キーワード
-        patterns.each do |word|
-          sub_expression = record.content =~ word
-          if expression.nil?
-            expression = sub_expression
-          else
-            expression &= sub_expression
-          end
-        end
-        
-        # パッケージ(OR)
-        pe = package_expression(record, packages) 
-        if (pe)
-          if expression.nil?
-            expression = pe
-          else
-            expression &= pe
-          end
-        end
-        
-        # ファイルパス
-        fpaths.each do |word|
-          sub_expression = record.path =~ word
-          if expression.nil?
-            expression = sub_expression
-          else
-            expression &= sub_expression
-          end
-        end
-
-        # 拡張子(OR)
-        se = suffix_expression(record, suffixs) 
-        if (se)
-          if expression.nil?
-            expression = se
-          else
-            expression &= se
-          end
-        end
-        
-        # 検索式
-        expression
-      end
-
-      # スコアとタイムスタンプでソート
-      # records = table.sort([{:key => "_score", :order => "descending"},
-      #                       {:key => "timestamp", :order => "descending"}],
-      #                      :offset => offset,
-      #                      :limit => limit)
-      
-      # ファイル名でソート
-      records = table.sort([{:key => "shortpath", :order => "ascending"}],
-                           :offset => offset,
-                           :limit => limit)
-
-      # マッチ数
-      total_records = table.size
-      
-      return records, total_records
-    end
-    private :searchMain
-
-    def package_expression(record, packages)
-      sub = nil
-      
-      # @todo 専用カラム package が欲しいところ
-      #       でも今でもpackageはORとして機能してるからいいっちゃいい
-      packages.each do |word|
-        e = record.path =~ word
-        if sub.nil?
-          sub = e
-        else
-          sub |= e
-        end
+      if sort_kind == "favtime"
+        sorted = @grndb.packages.favs
+      elsif (sort_kind)
+        sorted = @grndb.packages.sort(sort_kind)
+      else
+        sorted = @grndb.packages.sort("name", "ascending")
       end
 
-      sub
+      sorted.map {|r| r.name}
     end
-    private :package_expression
 
-    def suffix_expression(record, suffixs)
-      sub = nil
-      
-      suffixs.each do |word|
-        e = record.suffix =~ word
-        if sub.nil?
-          sub = e
-        else
-          sub |= e
-        end
-      end
-
-      sub
+    def touch_viewtime(path)
+      package, restpath = Util::divide_shortpath(path)
+      @grndb.packages.touch(package, :viewtime) if package
     end
-    private :suffix_expression
     
-    def convert_packages(packages)
-      packages.inject([]) {|r, p| r += expand_packages(p)}
-    end
-
-    def expand_packages(keyword)
-      yaml_load.match_all(keyword).map{|p| p.directory}
-    end
+    private 
 
     def yaml_load
       YamlFileWrapper.load_if(Database.dbdir)
     end
 
-    # --- error ---
-    class NotFoundPackage < RuntimeError ; end
   end
 end

data/lib/milkode/cdweb/lib/mkurl.rb

@@ -24,6 +24,14 @@ module Milkode
       create_url(query_param(true, true, false))
     end
 
+    def inherit_query_shead_set_sort(sort_kind)
+      create_url(query_param(true, true, false, sort_kind))
+    end
+
+    def inherit_query_shead
+      create_url(query_param(true, true, false))
+    end
+
     def inherit_shead
       create_url(query_param(false, true, false))
     end
@@ -42,13 +50,14 @@ module Milkode
       end
     end
 
-    def query_param(query_inherit, shead_inherit, offset_inherit)
+    def query_param(query_inherit, shead_inherit, offset_inherit, sort_kind = nil)
       qparam = []
       qparam << "query=#{escape(@params[:query])}" if (query_inherit and @params[:query])
       qparam << "shead=#{escape(@params[:shead])}" if (shead_inherit and @params[:shead])
       qparam << "onematch=#{escape(@params[:onematch])}" if (shead_inherit and @params[:onematch])
       qparam << "offset=#{escape(@params[:offset])}" if (offset_inherit and @params[:offset])
       qparam << "line=#{escape(@params[:line])}" if (offset_inherit and @params[:line])
+      qparam << "sort=#{sort_kind}" if sort_kind
       qparam.join('&')
     end
   end