obf 0.9.8.7 → 0.9.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e9744e7a34a7cf34c098f19e1fbc6ef9eb6ceb3e1c7eebfc3fb7d80779b502c
-  data.tar.gz: 3a707ec782d9a9df24409a9e2ef4c3c96b8b59de9693a587c044826c6fe72cbd
+  metadata.gz: d2ed2e2f90f78fab2afac2c3d1f52af1c8b7345e7cb3d0fa6434832899b62a05
+  data.tar.gz: cd9e8521d222e51a9fe6ea760134465a93e2bb05b9c9ee03252bd57e986890ca
 SHA512:
-  metadata.gz: efcf27be7401b4d904608f968e174b44b79c85b9346cbd174a1da9917e0e58faa4197338f5ba9cfaabd15c3e409bb603083f119e3a8ac73c10869a285d919a41
-  data.tar.gz: fe94deb30f15448d792b4abcc7695c7e049f821d7a89250518410c320e6e82aaffca13bc1dcef256fc3eb390d473f37fa079f475cf85e83845c50af156de67b1
+  metadata.gz: 02ef108ce774799e4242d1818104d12ae2fcb9c725ef05218bc55b8784330adb458a2d89a1341a2cf7abdd90c61ce2d7374297155151271a9730777a1af5e195
+  data.tar.gz: 56c075245f5cb0421b556c2618ca2dbe81ffda55d199e0f73787cdc34c0df4c942ae1419379babbeafee64dd088a09ea38b4311423c00a24a50dfb3a9212a34f

data/lib/obf/pdf.rb

@@ -196,14 +196,26 @@ module OBF::PDF
             uri = OBF::Utils.sanitize_url(uri)
             req = Typhoeus::Request.new(uri, followlocation: true)
             hydra.queue(req)
-            grabs << {url: url, req: req, image: image}
+            grabs << {url: url, req: req, image: image, fill: btn['background_color'] ? OBF::Utils.fix_color(btn['background_color'], 'hex') : "ffffff"}
           end
         end
         hydra.run
+        threads = []
         grabs.each do |grab|
           grab[:image]['raw_data'] = grab[:req].response.body
+          grab[:image]['threadable'] = true
           grab[:image]['content_type'] = grab[:req].response.headers['Content-Type'] if grab[:req].response.headers['Content-Type']
+          bg = 'white'
+          if options['transparent_background'] || options['symbol_background'] == 'transparent'
+            bg = "\##{grab[:fill]}"
+          elsif options['symbol_background'] == 'black'
+            bg = 'black'
+          end
+          res = OBF::Utils.save_image(grab[:image], options['zipper'], bg)
+          threads << res unless res.is_a?(String)
         end
+        threads.each{|t| t.join }
+        grabs.each{|g| g[:image]['threadable'] = false }
         OBF::Utils.log "  done with #{grabs.length} remote images!"
 
         obj['grid']['order'].each_with_index do |buttons, row|
@@ -255,7 +267,7 @@ module OBF::PDF
                     elsif options['symbol_background'] == 'black'
                       bg = 'black'
                     end
-                    image_local_path = image && OBF::Utils.save_image(image, options['zipper'], bg)
+                    image_local_path = image && (image['local_path'] || 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

@@ -179,25 +179,40 @@ module OBF::Utils
       # png files need to be converted to make sure they don't have a transparent bg, or
       # else performance takes a huge hit.
       `cp #{file.path} #{file.path}#{extension}`
-      "#{file.path}#{extension}"
+      image['local_path'] = "#{file.path}#{extension}"
     else
       background ||= 'white'
       size = 400
       path = file.path
       if image['content_type'] && image['content_type'].match(/svg/)
-        OBF::Utils.log "    convert -background \"#{background}\" -density 300 -resize #{size}x#{size} -gravity center -extent #{size}x#{size} #{file.path} -flatten #{file.path}.jpg"
-        `convert -background "#{background}" -density 300 -resize #{size}x#{size} -gravity center -extent #{size}x#{size} #{file.path} -flatten #{file.path}.jpg`
+        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 thr
+        else
+          `#{cmd}`
+        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`
-        path = "#{file.path}.jpg"
       else
-        OBF::Utils.log "    convert #{path} -density 300 -resize #{size}x#{size} -background "#{background}" -gravity center -extent #{size}x#{size} -flatten #{path}.jpg"
-        `convert #{path} -density 300 -resize #{size}x#{size} -background "#{background}" -gravity center -extent #{size}x#{size} -flatten #{path}.jpg`
-        path = "#{path}.jpg"
+        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 thr
+        else
+          `#{cmd}`
+        end
+        # `convert #{path} -density 300 -resize #{size}x#{size} -background "#{background}" -gravity center -extent #{size}x#{size} -flatten #{path}.jpg`
       end
 
       OBF::Utils.log "    finished image"
-      path
+      image['local_path']
     end
+    image['local_path']
   end
   
   def self.sound_raw(url)

metadata

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