skygrepe 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f22cbaa714bda9bfe76939f658878636c3e0d683
-  data.tar.gz: 6d68b271847048f2b1da7302921c567b0ba82f22
+  metadata.gz: e3b185ee9a928eedca50a9d038e6ef68b117f88b
+  data.tar.gz: a53de235129d68a799e7335141e68d77f0113a7f
 SHA512:
-  metadata.gz: dfa7220a1da6da334b920443f45a566afc6965872728e0aea0285fbbcd1a7d5954b99ab52224476b733677d139e24f0228b43b870dc29c80c2275629417e83bc
-  data.tar.gz: 34dc9c90029fb01fe00ffd13ebd90e3895703cdb03b6b63abeba159a469cc781fddf15f956c726957bec26605abc4abc9d8150212a354c33836029fcac4c7314
+  metadata.gz: 2c1301b6a227e1c8506e1004f29b611b4392526cda6a3e764c98eeff6ae78e35c4ac607c0b193b19f9f31968cbe616497c3421ab1ff5b1927793c4a3bae6db3c
+  data.tar.gz: b868bead7ea3bab9a66e6192acd4644199a1983c6721c0e2b9938d5d793c7bcd0be80af63c092670af8a146d3e699507ebf09f7ce46eff67edd30ad1b7424def

data/bin/skygrepe

@@ -39,6 +39,17 @@ end
 $LOAD_PATH << File.expand_path("../../lib", __FILE__)
 require 'skygrepe'
 
+require "highline/system_extensions"
+
+def get_char_without_enter
+  HighLine::SystemExtensions.raw_no_echo_mode
+  begin
+    HighLine::SystemExtensions.get_character
+  ensure
+    HighLine::SystemExtensions.restore_mode
+  end
+end
+
 c =Skygrepe::Context.new(ARGV.first, config)
 while !c.quit?
   rows = c.run
@@ -46,12 +57,64 @@ while !c.quit?
     puts line.join("|")
   end
   break if c.count <= c.limit
-  print("command [next|prev|quit] ")
-  if cmd = $stdin.gets
-    case cmd.strip
-    when /\An/ then c.next
-    when /\Ap/ then c.prev
-    when /\Aq/ then c.quit
+
+  while true
+    print("command (h)elp: ")
+
+    if cmd = get_char_without_enter # $stdin.getc
+      if cmd == "\r".ord
+        print "\r               \n"
+        next
+      end
+      cmd = cmd.chr
+      print("\r")
+      case cmd
+      when /\Ah/ then
+        puts "(N)ext page or <SPACE>: next page of list"
+        puts "(P)rev page: previous page of list"
+        puts "(s)how: specify message id"
+        puts "(d)etail: show message"
+        puts "(n)ext: show next message"
+        puts "(p)rev: show previous message"
+        puts "(q)uit: quit"
+      when " " then c.next_page; break
+      when /\AN/ then c.next_page; break
+      when /\AP/ then c.prev_page; break
+      when /\Aq/ then c.quit; break
+      when /\As/ then
+        print(" " * 20)
+        print("\r")
+        print("type message id: ")
+        id = $stdin.gets
+        d = c.detail(id)
+        unless d
+          puts "no data found for #{id.inspect}"
+          break
+        end
+        puts d.join("|")
+      when /\Ad/ then
+        d = c.detail(c.current_id)
+        unless d
+          puts "No data"
+          break
+        end
+        puts d.join("|")
+      when /\An/ then
+        d = c.next_detail
+        unless d
+          puts "No data"
+          break
+        end
+        puts d.join("|")
+      when /\Ap/ then
+        d = c.prev_detail
+        unless d
+          puts "No data"
+          break
+        end
+        puts d.join("|")
+      end
     end
   end
+
 end

data/lib/skygrepe.rb

@@ -1,20 +1,23 @@
 require "skygrepe/version"
 require "sqlite3"
+require 'cgi/util'
 
 require "time"
 
 module Skygrepe
 
   class Context
-    attr_reader :count, :limit
+    attr_reader :count, :limit, :current_id
 
     def initialize(keyword, config)
       raise ArgumentError, "keyword is empty" if keyword.nil? || keyword.empty?
+      @keyword = keyword
       @config = config
-      @condition = Condition.new(keyword)
+      @condition = Condition.new(@keyword)
       @offset = 0
       @limit = 30
       @quit = false
+      @current_id = nil
     end
 
     def quit?
@@ -25,23 +28,48 @@ module Skygrepe
       @db ||= SQLite3::Database.new(@config["main_db_path"])
     end
 
+    def formatter
+      @formatter ||= Formatter.new(@keyword, {"time_format" => @config["time_format"]})
+    end
+
     def run
       @count ||= db.execute(@condition.count_sql).flatten.first.to_i
-      formatter = Formatter.new({"time_format" => @config["time_format"]})
       sql = @condition.grep_sql(@limit, @offset)
-      rows = db.execute(sql).map{|row| formatter.format(row) }
+      rows = db.execute(sql).map{|row| formatter.list(row) }
+      unless rows.empty?
+        @current_id = rows.first.first.to_i
+      end
       if @count <= @limit
         @quit = true
       end
       rows
     end
 
-    def next(page = 1)
+    def next_page(page = 1)
       @offset += (@limit * page)
     end
 
-    def prev(page = 1)
-      self.next( -1 * page)
+    def prev_page(page = 1)
+      self.next_page( -1 * page)
+    end
+
+    def detail(id)
+      sql = "SELECT m.id, m.timestamp, c.displayname, m.author, m.body_xml FROM Messages as m inner join Conversations as c on m.convo_id = c.id"
+      sql << " WHERE m.id = #{id}"
+      if d = db.execute(sql).first
+        @current_id = d.first.to_i
+        formatter.detail(d)
+      else
+        nil
+      end
+    end
+
+    def next_detail(d = 1)
+      detail(@current_id + d)
+    end
+
+    def prev_detail(d = 1)
+      self.next_detail( -1 * d)
     end
 
     def quit
@@ -71,14 +99,25 @@ module Skygrepe
   end
 
   class Formatter
-    def initialize(config)
+    def initialize(keyword, config)
+      @keyword = keyword
       @time_format = config["time_format"] || "%Y-%m-%d %H:%M"
     end
 
-    def format(row)
+    def list(row)
       row[1] = Time.at(row[1]).strftime(@time_format)
-      row[4] = (row[4] || '').gsub(/[\n\r]/m, '')
+      row[4] = format_message(row[4] || '').gsub(/[\n\r]/m, '')
       row
     end
+
+    def detail(row)
+      row[1] = Time.at(row[1]).strftime(@time_format)
+      row[4] = format_message(row[4] || '')
+      row
+    end
+
+    def format_message(msg)
+      CGI.unescape_html(msg || '').gsub(/(#{Regexp.escape(@keyword)})/i){ "\e[32m#{$1}\e[0m" }
+    end
   end
 end

data/lib/skygrepe/version.rb

@@ -1,3 +1,3 @@
 module Skygrepe
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/skygrepe.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "sqlite3"
+  spec.add_dependency "highline"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skygrepe
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - akima
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement