obf 0.9.8.18 → 0.9.8.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68e9d9642a7a14c4324b0518f7f45b599009d40d1caaa6f414b1deeaab377ca1
-  data.tar.gz: 3d6ae2cada6b30884bdd964a09ea90c6d7281393aa3781f51d693c35d2d2ec17
+  metadata.gz: 0e5d0262b2cc796234c4178adfe3f88bc38dfcf393a154b1bc2de1448334b61b
+  data.tar.gz: d40fe3b676d0adbd132b9156c0e123749029635b072caeb33dff06f11cf2045b
 SHA512:
-  metadata.gz: 6772974b0b9f4d842dba7f7ca6e8bbfafc34dab19816ee4ef0e3239c31626ab9247b5cccb3899dc0b91ca09363bb30acccd788b776764ec83260f87c7e209032
-  data.tar.gz: a2f165e74c25da9d3102dc5b968d21efdad12b40f94680489778d52d87e53843e05ea83edc8d35a9c52cf2faa8212de20f975e6be5a40cd51776bc9a2100321f
+  metadata.gz: 227928642c1f9afa5951d893850698a7b1341bb9fa43de23319234e1f47a17a8131ad26c59362edb54053c65296347a37f13b24257fae059d1ed1e7558f95648
+  data.tar.gz: cfc750c84d1bdc5f29612d28543987073e40a1d8198d717725003f20ba52fc80b885bc93d8b5e8457296749119bd48b7d2b1883f1ee1f890f329d2098d7ec88e

data/lib/obf/external.rb

@@ -130,6 +130,7 @@ module OBF::External
         end
       end
       hydra.run
+      
       grabs.each do |grab|
         if grab[:res] && grab[:res]['data']
           str = "data:" + grab[:res]['content_type']

data/lib/obf/pdf.rb

@@ -126,6 +126,7 @@ module OBF::PDF
     @res ||= /[#{RTL_SCRIPTS.map{ |script| "\\p{#{script}}" }.join}]/
   end
   
+  # b.generate_download('1_2', 'pdf', {'include' => 'all', 'headerless' => true, 'symbol_background' => 'transparent'})
   def self.build_page(pdf, obj, options)
     OBF::Utils.as_progress_percent(0, 1.0) do
       pdf.font(options['font']) if options['font'] && File.exists?(options['font'])
@@ -191,36 +192,52 @@ module OBF::PDF
         obj['buttons'].each do |btn|
           image = (obj['images_hash'] || {})[btn['image_id']]
           if image && image['url'] && !image['data'] && !(image['path'] && options['zipper'])
+            # download the raw data from the remote URL
             url = image['url']
             res = OBF::Utils.get_url(url, true)
             if res['request']
               hydra.queue(res['request'])
               grabs << {url: url, res: res, req: res['request'], image: image, fill: btn['background_color'] ? OBF::Utils.fix_color(btn['background_color'], 'hex') : "ffffff"}
             end
-          elsif image && image['data'] && !(image['path'] && options['zipper'])
+          elsif image && (image['data'] || (image['path'] && options['zipper']))
+            # process the data-uri or zipped image
             grabs << {image: image, fill: btn['background_color'] ? OBF::Utils.fix_color(btn['background_color'], 'hex') : "ffffff"}
           end
         end
         hydra.run
-        threads = []
+        blocks = []
+        block = {}
         grabs.each do |grab|
-          if grab[:res] && grab[:res]['data']
-            grab[:image]['raw_data'] = grab[:res]['data']
-            grab[:image]['content_type'] ||= grab[:res]['content_type']
-            grab[:image]['extension'] ||= grab[:res]['extension']
+          # 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]
+            blocks << block
+            block = nil
           end
-          grab[:image]['threadable'] = true
-          bg = 'white'
-          if options['transparent_background'] || options['symbol_background'] == 'transparent'
-            bg = "\##{grab[:fill]}"
-          elsif options['symbol_background'] == 'black'
-            bg = 'black'
+        end
+        blocks.each do |block|
+          threads = []
+          block[:grabs].each do |grab|
+            if grab[:res] && grab[:res]['data']
+              grab[:image]['raw_data'] = grab[:res]['data']
+              grab[:image]['content_type'] ||= grab[:res]['content_type']
+              grab[:image]['extension'] ||= grab[:res]['extension']
+            end
+            grab[:image]['threadable'] = true
+            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 if res && !res.is_a?(String)
           end
-          res = OBF::Utils.save_image(grab[:image], options['zipper'], bg)
-          threads << res if res && !res.is_a?(String)
+          threads.each{|t| t[:thred].join }
         end
-        threads.each{|t| t[:thread].join }
-        grabs.each{|g| g[:image].delete('threadable') }
+        grabs.each{|g| g[:image].delete('threadable'); g[:image].delete('local_path') unless File.exist?(g[:image]['local_path']) }
         OBF::Utils.log "  done with #{grabs.length} remote images!"
 
         obj['grid']['order'].each_with_index do |buttons, row|
@@ -273,11 +290,14 @@ module OBF::PDF
                     elsif options['symbol_background'] == 'black'
                       bg = 'black'
                     end
+                    image['threadable'] = false
                     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
+                    else
+                      OBF::Utils.log("  missing image #{image['id']} #{image_local_path}")
                     end
                   end
                 end

data/lib/obf/utils.rb

@@ -160,7 +160,7 @@ module OBF::Utils
   end
   
   def self.hydra
-    Typhoeus::Hydra.new(max_concurrency: 20)
+    Typhoeus::Hydra.new(max_concurrency: 10)
   end
 
   def self.save_image(image, zipper=nil, background=nil)
@@ -217,39 +217,34 @@ 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 = 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'}
+          pid = Process.spawn(cmd)
+          thr = Process.detach(pid)
+          OBF::Utils.log "    scheduled image"
+          return {thread: thr, image: image, type: 'svg', pid: pid}
         else
           `#{cmd}`
+          OBF::Utils.log "    finished image #{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`
       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 = 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'}
+          pid = Process.spawn(cmd)
+          thr = Process.detach(pid)
+          OBF::Utils.log "    scheduled image"
+          return {thread: thr, image: image, type: 'not_svg', pid: pid}
         else
           `#{cmd}`
+          OBF::Utils.log "    finished image #{File.size(image['local_path'])}"
         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"
       image['local_path']
     end
     image['local_path']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obf
 version: !ruby/object:Gem::Version
-  version: 0.9.8.18
+  version: 0.9.8.19
 platform: ruby
 authors:
 - Brian Whitmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json