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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40b1912c5695bdf6be658c8d149f5ff994b779116d3005e8e8efa53e8eb4f299
-  data.tar.gz: d01d37b5ec34c20eaaaaa013a3175ffd4eff37313379fdcda2b39944ca74f827
+  metadata.gz: b5e2dfdd74fe32aea6304caa61d2891aea0ecd679759091e76b4af416fbe8991
+  data.tar.gz: c2e667c507d979e73b4f3efc2e474fac450133b8207a63ac55e06b9e31433896
 SHA512:
-  metadata.gz: ba85f02f8e8b742387049b381a042caa136da0cea1f78b622ee1fa5916e81c6be0a6755173e880276a692fd8b1c8ab17975759067b16c713090baf120c9b9ea9
-  data.tar.gz: 23df2fbe2ea59d443f7346faeb66dc805724ef65aacf29a79c86d8612bba84d590f7b00af4d32ed51f0bfefd98f926f07014b1986ebb824eeab1abfa89045fb5
+  metadata.gz: 447da88e82acd98f66a82f3486866ebe1e04bf9d9e56804b2fe8c5b9e7ecf5f66a100ad487fb3060fc51bbfbd78143dc14fd9b49006edc6750389c79716cb8e4
+  data.tar.gz: 57174003bbfe1a38c1865593b2f925314976e4aaa952863121c26f2de3e55a679f9fa7f4a64bada094d3ec827c909f826c7c3152000460300d5928b1bdcd777c

data/README.md

@@ -26,6 +26,7 @@ swiftc for development. (run `rake build:lib`)
 ## Installing
 
 ```
+brew install ruby
 gem install imsg-grep
 ```
 

data/bin/imsg-grep

@@ -578,12 +578,12 @@ begin
     messages.each do |msg|
       preview?(:links) and
       link = msg[:link] and
+      link.tap{ it[:guid] = msg[:guid] } and # adding guid ensures link is a uniq key so identical links dont overwrite the prev
       @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[:filename] or next
-        path = File.expand_path path
-        File.exist?(path) or next
+        ix   = link[:image_idx] and
+        file = msg.dig(:files, ix) and
+        path = file[:filename] and
+        path = File.expand_path(path) and File.exist?(path) and
         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
@@ -595,11 +595,11 @@ begin
         [fit, png, img]
       end
       msg[:images] = msg[:files].select{ it[:mime_type]&.start_with?('image/') }
-      preview?(:images) and msg[:images].each do |im|
+      preview?(:images) and
+      msg[:images].each do |im|
         @images[im] = Concurrent::Promises.future_on(POOL, im) do |im|
-          path = im[:filename] or next
-          path = File.expand_path path
-          File.exist?(path) or next
+          path = im[:filename] and
+          path = File.expand_path(path) and File.exist?(path) and
           img  = Imaginator::Image.new(path).load or next
           fit, = img.fit 25, @img_rows
           png  = img.png_transform w:fit.w, h:fit.h

data/lib/imsg-grep/VERSION

@@ -1 +1 @@
-0.1.6.pre
+0.1.7

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

@@ -1,22 +1,20 @@
-require "fiddle"
-require "fiddle/import"
+require "ffi"
 
 module Img2png
-  extend Fiddle::Importer
+  extend FFI::Library
+  ffi_lib "#{__dir__}/img2png.dylib"
 
-  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*)"
+  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
 
   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 = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INT)
-      out_h = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INT)
+      out_w = FFI::MemoryPointer.new(:int)
+      out_h = FFI::MemoryPointer.new(:int)
 
       @handle = case
       when data then Img2png.img2png_load(data, data.bytesize, out_w, out_h)
@@ -24,15 +22,15 @@ module Img2png
       end
       raise "Failed to load image" if @handle.null?
 
-      @width  = out_w[0, Fiddle::SIZEOF_INT].unpack1("i")
-      @height = out_h[0, Fiddle::SIZEOF_INT].unpack1("i")
+      @width  = out_w.read_int
+      @height = out_h.read_int
     end
 
     def dimensions = [@width, @height]
 
     def convert(fit_w: nil, fit_h: nil, box_w: nil, box_h: nil)
-      out_data = Fiddle::Pointer.malloc(Fiddle::SIZEOF_VOIDP)
-      out_len  = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INT)
+      out_data = FFI::MemoryPointer.new(:pointer)
+      out_len  = FFI::MemoryPointer.new(:int)
 
       success = Img2png.img2png_convert(
         @handle,
@@ -41,18 +39,18 @@ module Img2png
         out_data, out_len
       )
 
-      return nil if success == 0
+      return nil unless success
 
-      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]
+      ptr = out_data.read_pointer
+      len = out_len.read_int
+      result = ptr.read_bytes(len)
       Img2png.img2png_free(ptr)
       result
     end
 
     def release
       Img2png.img2png_release(@handle) unless @handle.null?
-      @handle = Fiddle::NULL
+      @handle = FFI::Pointer::NULL
     end
 
     def self.finalize(handle)
@@ -65,7 +63,7 @@ end
 # input = File.binread("x.heic")
 
 # # Load once, use multiple times
-# img = Img2png::Image.new(data: input)
+# img = Img2png::Image.new(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.6.pre
+  version: 0.1.7
 platform: darwin
 authors:
 - Caio Chassot
@@ -24,19 +24,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: fiddle
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.8
+        version: '1.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.8
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: io-console
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.0
+rubygems_version: 4.0.1
 specification_version: 4
 summary: iMessage database search
 test_files: []