obf 0.9.8.20 → 0.9.8.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3e2b11f62122f2f89f8bdec499955bd50f09af2785658ae48678e0117b42dc9
-  data.tar.gz: 79f7c3ae171cb1e3eff566998a61590a380d9642f610aff9598e4b331699831a
+  metadata.gz: 50eeb7069d0910bcd43413ae6926ddc8e2c3dcc73d699aba08b590eca468258e
+  data.tar.gz: ed156dbda3e5a505a9eef60a5d1696b1619820ee1a484b5ebd8372c93be49d7f
 SHA512:
-  metadata.gz: d560911abadda8aeb4a5bea1d34155d4ecfe6d6cce106b0aa9857d48aa65877e64088cc41dd14eb948a2988cc4b4fb88997c82bfd21c1ea2692bb28fd5a11a5c
-  data.tar.gz: 693efbacffe3e70ab657e508b9c13dcc36c883731d0c86004d2a8f509b1063081fbab70a42d4af87d470ab0ef2c0033b8e77b5c861250db31c3252d0358a6560
+  metadata.gz: 3a1e154445ad6827a21b41fa9968b975c2dea290441fd554ce024d234f6a3f91431cddd5a6438630b47815365d67180620631ad6982da3efd528fad6f0f62a7c
+  data.tar.gz: 289e220cdc43bc9e49fddcf65b2ffffc19802f115563b321f0e4c420c4702b70b8106f7a6769b7810538694a2ad57bc9ec80de8a9b49366384a1f814d93fd230

data/lib/obf/pdf.rb

@@ -211,14 +211,18 @@ module OBF::PDF
           # prevent too many svg converts from happening at the same time
           block = block || {grabs: []}
           block[:grabs] << grab
-          block[:has_svg] = true if grab[:type] == 'svg'
-          if block[:grabs].length > 5 && block[:has_svg]
+          grab[:svg] = true if grab[:image] && grab[:image]['content_type'] && grab[:image]['content_type'].match(/svg/)
+          grab[:svg] = true if grab[:res] && grab[:res]['content_type'] && grab[:res]['content_type'].match(/svg/)
+          if block[:grabs].length > 20 || block[:grabs].select{|g| g[:svg] }.length > 3
             blocks << block
             block = nil
           end
         end
-        blocks.each do |block|
+        blocks << block if block
+        OBF::Utils.log("  final block #{block.to_json}")
+        blocks.each_with_index do |block, idx|
           threads = []
+          OBF::Utils.log("   block #{idx}")
           block[:grabs].each do |grab|
             if grab[:res] && grab[:res]['data']
               grab[:image]['raw_data'] = grab[:res]['data']
@@ -232,10 +236,11 @@ module OBF::PDF
             elsif options['symbol_background'] == 'black'
               bg = 'black'
             end
+            OBF::Utils.log("    img")
             res = OBF::Utils.save_image(grab[:image], options['zipper'], bg)
             threads << res if res && !res.is_a?(String)
           end
-          threads.each{|t| t[:thred].join }
+          threads.each{|t| t[:thread].join }
         end
         grabs.each do |grab|
           if grab[:image]

data/lib/obf/utils.rb

@@ -225,7 +225,7 @@ module OBF::Utils
           return {thread: thr, image: image, type: 'svg', pid: pid}
         else
           `#{cmd}`
-          OBF::Utils.log "    finished image #{File.size(image['local_path'])}"
+          OBF::Utils.log "    finished image #{File.exist?(image['local_path']) && File.size(image['local_path'])}"
         end
 #        `convert -background "#{background}" -density 300 -resize #{size}x#{size} -gravity center -extent #{size}x#{size} #{file.path} -flatten #{file.path}.jpg`
 #        `rsvg-convert -w #{size} -h #{size} -a #{file.path} > #{file.path}.png`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.9.8.20
+  version: 0.9.8.21
 platform: ruby
 authors:
 - Brian Whitmer