obf 0.9.8.17 → 0.9.8.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 963a55b5473b9d4d49a7c115f37d669a414ac8ce5e23f9066516bef8a6136d0f
-  data.tar.gz: 740e6745dc7c2f59878715cb82a22902a3396f89589a25207ab90aa090112735
+  metadata.gz: 68e9d9642a7a14c4324b0518f7f45b599009d40d1caaa6f414b1deeaab377ca1
+  data.tar.gz: 3d6ae2cada6b30884bdd964a09ea90c6d7281393aa3781f51d693c35d2d2ec17
 SHA512:
-  metadata.gz: 4e18f9bbf2ca719ff45301c65c5108b2e1bbbfb11a4b93703cb3ae9c82aa269ec575ed80d83058c18034be8aca8ff402393fae49fd13bf93369790d6254e08e3
-  data.tar.gz: de2f834f4e9aa4d9d59b47ffd1bef855dbe959e0837e50e41145565da679688a0053661002d2294176342d24dd08b7dc77b1b1629d444bf6d02e4d55d7654424
+  metadata.gz: 6772974b0b9f4d842dba7f7ca6e8bbfafc34dab19816ee4ef0e3239c31626ab9247b5cccb3899dc0b91ca09363bb30acccd788b776764ec83260f87c7e209032
+  data.tar.gz: a2f165e74c25da9d3102dc5b968d21efdad12b40f94680489778d52d87e53843e05ea83edc8d35a9c52cf2faa8212de20f975e6be5a40cd51776bc9a2100321f

data/lib/obf/pdf.rb

@@ -273,7 +273,8 @@ module OBF::PDF
                     elsif options['symbol_background'] == 'black'
                       bg = 'black'
                     end
-                    image_local_path = image && (image['local_path'] || OBF::Utils.save_image(image, options['zipper'], bg))
+                    image_local_path = image['local_path'] if image && image['local_path'] && File.exist?(image['local_path'])
+                    image_local_path ||= image && OBF::Utils.save_image(image, options['zipper'], bg)
                     if image_local_path && File.exist?(image_local_path)
                       pdf.image(image_local_path, :fit => [button_width - 10, button_height - text_height - 5], :position => :center, :vposition => :center) rescue nil
                       File.unlink image_local_path

data/lib/obf/utils.rb

@@ -160,7 +160,7 @@ module OBF::Utils
   end
   
   def self.hydra
-    Typhoeus::Hydra.new(max_concurrency: 5)
+    Typhoeus::Hydra.new(max_concurrency: 20)
   end
 
   def self.save_image(image, zipper=nil, background=nil)
@@ -217,10 +217,15 @@ module OBF::Utils
       if image['content_type'] && image['content_type'].match(/svg/)
         cmd = "convert -background \"#{background}\" -density 300 -resize #{size}x#{size} -gravity center -extent #{size}x#{size} #{file.path} -flatten #{file.path}.jpg"
         OBF::Utils.log "    #{cmd}"
-        image['local_path'] = "#{file.path}.jpg"
         if image['threadable']
-          thr = Process.detach(Process.spawn(cmd))
-          return {thread: thr, type: 'svg'}
+          thr = Thread.new do
+            pid = Process.spawn(cmd)
+            Process.wait(pid)
+            if $?.exitstatus == 0 && File.exist?("#{file.path}.jpg")
+              image['local_path'] = "#{file.path}.jpg"
+            end
+          end
+          return {thread: thr, image: image, type: 'svg'}
         else
           `#{cmd}`
         end
@@ -229,10 +234,15 @@ module OBF::Utils
       else
         cmd = "convert #{path} -density 300 -resize #{size}x#{size} -background \"#{background}\" -gravity center -extent #{size}x#{size} -flatten #{path}.jpg"
         OBF::Utils.log "    #{cmd}"
-        image['local_path'] = "#{path}.jpg"
         if image['threadable']
-          thr = Process.detach(Process.spawn(cmd))
-          return {thread: thr, type: 'not_svg'}
+          thr = Thread.new do
+            pid = Process.spawn(cmd)
+            Process.wait(pid)
+            if $?.exitstatus == 0 && File.exist?("#{path}.jpg")
+              image['local_path'] = "#{path}.jpg"
+            end
+          end
+          return {thread: thr, image: image, type: 'not_svg'}
         else
           `#{cmd}`
         end

metadata

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