StrIdx 0.1.4 → 0.1.6

data/rubyext/extconf.rb

@@ -5,7 +5,7 @@ require 'mkmf'
 module_name = "stridx"
 extension_name = 'stridx'
 
-$CXXFLAGS << " -Wall -Wno-unused-variable -O3" 
+$CXXFLAGS << " -std=c++17 -Wall -Wno-unused-variable -O3" 
 
 have_library( 'stdc++');
 

data/rubyext/ruby_interf.cpp

@@ -48,7 +48,32 @@ VALUE StringIndexWaitUntilDone(VALUE self) {
   ((StrIdx::StringIndex *)data)->waitUntilDone();
   return self;
 }
-  
+
+VALUE StringIndexFindNum(VALUE self, VALUE str, VALUE _limit) {
+  VALUE ret;
+  std::string s1 = StringValueCStr(str);
+
+  void *data;
+  TypedData_Get_Struct(self, int, &str_idx_type, data);
+  StrIdx::StringIndex *idx = (StrIdx::StringIndex *)data;
+
+  int limit = NUM2INT(_limit);
+
+  ret = rb_ary_new();
+  const std::vector<std::pair<float, int>> &results = idx->findSimilar(s1);
+  int i = 0;
+  for (const auto &res : results) {
+    VALUE arr = rb_ary_new();
+    rb_ary_push(arr, INT2NUM(res.second));
+    rb_ary_push(arr, DBL2NUM(res.first));
+    rb_ary_push(ret, arr);
+    i++;
+    if (i >= limit) {
+      break;
+    }
+  }
+  return ret;
+}
 
 VALUE StringIndexFind(VALUE self, VALUE str) {
   VALUE ret;
@@ -59,8 +84,8 @@ VALUE StringIndexFind(VALUE self, VALUE str) {
   StrIdx::StringIndex *idx = (StrIdx::StringIndex *)data;
 
   ret = rb_ary_new();
-  const std::vector<std::pair<float, int>> &results = idx->findSimilar(s1, 2);
-  int limit = 15;
+  const std::vector<std::pair<float, int>> &results = idx->findSimilar(s1);
+  int limit = 40;
   int i = 0;
   for (const auto &res : results) {
     VALUE arr = rb_ary_new();
@@ -75,6 +100,57 @@ VALUE StringIndexFind(VALUE self, VALUE str) {
   return ret;
 }
 
+VALUE StringIndexFindFilesAndDirs(VALUE self, VALUE str) {
+  VALUE ret;
+  std::string s1 = StringValueCStr(str);
+
+  void *data;
+  TypedData_Get_Struct(self, int, &str_idx_type, data);
+  StrIdx::StringIndex *idx = (StrIdx::StringIndex *)data;
+
+  ret = rb_ary_new();
+  const std::vector<std::pair<float, std::string>> &results = idx->findFilesAndDirectories(s1);
+  int limit = 40;
+  int i = 0;
+  for (const auto &res : results) {
+    VALUE arr = rb_ary_new();
+    rb_ary_push(arr, rb_str_new_cstr(res.second.c_str()));
+    rb_ary_push(arr, DBL2NUM(res.first));
+    rb_ary_push(ret, arr);
+    i++;
+    if (i >= limit) {
+      break;
+    }
+  }
+  return ret;
+}
+
+VALUE StringIndexFindDirs(VALUE self, VALUE str) {
+  VALUE ret;
+  std::string s1 = StringValueCStr(str);
+
+  void *data;
+  TypedData_Get_Struct(self, int, &str_idx_type, data);
+  StrIdx::StringIndex *idx = (StrIdx::StringIndex *)data;
+
+  ret = rb_ary_new();
+  const std::vector<std::pair<float, std::string>> &results =
+      idx->findFilesAndDirectories(s1, false, true);
+  int limit = 40;
+  int i = 0;
+  for (const auto &res : results) {
+    VALUE arr = rb_ary_new();
+    rb_ary_push(arr, rb_str_new_cstr(res.second.c_str()));
+    rb_ary_push(arr, DBL2NUM(res.first));
+    rb_ary_push(ret, arr);
+    i++;
+    if (i >= limit) {
+      break;
+    }
+  }
+  return ret;
+}
+
 VALUE StringIndexSetDirSeparator(VALUE self, VALUE str) {
   char c = '/';
   if (TYPE(str) == T_STRING) {
@@ -95,6 +171,17 @@ VALUE StringIndexSetDirSeparator(VALUE self, VALUE str) {
   return self;
 }
 
+VALUE StringIndexSetDirWeight(VALUE self, VALUE d) {
+  if (TYPE(d) == T_FLOAT) {
+    double c_float = NUM2DBL(rb_funcall(d, rb_intern("to_f"), 0));
+    void *data;
+    TypedData_Get_Struct(self, int, &str_idx_type, data);
+    StrIdx::StringIndex *idx = (StrIdx::StringIndex *)data;
+    idx->setDirWeight(c_float);
+  }
+  return self;
+}
+
 void Init_stridx(void) {
 
   VALUE mStrIdx = rb_define_module("StrIdx");
@@ -104,10 +191,12 @@ void Init_stridx(void) {
   rb_define_method(classStringIndex, "add", StringIndexAddSegments, 2);
   rb_define_method(classStringIndex, "waitUntilDone", StringIndexWaitUntilDone, 0);
   rb_define_method(classStringIndex, "find", StringIndexFind, 1);
-  
+  rb_define_method(classStringIndex, "findNum", StringIndexFindNum, 2);
+  rb_define_method(classStringIndex, "setDirWeight", StringIndexSetDirWeight, 1);
+  rb_define_method(classStringIndex, "findFilesAndDirs", StringIndexFindFilesAndDirs, 1);
+  rb_define_method(classStringIndex, "findDirs", StringIndexFindDirs, 1);
+
   rb_define_method(classStringIndex, "setDirSeparator", StringIndexSetDirSeparator, 1);
-  
-  
 }
 
 } // End extern "C"

data/runserver.rb

@@ -1,7 +1,29 @@
 #!/usr/bin/env ruby
+
+# Add cur dir to load path
 $:.unshift File.dirname(__FILE__)
 
+def kill_signal
+  puts "\nShutting down..."
+  File.delete(File.expand_path("~/.stridx/sock"))
+end
+
+# https://gist.github.com/sauloperez/6592971
+# Trap ^C 
+Signal.trap("INT") { 
+  kill_signal 
+  exit
+}
+
+# Trap `Kill `
+Signal.trap("TERM") {
+  kill_signal
+  exit
+}
+
 require "server.rb"
 # StrIdx::Server.start ARGV, daemonize: true
 StrIdx::Server.start ARGV
 
+
+

data/server.rb

@@ -33,6 +33,7 @@ module StrIdx
     def initialize(dir_list, daemonize: false)
       idx = StrIdx::StringIndex.new
       idx.setDirSeparator("/")
+      idx.setDirWeight(0.85) # Lower scores for directory matches
 
       t = Time.new
 
@@ -86,8 +87,12 @@ module StrIdx
           # puts "Received from client: #{data}"
           if data.match(/^find:(.*)/)
             query = Regexp.last_match(1)
-            res = idx.find(query)
-            response = res.collect { |x| flist[x[0]] }.join("\n")
+            # TODO: not sure which is best as default:
+            # res = idx.find(query)
+            # res = idx.findDirs(query)
+            res = idx.findFilesAndDirs(query)
+            # response = res.collect { |x| flist[x[0]] }.join("\n")
+            response = res.collect { |x| "/"+x[0] }.join("\n")
 
             # Send a response back to the client
             client.puts response
@@ -98,6 +103,7 @@ module StrIdx
       }
 
       t.join
+      File.delete(sockfn)
     end
   end
 end

data/stridx.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = "StrIdx"
-  spec.version = "0.1.4"
+  spec.version = "0.1.6"
   spec.authors = ["Sami Sieranoja"]
   spec.email = ["sami.sieranoja@gmail.com"]
 
@@ -13,10 +13,6 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(refcode|spec|features)/})
   end
-  # spec.files << "thread_pool.hpp"
-  # spec.files << "exe/stridx.rb"
-  # spec.files << "server.rb"
-  # spec.files << "stridx-tty.rb"
 
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }