imsg-grep 0.1.4-darwin → 0.1.5-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e9003c398da31639dbfde03aaec593b2f165940563851b5e6941d4a55a3ac7d
-  data.tar.gz: 98155da94f986fc1a3455f368d40c2b418d2e077980d9fbb536d375f1e3fffd4
+  metadata.gz: 57ddef6878c4ff5a7359f79d3482c5b0e9c391ed5170623bb06c7c4e5ddebb83
+  data.tar.gz: b2b548bf55ba13909a0e006b3dbfb27cdb633e575028e64bb358b525cdd35ae9
 SHA512:
-  metadata.gz: 4992137950786e7a8e3040f50378a8d8b285d6894913ae7aa8ec6c7b539048bf11be519cd5db8f3cd10fd888438a2707d1ba2b77f2de5ed387c788b317c76a4e
-  data.tar.gz: 319ef0da83aa8c21b8bc71f934744604def1b6b8e28b2ff361cdb34710e4d8a04787f9cc14a63fa1270fda60bc0f30adfbc96fef2fe2e489da5b8b3f0c64e5cf
+  metadata.gz: 5d6ea1f60dd4b4b132375c662156df78ab3de53e2def55d56763bba30a1c88bf7abec7246be24fe5cecab5c39b11bae098114dd28509d5ea4972aba5de27522b
+  data.tar.gz: 397b91312c94deb494289c14a038ddbb199707a6a65c4c652b5790697090816bcb17029eb3b76be037bf1c03ac30dc1fbf784162cb06e8b992a7688158f947f9

data/bin/imsg-grep

@@ -373,9 +373,13 @@ begin
 
   begin
     Messages.init_fs
-  rescue Errno::EPERM, Errno::EACCES
-    $stderr.print "You must grant #{ENV['TERM_PROGRAM']} Full Disk Access so #{PROG} can access the chat database. Open System Settings pane? [y/N] "
-    $stdin.gets.to_s.strip.downcase == "y" and system 'open "x-apple.systempreferences:com.apple.preference.security?Privacy_AllFiles"'
+  rescue Errno::EPERM, Errno::EACCES => e
+    if $stdout.tty? && $stdin.tty?
+      $stderr.print "You must grant #{ENV['TERM_PROGRAM']} Full Disk Access so #{PROG} can access the chat database. Open System Settings pane? [y/N] "
+      $stdin.gets.to_s.strip.downcase == ?y and system 'open "x-apple.systempreferences:com.apple.preference.security?Privacy_AllFiles"'
+    else
+      err! "full disk access required (#{e.message})"
+    end
     exit 1
   rescue => e
     err! e.message
@@ -578,7 +582,9 @@ begin
       @link_images[link] = Concurrent::Promises.future_on(POOL, msg) do |msg|
         ix   = link[:image_idx] or next
         file = msg.dig(:files, ix) or next
-        path = File.expand_path file[:filename]
+        path = file[:filename] or next
+        path = File.expand_path path
+        File.exist?(path) or next
         img  = Imaginator::Image.new(path).load or next
         fit, fits = img.fit @link_preview_cols, @link_preview_min_rows
         png = img.png_transform w:fit.w, h:fit.h, pad_w:fits[:cfit].pad_w
@@ -592,7 +598,9 @@ begin
       msg[:images] = msg[:files].select{ it[:mime_type]&.start_with?('image/') }
       preview?(:images) and msg[:images].each do |im|
         @images[im] = Concurrent::Promises.future_on(POOL, im) do |im|
-          path = File.expand_path im[:filename]
+          path = im[:filename] or next
+          path = File.expand_path path
+          File.exist?(path) or next
           img  = Imaginator::Image.new(path).load or next
           fit, = img.fit 25, @img_rows
           png  = img.png_transform w:fit.w, h:fit.h
@@ -694,7 +702,7 @@ begin
         if img_rows != @link_preview_min_rows
           img = Imaginator::Image.new(img).load if img.is_a? String # it's a path, original img released
           fit1, fits = img.fit @link_preview_cols, img_rows
-          # if the backround render image is different from what we need now that we know the text size, do it again
+          # if the promise-rendered image is different from what we need now that we know the text size, do it again
           if fit1 != fit
             fit = fit1
             png = img.png_transform w:fit.w, h:fit.h, pad_w:fits[:cfit].pad_w
@@ -704,7 +712,7 @@ begin
         print " "
         Imaginator.print_image(data: png, c: @link_preview_cols)
         puts
-        print "\e[#{fit.r}A" # go up by image rows
+        print "\e[#{fit.r}A" # go up by image rows to print padded buf next to it
       end
 
       print buf
@@ -712,7 +720,7 @@ begin
 
       if @list_files
         for file in files.reject{ it[:mime_type].nil? }
-          path, _, name = file[:filename].rpartition %r_(?<=/)_
+          path, _, name = file[:filename].to_s.rpartition %r_(?<=/)_
           p, q, r = path.rpartition %r_/\KTemporaryItems(?=/)_
           path = c.file_path(p) + c.file_path_bad(q) + c.file_path(r)
           puts "  " + path + c.file_name(name) + ?\n

data/lib/imsg-grep/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/imsg-grep/messages.rb

@@ -189,7 +189,7 @@ module Messages
       summary   = rich_link&.dig "summary"
       image     = rich_link&.dig "imageMetadata", "URL"
       image_idx = rich_link&.dig "image", "richLinkImageAttachmentSubstituteIndex"
-      ci_idx    = rich_link&.dig("contentImages")&.at(0)&.dig("richLinkImageAttachmentSubstituteIndex")
+      ci_idx    = rich_link&.dig "contentImages", 0, "richLinkImageAttachmentSubstituteIndex"
       image_idx = ci_idx if ci_idx
       url = rich_url || orig_url || found_url
       # i'm not sure the mapping richLinkImageAttachmentSubstituteIndex to

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imsg-grep
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: darwin
 authors:
 - Caio Chassot
@@ -117,7 +117,6 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- bin/img2png
 - bin/imsg-grep
 - bin/msg-info
 - bin/sql-shell