easyimg_utils 0.4.3 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d14e8e346eadfa36ea43f336f4b8bb161e2c38e216c162d97e67439767fb84b
-  data.tar.gz: 9f27d41d4938f8c5b4249c90566062a5841ff24d9b1bf86506b2354fe0c070a4
+  metadata.gz: f68eb15dfa8aa18281bb8b71b6ad4ac8e0da01c5da5424d981388cfdee8cae7f
+  data.tar.gz: 10d4a0d5ad92f28723c9b4d2b025952723b8566d8cc9418e0e11191c70a407fe
 SHA512:
-  metadata.gz: 3df7e8b76c8860579e2801664a3a14dcfb24c36eeb79607c0aeb944b37183db7b5cc0905790bd38a124a63abbba2ac0f1b72ca714a6456d937fab99a5efde938
-  data.tar.gz: 5e845353a3f9b335712cb262c5272de9b5d6a71a4fb3efa291863104d4fbe8b8bf7de90a935a2e87a5a0a0da7c4771da1fcfd42742ceee7449bc4f4bfaf96c07
+  metadata.gz: c900ec2015da02a1eb2178feb88418792f19c8b806d84700931e8efa7cbdfef3cfe1144154d25b04c5fd4696e29fd4864d153a4906c8d637e57c50d08e7eca64
+  data.tar.gz: c1bdfcc930995773ffb921ad88d261d37a91c356a21accd1f18ffbcf4997ecd7d288b2d7fd70a42e54a5f9df6195e4f78e95097281749b15b61601485a16a7a3

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:
 #
@@ -46,13 +47,16 @@ class EasyImgUtils
   extend CommandHelper
   include Magick
   include RXFHelperModule
+    
 
 @commands = "
 * 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
+* calc_resize # e.g. EasyImgUtils.calc_resize '1449x1932', '640x480' #=> 480x640
 * center_crop # crops from the centre of an image. Usage center_crop(width, height)
 * composite # overlay a smaller image on top of an image
 * contrast # changes the intensity between lighter and darker elements
@@ -68,6 +72,7 @@ class EasyImgUtils
 * 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
@@ -82,18 +87,32 @@ class EasyImgUtils
 
   end
   
+  # e.g. calc_resize '1449x1932', '640x480' #=> 480x640
+  #
+  def self.calc_resize(s, s2)
+    
+    a = s.split('x',2).map(&:to_i).sort
+    a2 = s2.split('x',2).map(&:to_i).sort
+    
+    factor = a2.last / a.last.to_f
+    
+    a.map {|x| (x * factor).to_i}.join('x')    
+    
+  end
+  
   def add_rectangle(a=[], quality: nil, color: 'green', stroke_width: 5, 
                     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
     
@@ -113,38 +132,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)
@@ -163,9 +200,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
   
@@ -173,18 +211,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
   
@@ -200,13 +239,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
   
@@ -241,28 +281,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
   
@@ -282,9 +325,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
   
@@ -294,45 +338,50 @@ 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  
   
@@ -340,30 +389,50 @@ class EasyImgUtils
   #
   def scale(factor=0.75, quality: nil)
     
-    img = read()
-    
-    img2 = img.scale(factor)
+    read() do |img|
     
-    write img2, quality
+      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
   
@@ -379,10 +448,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
   
@@ -391,8 +462,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)
@@ -410,19 +501,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.3
+  version: 0.6.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   KY48n99T12IOioQ4ghCO1L/UAg2taLOcZbMv4WpV1p9bXKhnrow81zeogZjjiNGS
   OmTAjCfyGFPC/1eXnSV5Smv8
   -----END CERTIFICATE-----
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2021-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -43,62 +43,82 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: webp-ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+- !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.7
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -123,7 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Makes manipulating images from 1 line of code easier.