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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57ddef6878c4ff5a7359f79d3482c5b0e9c391ed5170623bb06c7c4e5ddebb83
-  data.tar.gz: b2b548bf55ba13909a0e006b3dbfb27cdb633e575028e64bb358b525cdd35ae9
+  metadata.gz: 40b1912c5695bdf6be658c8d149f5ff994b779116d3005e8e8efa53e8eb4f299
+  data.tar.gz: d01d37b5ec34c20eaaaaa013a3175ffd4eff37313379fdcda2b39944ca74f827
 SHA512:
-  metadata.gz: 5d6ea1f60dd4b4b132375c662156df78ab3de53e2def55d56763bba30a1c88bf7abec7246be24fe5cecab5c39b11bae098114dd28509d5ea4972aba5de27522b
-  data.tar.gz: 397b91312c94deb494289c14a038ddbb199707a6a65c4c652b5790697090816bcb17029eb3b76be037bf1c03ac30dc1fbf784162cb06e8b992a7688158f947f9
+  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"

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.5
+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]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imsg-grep
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  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