milkode 0.9.5 → 0.9.6

data/lib/milkode/cdweb/lib/web_setting.rb

@@ -17,12 +17,18 @@ module Milkode
       :header_title => "Milkode",
       :header_icon  => "/images/MilkodeIcon135.png",
 
+      :favicon      => "/images/favicon.ico",
+
       :display_about_milkode => true
     }
 
     def self.hash_method(name)
       define_method(name) do
-        @data[name]
+        if @data[name]
+          @data[name]
+        else
+          DEFAULT_SETTING[name]
+        end
       end
     end
 
@@ -43,6 +49,8 @@ module Milkode
     hash_method :header_title
     hash_method :header_icon
 
+    hash_method :favicon
+    
     def about_milkode
       if (@data[:display_about_milkode])
         ', <a href="http://milkode.ongaeshi.me">milkodeについて</a>'

data/lib/milkode/cdweb/public/css/milkode.css

@@ -31,6 +31,11 @@ dt.result-file {
     font-size: 95%;
 }
 
+#result-refinement {
+    font-size:80%;
+    font-weight:500;
+}
+
 div.pagination {
     /* border-color: #e92926; */
     /* background-color:#FFF0F0; */

data/lib/milkode/cdweb/public/js/milkode.js

@@ -7,8 +7,7 @@ function escapeHTML(str) {
   return str.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
 
-function replace_query_param(url, value)
-{
+function replace_query_param(url, value) {
   var url_s = url.split("?");
 
   if (url_s.length <= 1) {
@@ -35,22 +34,19 @@ function replace_query_param(url, value)
   }
 }
 
-function topic_path(id)
-{
+function topic_path(id) {
   var url = document.getElementById(id).href;
   url = replace_query_param(url, document.searchform.query.value);
   document.getElementById(id).href = url;
 }
 
-function repalce_package_name(url, package_name)
-{
+function repalce_package_name(url, package_name) {
   var url_s = url.split("?");
   url = url_s[0].replace(/\/home(\/.*)?/, "/home/" + package_name); // home以下をパッケージ名に置き換え
   return url;
 }
 
-function select_package()
-{
+function select_package() {
   var url = document.URL;
   var name = document.getElementById('package').value;
 
@@ -62,8 +58,7 @@ function select_package()
   document.location = url;
 }
 
-function select_package_home()
-{
+function select_package_home() {
   var url = document.URL.replace(/\/$/, "");
   var name = document.getElementById('package_home').value;
 
@@ -74,40 +69,7 @@ function select_package_home()
   document.location = url + "/home/" + name;
 }
 
-$(document).ready(function(){
-  $("select#package").multiselect({
-    multiple: false,
-    header: "",
-    selectedList: 1,
-    height: 450
-  }).multiselectfilter();
-
-  $("select#package_home").multiselect({
-    multiple: false,
-    header: "",
-    selectedList: 1,
-    height: 350
-  }).multiselectfilter();
-
-  $("#updateOk").click(function (e) {
-    update_package($("#updateOk").attr("milkode-package-name"));
-    return false;
-  });
-
-  var match = document.URL.match(/.+(#n\d+)$/);
-  if ( match ) {
-    $(match[1]).addClass("select-line");
-  } else {
-    $("#query").select();
-  }
-
-  $('#query').click(function(){
-    $(this).select();
-  });
-});
-
-function update_package(package_name)
-{
+function update_package(package_name) {
   // click button
   $("#updateModal .modal-body").html("<h4>更新中... <img src='/images/waiting.gif'/></h4>");
   $("#updateCancel").addClass("hide");
@@ -127,8 +89,7 @@ function update_package(package_name)
   );
 }
 
-function clippy_text(text, bgcolor)
-{
+function clippy_text(text, bgcolor) {
   return '    <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"' + 
     '            width="110"' +
     '            height="14"' +
@@ -153,8 +114,7 @@ function clippy_text(text, bgcolor)
     '    </object>';
 }
 
-function lineno_setup(path, lineno)
-{
+function lineno_setup(path, lineno) {
   var n_lineno     = "#n" + lineno;
 
   // scroll reset
@@ -176,3 +136,41 @@ function lineno_setup(path, lineno)
   $("#lineno-copyall").html("Lineno + Text" + clippy_text(directpath + " " + escapeHTML(n_lineno_dom.text()), '#F5F5F5'));
 }
 
+$(document).ready(function() {
+  $("select#package").multiselect({
+    multiple: false,
+    header: "",
+    selectedList: 1,
+    height: 450
+  }).multiselectfilter();
+
+  $("select#package_home").multiselect({
+    multiple: false,
+    header: "",
+    selectedList: 1,
+    height: 350
+  }).multiselectfilter();
+
+  $("#updateOk").click(function (e) {
+    update_package($("#updateOk").attr("milkode-package-name"));
+    return false;
+  });
+
+  var match = document.URL.match(/.+(#n\d+)$/);
+  if ( match ) {
+    $(match[1]).addClass("select-line");
+  } else {
+    $("#query").select();
+  }
+
+  $('#query').click(function(){
+    $(this).select();
+  });
+
+  $('#shead').change(function(){
+    $('#search').click();
+  });
+});
+
+
+

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

@@ -6,6 +6,7 @@
   %head
     %meta(charset='utf-8')
     %title= [@title, @setting.home_title].compact.join(' - ')
+    %link(rel="shortcut icon" href="#{@setting.favicon}")
     %link(rel="stylesheet" href="/css/bootstrap.min.css"  type="text/css" media="all")
     %link(rel="stylesheet" href="/css/bootstrap-responsive.min.css"  type="text/css" media="all")
     %link(rel="stylesheet" href="/css/milkode.css"  type="text/css" media="all")

data/lib/milkode/cli.rb

@@ -33,9 +33,12 @@ Samples:
   milk add http://example.com/urlfile.zip
   milk add git://github.com/ongaeshi/milkode.git
 EOF
-    option :empty, :type => :boolean, :desc => 'Add empty package.'
-    option :ignore, :type => :array, :aliases => '-i', :desc => 'Ignore path.'
-    option :no_auto_ignore, :type => :boolean, :aliases => '-n', :desc => 'Disable auto ignore.'
+    option :empty,          :type => :boolean,                     :desc => 'Add empty package.'
+    option :ignore,         :type => :array,   :aliases => '-i',   :desc => 'Ignore path.'
+    option :name,           :type => :string,  :aliases => '-n',   :desc => 'Rename package.'
+    option :no_auto_ignore, :type => :boolean, :aliases => '--ni', :desc => 'Disable auto ignore.'
+    option :protocol,       :type => :string,  :aliases => '-p',   :desc => 'Specify protocol. (git, svn)'
+    
     option :verbose, :type => :boolean, :aliases => '-v', :desc => 'Be verbose.'
     
     def add(*args)

data/lib/milkode/common/util.rb

@@ -116,6 +116,10 @@ module Milkode
       keyword =~ /\A\/.*:\d+\Z/
     end
 
+    def fuzzy_gotoline_keyword?(keyword)
+      keyword =~ /\A.*:\d+\Z/
+    end
+
     # parse_gotoline(['a', '123', 'b']) #=> [['a', 'b'], 123]]
     # parse_gotoline(['a', '123', 'b', 55]) #=> [['a', 'b', '123'], 55]]
     # parse_gotoline(['a:5']) #=> [['a'], 55]]
@@ -179,6 +183,10 @@ module Milkode
       (src =~ /^(:?git[:@])|(:?ssh:)/) != nil
     end
 
+    def svn_url?(src)
+      (src =~ /^(:?svn|svn\+ssh):\/\//) != nil
+    end
+
     # StringIO patch
     def pipe?(io)
       !io.instance_of?(IO) || !File.pipe?(io) 
@@ -187,6 +195,17 @@ module Milkode
     def warning_alert(out, msg)
       out.puts "[warning] #{msg}"
     end
+
+    def load_content(out, filename)
+      str = File.read(filename)
+      begin
+        Kconv.kconv(str, Kconv::UTF8)
+      rescue ArgumentError
+        warning_alert(out, "skip kconv. file size too big (or negative string size) : #{filename}.")
+        str
+      end
+    end
+    
   end
 end
 

data/lib/milkode/database/document_table.rb

@@ -33,6 +33,37 @@ module Milkode
         end
       end
     end
+
+    # レコードをまとめて削除する
+    #   検索結果にマッチしたレコード等をまとめて削除
+    #   削除前にインデックスを削除し、削除後にインデックスを再度追加してい
+    #   大量のレコードを削除する場合に高速に動作する
+    def remove_records(records, &block)
+      Groonga::Schema.define do |schema|
+        schema.change_table("terms") do |table|
+          table.remove_index("documents.path")
+          table.remove_index("documents.package")
+          table.remove_index("documents.restpath")
+          table.remove_index("documents.content")
+          table.remove_index("documents.suffix")
+        end
+      end
+
+      records.each do |record|
+        yield record if block
+        record.key.delete
+      end
+
+      Groonga::Schema.define do |schema|
+        schema.change_table("terms") do |table|
+          table.index("documents.path", :with_position => true)
+          table.index("documents.package", :with_position => true)
+          table.index("documents.restpath", :with_position => true)
+          table.index("documents.content", :with_position => true)
+          table.index("documents.suffix", :with_position => true)
+        end
+      end
+    end
     
     def initialize(table)
       @table = table
@@ -94,19 +125,12 @@ module Milkode
       @table[name].delete
     end
 
-    def remove_match_path(path)
-      result = search(:paths => [path])
-
-      result.each do |r|
-          yield r if block_given?
-          r.record_id.delete
-      end
+    def remove_match_path(path, &block)
+      remove_records(search(:paths => [path]), &block)
     end
 
-    def remove_all
-      self.each do |r|
-        r.record_id.delete
-      end
+    def remove_all(&block)
+      remove_records(@table.select, &block)
     end
 
     # shortpathの一致するレコードを取得
@@ -137,7 +161,7 @@ module Milkode
         unless File.exist? r.path
           yield r if block_given?
           # p r.restpath
-          r.record_id.delete
+          remove(r.path)
         end
       end
     end
@@ -301,16 +325,16 @@ module Milkode
     end
 
     # 指定されたパッケージのクリーンアップ
-    def cleanup_package_name(package)
+    def cleanup_package_name(package_name)
       # クリーンアップ対象のファイルを検索
-      result = @table.select { |record| record.package == package }
+      result = @table.select { |record| record.package == package_name }
 
       # 存在しないファイルの削除
       result.each do |r|
         unless File.exist? r.path
           yield r if block_given?
           # p r.restpath
-          r.record_id.delete
+          remove(r.path)
         end
       end
     end
@@ -334,13 +358,7 @@ module Milkode
     private
 
     def load_content(filename)
-      str = File.read(filename)
-      begin
-        Kconv.kconv(str, Kconv::UTF8)
-      rescue ArgumentError
-        Util.warning_alert($stdout, "skip kconv. file size too big (or negative string size) : #{filename}.")
-        str
-      end
+      Util::load_content($stdout, filename)
     end
 
     def package_expression(record, packages)

data/lib/milkode/database/package_table.rb

@@ -44,7 +44,7 @@ module Milkode
 
     def remove_all
       self.each do |r|
-        r.record_id.delete
+        remove(r.name)
       end
     end
 

data/lib/milkode/database/updater.rb

@@ -30,6 +30,11 @@ module Milkode
         Dir.chdir(@package.directory) { system("git pull") }        
       end
       
+      # svn update
+      if @options[:update_with_svn_update]
+        Dir.chdir(@package.directory) { system("svn update") }
+      end
+
       # cleanup
       unless @options[:no_clean]
         @grndb.documents.cleanup_package_name(@package_name)
@@ -62,6 +67,10 @@ module Milkode
       @options[:update_with_git_pull] = true      
     end
 
+    def enable_update_with_svn_update
+      @options[:update_with_svn_update] = true
+    end
+
     def enable_no_clean
       @options[:no_clean] = true      
     end
@@ -209,14 +218,12 @@ module Milkode
     end
 
     def add_current_gitignore(dirname, path)
-      git_ignore = File.join(dirname, path, ".gitignore")
+      filename = File.join(dirname, path, ".gitignore")
       
-      if File.exist? git_ignore
-        alert_info("add_ignore", git_ignore)
-        
-        open(git_ignore) do |f|
-          @current_ignore.add IgnoreSetting.create_from_gitignore(path, f.read)
-        end
+      if File.exist? filename
+        alert_info("add_ignore", filename)
+        str = Util::load_content($stdout, filename)
+        @current_ignore.add IgnoreSetting.create_from_gitignore(path, str)
       end
     end
 

data/lib/milkode/findgrep/findgrep.rb

@@ -20,6 +20,7 @@ module FindGrep
                         :directory,
                         :depth,
                         :ignoreCase,
+                        :caseSensitive,
                         :colorHighlight,
                         :isSilent,
                         :debugMode,
@@ -47,6 +48,7 @@ module FindGrep
                                 false,
                                 false,
                                 false,
+                                false,
                                 [],
                                 [],
                                 [],
@@ -68,15 +70,15 @@ module FindGrep
     attr_reader :documents
     
     def initialize(patterns, option)
-      @patterns = patterns
-      @option = option
-      @patternRegexps = strs2regs(patterns, @option.ignoreCase)
-      @subRegexps = strs2regs(option.patternsNot, @option.ignoreCase)
-      @orRegexps = strs2regs(option.patternsOr, @option.ignoreCase)
-      @filePatterns = (!@option.dbFile) ? strs2regs(option.filePatterns) : []
-      @ignoreFiles = strs2regs(option.ignoreFiles)
-      @ignoreDirs = strs2regs(option.ignoreDirs)
-      @result = Result.new(option.directory)
+      @patterns       = patterns
+      @option         = option
+      @patternRegexps = strs2regs(patterns)
+      @subRegexps     = strs2regs(option.patternsNot)
+      @orRegexps      = strs2regs(option.patternsOr)
+      @filePatterns   = (!@option.dbFile) ? strs2regs_simple(option.filePatterns) : []
+      @ignoreFiles    = strs2regs_simple(option.ignoreFiles)
+      @ignoreDirs     = strs2regs_simple(option.ignoreDirs)
+      @result         = Result.new(option.directory)
       open_database if (@option.dbFile)
     end
 
@@ -97,18 +99,28 @@ module FindGrep
       end
     end
 
-    def strs2regs(strs, ignore = false)
+    def strs2regs(strs)
       regs = []
 
       strs.each do |v|
         option = 0
-        option |= Regexp::IGNORECASE if (ignore)
+        option |= Regexp::IGNORECASE if (@option.ignoreCase || (!@option.caseSensitive && Milkode::Util::downcase?(v)))
         regs << Regexp.new(v, option)
       end
 
       regs
     end
 
+    def strs2regs_simple(strs)
+      regs = []
+
+      strs.each do |v|
+        regs << Regexp.new(v, 0)
+      end
+
+      regs
+    end
+
     def searchAndPrint(stdout)
       unless (@option.dbFile)
         searchFromDir(stdout, @option.directory, 0)