imsg-grep 0.1.8-darwin → 0.1.9-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f76e2f8bd190242f5894404a9a7e06d27a326f9c9ac53a554b0737de814368de
-  data.tar.gz: 0e132c730b11b689ea2c49dc54d169e6cdd8e04224069ead6ef76c1bb047e08e
+  metadata.gz: 3f325277a5246f7b7c573ef53fe51dd0c59d54785cfaae5d14fc92f29080c660
+  data.tar.gz: a2fb623ebd5fd37bbbcebba44d38c0601427c7205fc9e8c8b3b9306f470a1ea9
 SHA512:
-  metadata.gz: 195e09aba5f3dff9d9ccf557a76daf28052cc3960762cf9f31455b853363df0ce889be7a1b3f3e109b2e7b34a51ad9a4499bccc598f6b43b15676b08feceee7d
-  data.tar.gz: 0c0fd316926a265389611ea3aee83c867829a22059117534b7a949395d0ef81d15295ea09d8fc885d4d03ba215845c4556d3d3f804dcfbfd1f5bfb0684abb66e
+  metadata.gz: f4f948a11ef66632c8f864642ed10e8898158e615703b0aa294bacd5907f34c41f10e1731e405622c67904865df94797251c86e8b5a8819f35c1c36a8ecad555
+  data.tar.gz: 1da625d8798d2c7063d3fb47376f11965ba1a494a978dd478994c0aca081be210b3b72ec118adf236dcd12d24de691dd5b9ea07b8c82208588b9790f15fdc301

data/bin/imsg-grep

@@ -45,8 +45,9 @@ end
 def consume(ivarname) = instance_variable_get(ivarname).tap{ instance_variable_set(ivarname, nil) }
 
 # wrap and indent text, respecting SGR sequences; only if tty
-def wrap(s, indent=0, maxw = IO.console.winsize[1] - 2, disable: (!$stdout.tty?||@no_wrap), wrap_all: false)
+def wrap(s, indent=0, maxw = nil, disable: (!$stdout.tty?||@no_wrap), wrap_all: false)
   return s if disable
+  maxw ||= IO.console.winsize[1] - 2
   sgr = /\e\[[\d;]*m/
   pad = "\e[#{indent}C"
 
@@ -359,6 +360,10 @@ begin
 
   def match(x, r) = "#{x} REGEXP '#{SQLite3::Database.quote r.to_s}'"
   def match_searchable(x, r) = "EXISTS (SELECT 1 FROM json_each(#{x}) WHERE #{match(:value, r)})"
+  def match_any(xs, r) = xs.map{ match(it, r) }.join(" OR ").then{ "(#{it})" }
+  def match_url(r) = match_any(%w[ link->>'url' link->>'original_url' ], r)
+
+  @link_meta = @conditions.positive(:links).any? # with link filters, msg patterns also match link title/summary
 
   groups = @conditions.slice_before{ !(Symbol === it.bin_op) }
 
@@ -405,16 +410,16 @@ begin
       in :until,   _           then date_cmp(:<=, term)
       in :from_me, _           then "is_from_me IS #{term}"
       in :links,   true        then "link IS NOT NULL"
-      in :links,   :youtube    then match(:link, %r["https?://((www\.)?youtube\.com|youtu\.be)/]i) # matching inside json, " acts as \A sort of
-      in :links,   :soundcloud then match(:link, %r["https?://(on\.)?soundcloud\.com/]i)
-      in :links,   :twitter    then match(:link, %r["https?://(pic\.)?(twitter|x)\.com/]i)
-      in :links,   Regexp      then match(:link, term)
+      in :links,   :youtube    then match_url(%r[\Ahttps?://((www\.)?youtube\.com|youtu\.be)/]i)
+      in :links,   :soundcloud then match_url(%r[\Ahttps?://(on\.)?soundcloud\.com/]i)
+      in :links,   :twitter    then match_url(%r[\Ahttps?://(pic\.)?(twitter|x)\.com/]i)
+      in :links,   Regexp      then match_url(term)
       in :from,    Regexp      then match_searchable(:sender_searchable, term)
       in :to,      Regexp      then match_searchable(:recipients_searchable, term)
       in :with,    Regexp      then match_searchable(:members_searchable, term)
       in :chat,    Regexp      then match(:chat_name, term)
       in :chat, (true | false) then "(is_group_chat IS #{'NOT' unless term} TRUE)" # so nulls also match -vc
-      in :message, Regexp      then match(:text, term)
+      in :message, Regexp      then @link_meta ? match_any(%w[ text link->>'title' link->>'summary' ], term) : match(:text, term)
       in :service, Regexp      then match(:service, term)
       in :files, :any          then "(has_attachments AND has_files IS TRUE)"  # has_attachments first should be a faster check
       in :files, :images       then "(has_attachments AND has_images IS TRUE)"
@@ -551,6 +556,7 @@ begin
   l_conds = @conditions.positive(:links).map(&:term).select{ Regexp===it } + m_conds
   rx_highlight      = /#{m_conds*?|}/ if m_conds.any?
   rx_link_highlight = /#{l_conds*?|}/ if l_conds.any?
+  rx_meta_highlight = rx_highlight if @link_meta
 
   def highlight(s, r, a, b)
     return unless s
@@ -674,7 +680,7 @@ begin
     if @no_meta # oneline included, already onelined above
       puts text
     elsif @one_line
-      text << " #{c.link_summary(oneline[title])}" if title
+      text << " #{highlight(oneline[title], rx_meta_highlight, :link_summary, :match!)}" if title
       to = chat_name.to_s.empty? ? to*', ' : chat_name
       buf = "#{c.l_time time} [#{c.l_from from} -> #{c.l_to to}]: #{text}"
       buf.prepend "#{guid} " if @debug
@@ -696,8 +702,8 @@ begin
 
       buf = +""
       buf << wrap(text, pad, wrap_all: !!link_image_result) << nn unless text.empty?
-      buf << c.link_title(wrap(title, pad, wrap_all: !!link_image_result)) << nn if title
-      buf << c.link_summary(wrap(summary, pad, wrap_all: !!link_image_result)) << nn if summary
+      buf << wrap(highlight(title,   rx_meta_highlight, :link_title,   :match!), pad, wrap_all: !!link_image_result) << nn if title
+      buf << wrap(highlight(summary, rx_meta_highlight, :link_summary, :match!), pad, wrap_all: !!link_image_result) << nn if summary
 
       if link_image_result
         buf_rows = buf.strip.count(?\n) + 1

data/doc/HELP

@@ -29,6 +29,8 @@ Link filtering:
     -Y, --youtube           Find youtube links
     -S, --soundcloud        Find soundcloud links
     -X, --twitter           Find twitter links
+                            With any of these, message patterns also match
+                            link title and summary
 
 Pattern modifiers:
     -C, --smart-case        Case-sensitive only when pattern has uppercase

data/lib/imsg-grep/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imsg-grep
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: darwin
 authors:
 - Caio Chassot
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.21
 specification_version: 4
 summary: iMessage database search
 test_files: []