easyimg_utils 0.4.2 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe594098cdc2268dc048152629e5a0481dc834829ca04fa80a9e37c24f52083c
-  data.tar.gz: ca30a483fad43ea836b7684cf76629e21f0ea0463517a50a4f06188343b69592
+  metadata.gz: 747675b404e492bb0c25b254a1e3ec332de6a9d52bd85f32b19849388e579b34
+  data.tar.gz: eabc7fd2465441173854d524071d38d295eb390d9b1fe8b0032c93aaec67095e
 SHA512:
-  metadata.gz: 5801d345fafb31662b4632ec1729643e232bf0dc66397fe9fc863855b3d6a42dd8f7f9bd13a6c47f2eee7ea70d4104839af5858f3d447cdccfc18df55f5c0e4b
-  data.tar.gz: 18916137f05c3adc244d2b13a04d350863c6fc837569a059ded6c5b50a6bea0e3f31751979c4bbccc87bfaeaaaf103c212d158445def11233a75f05963e0298c
+  metadata.gz: 8c02de630ce978236b4e8461be3f980f85960447579961db87f2e74b85304f9861def010c03e42d9049e759cf9ad752a40d58c6fa40ca1f8f701f92a57a8bb8f
+  data.tar.gz: 856e1609c06583611f9a5cb98e31de21395b8d67586cf20f6439fe9ed603849f3a3808c5d0bf4e9d8f7f0ebd3396fddbc93598d97e26562cd111c3efe96d7f95

data/lib/easyimg_utils.rb

@@ -3,9 +3,10 @@
 # file: easyimg_utils.rb
 
 require 'c32'
-require 'rxfhelper'
+require 'x4ss'
 require 'rmagick'
 require 'webp_ffi'
+require 'rxfhelper'
 
 # requirements:
 #
@@ -51,6 +52,7 @@ class EasyImgUtils
 * add rectangle # usage: add_rectangle(color: 'green', x1: 12, y1: 12, x2: 24, y2: 24)
 * add_svg # adds an SVG transparency overlay. usage: add_svg('/tmp/image1.svg')
 * add_text # e.g. add_text('some text')
+* animate Creates an animated gif e.g. animate('/tmp/a%d.png', '/tmp/b.gif')
 * blur # e.g. blur(x: 231, y: 123, w: 85, h: 85)
 * capture_screen # takes a screenshot of the desktop
 * center_crop # crops from the centre of an image. Usage center_crop(width, height)
@@ -62,11 +64,13 @@ class EasyImgUtils
 * greyscale # Reduces the image to 256 shades of grey
 * info # returns the dimension of the image in a Hash object
 * make_thumbnail # similar to resize but faster for sizes less than 10% of original image 
-* resize # set the maximum geomertry of the image for resizing e.g. resize('320x240')
+* resize # set the maximum geomertry of the image for resizing e.g. resize('320x240') see also scale
 * rotate
 * rotate_180
 * rotate_left
 * rotate_right
+* scale # Scales an image by the given factor e.g. 0.75 is 75%. see also resize
+* screencast # records a screencast and saves it as animated gif. e.g. (out: '/tmp/fun.gif').screencast
 * sketch # renders an artistic sketch, ideal with simplistic photos
 * view # view the output
 * vignette # Feathers the edge of an image in a circular path
@@ -85,14 +89,15 @@ class EasyImgUtils
                     x1: 0, y1: 0, x2: 0, y2: 0)
     
     x1, y1, x2, y2 = *a if a
-    img = read()
-    gc = Magick::Draw.new
-    gc.stroke('green')
-    gc.stroke_width(5)
-    gc.fill('transparent')
-    gc.rectangle(x1, y1, x2, y2)
-    gc.draw(img)
-    write img, quality
+    read() do |img|
+      gc = Magick::Draw.new
+      gc.stroke('green')
+      gc.stroke_width(5)
+      gc.fill('transparent')
+      gc.rectangle(x1, y1, x2, y2)
+      gc.draw(img)
+      write img, quality
+    end
     
   end
     
@@ -112,38 +117,56 @@ class EasyImgUtils
 
   def add_text(s='your text goes here', quality: nil)
     
-    img = read()
+    read() do |img|
 
-    d = Draw.new
-    img.annotate(d, 0,0,0,0, s) do
-      d.gravity = Magick::SouthGravity
-      d.pointsize = 26
-      d.stroke = '#000000'
-      d.fill = '#ffffff'
-      d.font_weight = Magick::BoldWeight
+      d = Draw.new
+      img.annotate(d, 0,0,0,0, s) do
+        d.gravity = Magick::SouthGravity
+        d.pointsize = 26
+        d.stroke = '#000000'
+        d.fill = '#ffffff'
+        d.font_weight = Magick::BoldWeight
+      end
+      
+      write img, quality
+      
     end
     
-    write img, quality
-    
   end
   
+  def animate()
+
+    anim = Magick::ImageList.new
+    
+    read() {|img| anim << img }    
+    anim.ticks_per_second = 100
+    anim.delay = 20
+    
+    @file_out ? anim.write(@file_out) : anim.animate
+    
+  end    
   
   def blur(x: 0, y: 0, w: 80, h: 80, strength: 8, quality: nil)
     
     width, height = w, h
-    img = read()
-    region = img.dispatch(x, y, width, height, 'RGB')
-    face_img = Magick::Image.constitute(width, height, "RGB", region)
-    img.composite!(face_img.gaussian_blur(0, strength), x, y, 
-                   Magick::OverCompositeOp)
-    write img, quality
+    
+    read() do |img|
+      
+      region = img.dispatch(x, y, width, height, 'RGB')
+      face_img = Magick::Image.constitute(width, height, "RGB", region)
+      img.composite!(face_img.gaussian_blur(0, strength), x, y, 
+                    Magick::OverCompositeOp)
+      write img, quality
+      
+    end
     
   end
   
   def brightness(quality: nil)
-    img = read()
-    img2 = imglevel(-Magick::QuantumRange * 0.25, Magick::QuantumRange * 1.25, 1.0)
-    write img2, quality
+    read() do |img|
+      img2 = imglevel(-Magick::QuantumRange * 0.25, Magick::QuantumRange * 1.25, 1.0)
+      write img2, quality
+    end
   end
   
   def capture_screen(quality: nil)
@@ -162,9 +185,10 @@ class EasyImgUtils
     
     return unless w
     
-    img = read()
-    img.crop!(CenterGravity, width, height)
-    write img, quality    
+    read() do |img|
+      img.crop!(CenterGravity, width, height)
+      write img, quality
+    end
     
   end
   
@@ -172,18 +196,19 @@ class EasyImgUtils
     
     return unless filex
     
-    img = read()
+    read() do |img|
         
-    imgx = Magick::ImageList.new(filex)
+      imgx = Magick::ImageList.new(filex)
 
-    # Change the white pixels in the sign to transparent.
-    imgx = imgx.matte_replace(0,0)
+      # Change the white pixels in the sign to transparent.
+      imgx = imgx.matte_replace(0,0)
 
-    img2 = Magick::Draw.new
-    img2.composite(x, y, 0, 0, imgx)
-    img2.draw(img)    
-    
-    write img, quality        
+      img2 = Magick::Draw.new
+      img2.composite(x, y, 0, 0, imgx)
+      img2.draw(img)    
+      
+      write img, quality
+    end
     
   end
   
@@ -199,13 +224,14 @@ class EasyImgUtils
     
     return if level == neutral
         
-    img ||= read()
+    read() do |img|
             
-    n = neutral - level
-    sharpen  = n > 0 
-    n.abs.times { img = img.contrast(sharpen) }
-    
-    write img, quality
+      n = neutral - level
+      sharpen  = n > 0 
+      n.abs.times { img = img.contrast(sharpen) }
+      
+      write img, quality
+    end
     
   end
   
@@ -240,28 +266,31 @@ class EasyImgUtils
     
     return unless w
     
-    img = read()
-    img.crop!(x,y, width=w, height=h)
-    write img, quality
+    read() do |img|
+      img.crop!(x,y, width=w, height=h)
+      write img, quality
+    end
     
   end
   
   def fax_effect(threshold: 0.55, quality: nil)
 
-    img = read()
-    
-    # Use a threshold of 55% of MaxRGB.
-    img = img.threshold(Magick::MaxRGB*threshold)
+    read() do |img|
     
-    write img, quality
+      # Use a threshold of 55% of MaxRGB.
+      img = img.threshold(Magick::MaxRGB*threshold)      
+      write img, quality
+      
+    end
     
   end
   
   def greyscale(quality: nil)
     
-    img = read()
-    img2 = img.quantize(256, GRAYColorspace)
-    write img2, quality
+    read() do |img|
+      img2 = img.quantize(256, GRAYColorspace)
+      write img2, quality
+    end
     
   end
   
@@ -281,9 +310,10 @@ class EasyImgUtils
   
   def make_thumbnail(width=125, height=125)
     
-    img = read()
-    img2 = img.thumbnail(width, height)
-    write img2, quality    
+    read() do |img|
+      img2 = img.thumbnail(width, height)
+      write img2, quality
+    end
     
   end
   
@@ -293,63 +323,101 @@ class EasyImgUtils
   #
   def resize(geometry='320x240', quality: nil)
     
-    preview = read()
+    read() do |preview|
     
-    preview.change_geometry!(geometry) do |cols, rows, img|
-      img.resize!(cols, rows)
+      preview.change_geometry!(geometry) do |cols, rows, img|
+        img.resize!(cols, rows)
+      end
+      
+      write preview, quality
     end
     
-    write preview, quality
-    
   end
   
   def rotate(degrees)
     
-    img = read()
-    img2 = img.rotate(degrees.to_i)
-    write img2, quality    
+    read() do |img|
+      img2 = img.rotate(degrees.to_i)
+      write img2, quality
+    end
     
   end
 
   def rotate_180()
     
-    img = read()
-    img2 = img.rotate(180)
-    write img2, quality    
+    read() do |img|
+      img2 = img.rotate(180)
+      write img2, quality
+    end
     
   end    
   
   def rotate_left()
     
-    img = read()
-    img2 = img.rotate(-45)
-    write img2, quality    
+    read() do |img|
+      img2 = img.rotate(-45)
+      write img2, quality
+    end
     
   end    
   
   def rotate_right()
     
-    img = read()
-    img2 = img.rotate(45)
-    write img2, quality    
+    read() do |img|
+      img2 = img.rotate(45)
+      write img2, quality    
+    end
     
   end  
+  
+  # Scales an image by the given factor e.g. 0.75 is 75%
+  #
+  def scale(factor=0.75, quality: nil)
+    
+    read() do |img|
+    
+      img2 = img.scale(factor)      
+      write img2, quality
+      
+    end
+    
+  end
+
+  # Takes a screenshot every second to create an animated gif
+  #
+  def screencast(duration: 6, scale: 1, window: true)
+    
+    fileout = @file_out.sub(/\.\w+$/,'%d.png')
+    
+    puts 'fileout: ' + fileout if @debug
+    
+    x4ss = X4ss.new fileout, mouse: true, window: true
+    mode = window ? :window : :screen
+    sleep 2; x4ss.record duration: duration, mode: mode
+    x4ss.save
+    
+    fileout2 = fileout.sub(/(?=%)/,'b')
+    EasyImgUtils.new(fileout, fileout2).scale(scale) unless scale == 1
+    EasyImgUtils.new(fileout2, @file_out).animate
     
+  end
   
   def sketch(quality: nil)
     
-    img = read()
+    read() do |img|
 
-    # Convert to grayscale
-    sketch = img.quantize(256, Magick::GRAYColorspace)
+      # Convert to grayscale
+      sketch = img.quantize(256, Magick::GRAYColorspace)
 
-    # Apply histogram equalization
-    sketch = sketch.equalize
+      # Apply histogram equalization
+      sketch = sketch.equalize
 
-    sketch = sketch.sketch(0, 10, 135)
-    img = img.dissolve(sketch, 0.75, 0.25)
+      sketch = sketch.sketch(0, 10, 135)
+      img = img.dissolve(sketch, 0.75, 0.25)
 
-    write img, quality
+      write img, quality
+      
+    end
     
   end
   
@@ -365,10 +433,12 @@ class EasyImgUtils
   
   def vignette(quality: nil)
     
-    img = read()
-    img2 = img.vignette
-
-    write img2, quality
+    read() do |img|
+      
+      img2 = img.vignette
+      write img2, quality
+      
+    end
     
   end
   
@@ -377,8 +447,28 @@ class EasyImgUtils
   private
   
   def read(file=@file_in)
-    data, type = RXFHelper.read(file)
-    Magick::Image.from_blob(data).first
+    
+    files = if file =~ /%d/ then
+
+      regfilepath = file.sub('%d','(\d+)')
+      globfilepath = file.sub('%d','*')
+      
+      a = Dir[globfilepath]
+      puts 'a: '  + a.inspect if @debug
+      a.sort_by {|x| Regexp.new(regfilepath).match(x).captures[0].to_i }      
+
+    else
+      [file]
+    end     
+    
+    files.each do |filex|
+      
+      @filex_in = filex
+      data, type = RXFHelper.read(filex)
+      yield(Magick::Image.from_blob(data).first)      
+      
+    end    
+
   end
 
   def run(command, show=false)
@@ -396,19 +486,27 @@ class EasyImgUtils
     
     return img.to_blob unless @file_out
     
-    if @file_out =~ /^dfs:/ then
+    file_out = if @file_out =~ /%d/ then
+      regpath = @file_in.sub('%d','(\d+)')
+      n = @filex_in[/#{regpath}/,1]
+      @file_out.sub('%d',n)
+    else
+      @file_out
+    end
+    
+    if file_out =~ /^dfs:/ then
       
-      outfile = File.join(@working_dir, File.basename(@file_out))
+      outfile = File.join(@working_dir, File.basename(file_out))
       
       img.write outfile do 
         self.quality = quality.to_i if quality
       end
 
-      FileX.cp outfile, @file_out
+      FileX.cp outfile, file_out
       
     else
       
-      img.write @file_out do 
+      img.write file_out do 
         self.quality = quality.to_i if quality
       end
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easyimg_utils
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.6.2
 platform: ruby
 authors:
 - James Robertson
@@ -11,72 +11,72 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwNTA1MjEzODIwWhcN
-  MjAwNTA0MjEzODIwWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDlJOU1
-  WxngJclmOIuKurVqnGO5ngYusS8HkdA+Cz5iaEkcECQ316FsTZI87o2cRi0XV6cI
-  CwzqZJi2LSZYDpu5H2tOCYgmmuQxSRwQm74TLdBnuy5gT3wu5fQuK1jLMbfmKwTs
-  RXqNk5TOzD+xKkF2YJqKXuxx0/U/HGE5hAMYL5jI11NGO8HQCKyFzW9wM1aDmjwd
-  q3AXnVAC/xk5ETmabDpTe6hlfgEQK8E8JUhLVcojUopcQsp/miJwZkleNpNnPJtB
-  6nQOaQmIzQ6mvdy6gEabwSk8A0m2OpnkWkg7XAtLbNMugsoY3CrDExMdK5730faa
-  Q7cx1KkjvaMNxm1qudlpC0ekGv4sHH3P10Lbp3a9XSXQTiZ7dpDUgAt/55mLR2Vn
-  G097DVu8IstolD/XF1NF8x+Kr0DOC14CeRtqKx64sym/qyl5U4tBJm+cJYRgN4/9
-  awoHZTBRMiU0Q/WB37EEKGvfoo6qkPJeaFayrNH9szChDjTboGPHNEHOPDcCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUJcLC8vho
-  CMcWFSEMVQrIlWvwppowJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNTEyMTExNzA0WhcN
+  MjEwNTEyMTExNzA0WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDNnJ8h
+  QqFXanzUVukVQF0zYimaY+FQLO5mLMKP+PTh2NDWd+UOzngC+3OH5unRId46Pzge
+  bUNkK1jTeaMiyqNeubkZqHhIh0u/QzSVihhsn5DLmb5nukbe755VuoG8ISLMWYno
+  2LCLOfPQTtcU/LmMBGMBkKzjQaA/U2BpM3Ao5dKlgyYzxkh9UUGXQzuQc2vp0Msp
+  rYOhNSz4CtVex2l3TQiBL7Hw+7dh9PPwon0BLXGnfJnJz8wT/09RLgZjJ2z/Ye/w
+  uMWZTE5LswUsP0EqRkRPft0UsjROu4bgAcxY9SXiv2jXCoENQugCJ82/vsjYNs6p
+  d7PXBY7OHBao74Ywc4vjiSjLe91ZpKwNwQVFt0yCpV6Gby0ZYcAeHVM3SuYiKrd3
+  IJ78q18pR4Oroih1soCyaAozDiax+kPxvtx3s5Rw9P+4LvxjTbMY5dCRGBUSW4s8
+  VKv1W1xo1T5ucixalTuGoaEmINv6LI0ZYzyOX6/wdv+s2MgJMOifMO5YnV0CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUswJyQrQH
+  BRQmet2GwVJgUkxLihUwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEANTImQJnRvlqQBDXU1ok4iqW2TFRQMTixEP/zCXDd
-  IyUz2nwaKvyiTvIVyXpdTWg2UatEvHwaJrFW0Hpghu2f7rYuRvwKpSrPFelEVYJf
-  wyjtqZIiZfQePXjAc9rdmXzbDY7zTHQedMUcaIFocntclpefGGyFg1m7IKXlcrAK
-  BEAaygcKB1S6NhHGm4TfRmdEqPN1sY3COMWjv49rkmQBDcz4KIDxHUa33vHieFq5
-  F+hKSRa1747fYLZc42bpTQBvHR2ZuXRGCY1iNCipXoncu7ZY6wPYvO2HTGDGK9Uk
-  ByawN6V7m2htGNb+q3zLFgLFP91/+60zBdLc7DfYNEiHXajhJsLKWpcSosC3AUaa
-  4IpXr6ATiPj+a8ktF/jAwrpUTFr3qpGa0qW/XVD3o35biL2+3gs6hTqPo3IQYusR
-  6PB/a3YCkvA1ipebq/pmmvF9VopoG5giimE7Rkw0QPUi/w6724YH6tVQj077N2mP
-  WOpXPMFUK6eXTvN8BbxLtUkt
+  BgkqhkiG9w0BAQsFAAOCAYEASbXQwXltNOD+/xy+a6FcP6RHDLdUXWVii2QZkwR8
+  n9+EXLWH9/pTS1vICTLz3cqwV9J3o+JdwsRFHMGMHFOFwoItWNYC74J2bmR7q4O8
+  R22guVDNqYotvSUacFDH/aT/702nEkTyXnGhjA/QsrEgUnVzjYY36WYJKK3YUFjD
+  1UL68GiuaphHNHIYOe/aL2lfI3r30Z0KJ5xLuvJtTtNay/HsBlBavdspUKuBDiMG
+  tbTr7XPHZLKpyZCy3JHrNCNmHnkypk2fCgUuz6lMTO5K9lXyXJjMFnim2Wdmpia2
+  BJD+IXi6klFyzJLkQyJGcHP6jCodoiV5HWWU0KDSnQMyNs8HmmBr63RshdHWFHoE
+  o5mCr4o4SP5vu6sUUDmtMbf9d0XtJ46j3qxdRFYvBrLiVbD5MP4v+vSPv2TkMMZE
+  KY48n99T12IOioQ4ghCO1L/UAg2taLOcZbMv4WpV1p9bXKhnrow81zeogZjjiNGS
+  OmTAjCfyGFPC/1eXnSV5Smv8
   -----END CERTIFICATE-----
-date: 2019-08-18 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.2
 - !ruby/object:Gem::Dependency
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: webp-ffi
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +97,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.7
+- !ruby/object:Gem::Dependency
+  name: x4ss
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -123,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Makes manipulating images from 1 line of code easier.