imsg-grep 0.1.4-darwin → 0.1.6.pre-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e9003c398da31639dbfde03aaec593b2f165940563851b5e6941d4a55a3ac7d
-  data.tar.gz: 98155da94f986fc1a3455f368d40c2b418d2e077980d9fbb536d375f1e3fffd4
+  metadata.gz: 40b1912c5695bdf6be658c8d149f5ff994b779116d3005e8e8efa53e8eb4f299
+  data.tar.gz: d01d37b5ec34c20eaaaaa013a3175ffd4eff37313379fdcda2b39944ca74f827
 SHA512:
-  metadata.gz: 4992137950786e7a8e3040f50378a8d8b285d6894913ae7aa8ec6c7b539048bf11be519cd5db8f3cd10fd888438a2707d1ba2b77f2de5ed387c788b317c76a4e
-  data.tar.gz: 319ef0da83aa8c21b8bc71f934744604def1b6b8e28b2ff361cdb34710e4d8a04787f9cc14a63fa1270fda60bc0f30adfbc96fef2fe2e489da5b8b3f0c64e5cf
+  metadata.gz: ba85f02f8e8b742387049b381a042caa136da0cea1f78b622ee1fa5916e81c6be0a6755173e880276a692fd8b1c8ab17975759067b16c713090baf120c9b9ea9
+  data.tar.gz: 23df2fbe2ea59d443f7346faeb66dc805724ef65aacf29a79c86d8612bba84d590f7b00af4d32ed51f0bfefd98f926f07014b1986ebb824eeab1abfa89045fb5

data/bin/imsg-grep

@@ -2,7 +2,6 @@
 # frozen_string_literal: true
 # Search and filter iMessage database entries with regex patterns, date ranges, and participant filters
 
-require "bundler/setup"
 
 require "date"
 require "json"
@@ -373,9 +372,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 +581,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 +597,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 +701,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 +711,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 +719,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/bin/msg-info

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # Display detailed information about a specific message by ID from the iMessage database
 
-require "bundler/setup"
-
 require_relative '../lib/imsg-grep/dev/print_query'
 require_relative '../lib/imsg-grep/messages'
 

data/bin/sql-shell

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # Interactive SQL shell for querying the iMessage database with readline history
 
-require "bundler/setup"
-
 require_relative '../lib/imsg-grep/messages'
 require_relative '../lib/imsg-grep/dev/print_query'
 require 'readline'

data/lib/imsg-grep/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.6.pre

data/lib/imsg-grep/images/img2png.rb

@@ -1,20 +1,22 @@
-require "ffi"
+require "fiddle"
+require "fiddle/import"
 
 module Img2png
-  extend FFI::Library
-  ffi_lib "#{__dir__}/img2png.dylib"
+  extend Fiddle::Importer
 
-  attach_function :img2png_load_path, [:string, :pointer, :pointer], :pointer, blocking: true
-  attach_function :img2png_load,      [:pointer, :int, :pointer, :pointer], :pointer, blocking: true
-  attach_function :img2png_convert,   [:pointer, :int, :int, :int, :int, :pointer, :pointer], :bool, blocking: true
-  attach_function :img2png_release,   [:pointer], :void
-  attach_function :img2png_free,      [:pointer], :void
+  dlload "#{__dir__}/img2png.dylib"
+
+  extern "void* img2png_load_path(char*, int*, int*)"
+  extern "void* img2png_load(void*, int, int*, int*)"
+  extern "int img2png_convert(void*, int, int, int, int, void**, int*)"
+  extern "void img2png_release(void*)"
+  extern "void img2png_free(void*)"
 
   class Image
-    def initialize(path:nil, data:nil)
+    def initialize(path: nil, data: nil)
       [path, data].compact.size == 1 or raise ArgumentError, "One of path: or data: must be specified"
-      out_w = FFI::MemoryPointer.new(:int)
-      out_h = FFI::MemoryPointer.new(:int)
+      out_w = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INT)
+      out_h = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INT)
 
       @handle = case
       when data then Img2png.img2png_load(data, data.bytesize, out_w, out_h)
@@ -22,15 +24,15 @@ module Img2png
       end
       raise "Failed to load image" if @handle.null?
 
-      @width  = out_w.read_int
-      @height = out_h.read_int
+      @width  = out_w[0, Fiddle::SIZEOF_INT].unpack1("i")
+      @height = out_h[0, Fiddle::SIZEOF_INT].unpack1("i")
     end
 
     def dimensions = [@width, @height]
 
     def convert(fit_w: nil, fit_h: nil, box_w: nil, box_h: nil)
-      out_data = FFI::MemoryPointer.new(:pointer)
-      out_len  = FFI::MemoryPointer.new(:int)
+      out_data = Fiddle::Pointer.malloc(Fiddle::SIZEOF_VOIDP)
+      out_len  = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INT)
 
       success = Img2png.img2png_convert(
         @handle,
@@ -39,18 +41,18 @@ module Img2png
         out_data, out_len
       )
 
-      return nil unless success
+      return nil if success == 0
 
-      ptr = out_data.read_pointer
-      len = out_len.read_int
-      result = ptr.read_bytes(len)
+      ptr = Fiddle::Pointer.new(out_data[0, Fiddle::SIZEOF_VOIDP].unpack1("J"))
+      len = out_len[0, Fiddle::SIZEOF_INT].unpack1("i")
+      result = ptr[0, len]
       Img2png.img2png_free(ptr)
       result
     end
 
     def release
       Img2png.img2png_release(@handle) unless @handle.null?
-      @handle = FFI::Pointer::NULL
+      @handle = Fiddle::NULL
     end
 
     def self.finalize(handle)
@@ -63,7 +65,7 @@ end
 # input = File.binread("x.heic")
 
 # # Load once, use multiple times
-# img = Img2png::Image.new(input)
+# img = Img2png::Image.new(data: input)
 
 # # Get dimensions
 # p img.dimensions  # => [4032, 3024]

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.6.pre
 platform: darwin
 authors:
 - Caio Chassot
@@ -10,19 +10,61 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ffi
+  name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: fiddle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.8
+- !ruby/object:Gem::Dependency
+  name: io-console
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.17'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.17'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +121,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: debug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +173,6 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- bin/img2png
 - bin/imsg-grep
 - bin/msg-info
 - bin/sql-shell