libis-format 1.2.9 → 1.3.2

data/lib/libis/format/converter/image_converter.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require_relative 'base'
 require 'libis/format/identifier'
@@ -13,26 +13,26 @@ MiniMagick.configure do |config|
   config.validate_on_create = false
   config.validate_on_write = false
   config.whiny = false
+  config.tmpdir = Libis::Format::Config[:tempdir] || Dir.tmpdir
 end
 
 module Libis
   module Format
     module Converter
-
       # noinspection RubyTooManyInstanceVariablesInspection
       class ImageConverter < Libis::Format::Converter::Base
-
         def self.input_types
-          [:TIFF, :JPG, :PNG, :BMP, :GIF, :PDF, :JP2]
+          %i[TIFF JPG PNG BMP GIF PDF JP2]
         end
 
         def self.output_types(format = nil)
           return [] unless input_types.include?(format)
-          [:TIFF, :JPG, :PNG, :BMP, :GIF, :PDF, :JP2]
+
+          %i[TIFF JPG PNG BMP GIF PDF JP2]
         end
 
         def self.multipage?(format)
-          [:PDF, :TIFF, :GIF, :PBM, :PGM, :PPM].include?(format)
+          %i[PDF TIFF GIF PBM PGM PPM].include?(format)
         end
 
         def initialize
@@ -41,15 +41,15 @@ module Libis
         end
 
         def image_convert(_)
-          #force usage of this converter
+          # force usage of this converter
         end
 
-        def quiet(v)
-          @quiet = !!v
+        def quiet(value)
+          @quiet = !!value
         end
 
-        def page(nr)
-          @page = nr
+        def page(number)
+          @page = number
         end
 
         def scale(percent)
@@ -122,33 +122,33 @@ module Libis
           @wm_gap = ((options[:gap] || 0.2).to_f * 100).to_i
           rotation = 360 - (options[:rotation] || 30).to_i
           @wm_image = MiniMagick::Image.new(options[:file]) if options[:file]
-          unless @wm_image && @wm_image.valid?
-            image = options[:file] || (Dir::Tmpname.create(%w(wm_image .png)) {|_|})
-            # noinspection RubyResolve
-            MiniMagick::Tool::Convert.new do |convert|
-              # noinspection RubyLiteralArrayInspection
-              convert.quiet
-              convert.background 'transparent'
-              convert.size('2000x2000')
-              convert.gravity 'Center'
-              convert.font('Helvetica').fill('black').pointsize(72) #.stroke('black').strokewidth(1)
-              convert << "label:#{text}"
-              convert.rotate rotation
-              convert.trim.repage.+
-              convert << image
-            end
-            if options[:file]
-              @wm_image = MiniMagick::Image.new(image)
-            else
-              @wm_image = MiniMagick::Image.open(image)
-              File.delete(image)
-            end
-            # noinspection RubyResolve
-            unless @wm_image.valid?
-              error "Problem creating watermark image '#{image}'."
-              @wm_image = nil
-            end
+          return if @wm_image&.valid?
+
+          image = options[:file] || (Dir::Tmpname.create(%w[wm_image .png]) { |_| })
+          # noinspection RubyResolve
+          MiniMagick::Tool::Convert.new do |convert|
+            # noinspection RubyLiteralArrayInspection
+            convert.quiet
+            convert.background 'transparent'
+            convert.size('2000x2000')
+            convert.gravity 'Center'
+            convert.font('Helvetica').fill('black').pointsize(72) # .stroke('black').strokewidth(1)
+            convert << "label:#{text}"
+            convert.rotate rotation
+            convert.trim.repage.+ # rubocop:disable Lint/Void
+            convert << image
+          end
+          if options[:file]
+            @wm_image = MiniMagick::Image.new(image)
+          else
+            @wm_image = MiniMagick::Image.open(image)
+            File.delete(image)
           end
+          # noinspection RubyResolve
+          return if @wm_image.valid?
+
+          error "Problem creating watermark image '#{image}'."
+          @wm_image = nil
         end
 
         def convert(source, target, format, opts = {})
@@ -161,34 +161,33 @@ module Libis
             assemble_and_convert(source, target, format)
 
           elsif File.directory?(source)
-            source_list = Dir[File.join(source, '**', '*')].reject {|p| File.directory? p}
+            source_list = Dir[File.join(source, '**', '*')].reject { |p| File.directory? p }
 
             assemble_and_convert(source_list, target, format)
 
           else
 
-            image = MiniMagick::Image.open(source) { |b| b.quiet }
+            image = MiniMagick::Image.open(source) { |b| b.quiet } # rubocop:disable Style/SymbolProc
 
             if image.pages.size > 1
               if @page
                 convert_image(image.pages[@page].path, target, format)
               else
                 # noinspection RubyBlockToMethodReference
-                assemble_and_convert(image.pages.map {|page| page.path}, target, format)
+                assemble_and_convert(image.pages.map(&:path), target, format)
               end
             else
               convert_image(source, target, format)
             end
           end
-          
-          { 
+
+          {
             files: [target],
             converter: self.class.name
           }
         end
 
         def assemble_and_convert(sources, target, format)
-
           warn 'Received multiple images as input and single page format as target.' unless self.class.multipage?(format)
           converted_pages = sources.inject([]) do |list, path|
             # noinspection RubyArgCount
@@ -198,7 +197,7 @@ module Libis
           end
           MiniMagick::Tool::Convert.new do |b|
             b.append unless self.class.multipage?(format)
-            converted_pages.each {|page| b << page.path}
+            converted_pages.each { |page| b << page.path }
             b << target
           end
           converted_pages.each do |temp_file|
@@ -210,17 +209,16 @@ module Libis
         protected
 
         def convert_image(source, target, format)
-
           image_info = nil
-          image_info = MiniMagick::Image::Info.new(source) {|b| b.quiet} if @wm_image
+          image_info = MiniMagick::Image::Info.new(source) { |b| b.quiet } if @wm_image # rubocop:disable Style/SymbolProc
 
           MiniMagick::Tool::Convert.new do |convert|
             convert.quiet if @quiet
             if @wm_image
               convert << @wm_image.path
-              convert.bordercolor('transparent').border("#{@wm_gap}%") if @wm_gap > 0
+              convert.bordercolor('transparent').border("#{@wm_gap}%") if @wm_gap.positive?
               convert.filter('Lagrange')
-              convert.resize("#{image_info['width'] / @wm_tiles}x#{image_info['height'] / @wm_tiles}") if @wm_tiles > 0
+              convert.resize("#{image_info['width'] / @wm_tiles}x#{image_info['height'] / @wm_tiles}") if @wm_tiles.positive?
               convert.resize("#{@wm_resize}%") if @wm_resize
               convert.write('mpr:watermark').delete.+
             end
@@ -229,7 +227,7 @@ module Libis
             convert << source
             convert.flatten if @options[:flatten].nil? && format == :JPG
             if @wm_image
-              if @wm_tiles >= 0 and @wm_tiles <= 1
+              if (@wm_tiles >= 0) && (@wm_tiles <= 1)
                 convert << 'mpr:watermark'
               else
                 convert.stack do |stack|
@@ -242,15 +240,13 @@ module Libis
               convert.compose(@wm_composition).gravity(@wm_gravity).define("compose:args=#{@wm_opacity}%").composite
             end
 
-            @flags.each {|f, v| v.is_a?(TrueClass) ? convert.send(f).+ : convert.send(f)}
-            if @delete_date
-              convert << '+set' << 'modify-date' << '+set' << 'create-date'
-            end
+            @flags.each { |f, v| v.is_a?(TrueClass) ? convert.send(f).+ : convert.send(f) }
+            convert << '+set' << 'modify-date' << '+set' << 'create-date' if @delete_date
 
             colorspace = @options.delete(:colorspace) || 'sRGB'
             unless @options.empty?
               convert.colorspace('RGB')
-              @options.each {|o, v| convert.send(o, v)}
+              @options.each { |o, v| convert.send(o, v) }
             end
             convert.colorspace(colorspace)
             convert.profile @profile if @profile
@@ -262,11 +258,8 @@ module Libis
           end
 
           target
-
         end
-
       end
-
     end
   end
-end
+end

data/lib/libis/format/converter/jp2_converter.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'libis-tools'
 require 'fileutils'
 require 'libis/format/config'
@@ -7,32 +8,31 @@ require_relative 'base'
 module Libis
   module Format
     module Converter
-
       class Jp2Converter < Libis::Format::Converter::Base
-
         def self.input_types
-          [:TIFF, :JPG, :PNG, :BMP, :GIF, :PDF]
+          %i[TIFF JPG PNG BMP GIF PDF]
         end
 
         def self.output_types(format = nil)
           return [] unless input_types.include?(format)
+
           [:JP2]
         end
 
         def initialize
           super
           @options = {
-              color_xform: false,
-              error_resilience: :ALL,
-              lossless: true,
-              progression_order: 'RLCP',
-              tile_size: [1024, 1024],
-              codeblock_size: [6, 6],
+            color_xform: false,
+            error_resilience: :ALL,
+            lossless: true,
+            progression_order: 'RLCP',
+            tile_size: [1024, 1024],
+            codeblock_size: [6, 6]
           }
         end
 
         def j2kdriver(_)
-          #force usage of this converter
+          # force usage of this converter
         end
 
         def color_xform(flag = true)
@@ -68,38 +68,36 @@ module Libis
 
           @options.each do |key, value|
             case key
-              when :color_xform
-                options << '--set-output-j2k-color-xform' << (value ? 'YES' : 'NO')
-              when :error_resilience
-                options << '--set-output-j2k-error-resilience' << value.to_s
-              when :lossless
-                if value
-                  options << '--set-output-j2k-xform' << 'R53' << '5' << '--set-output-j2k-ratio' << '0'
-                else
-                  options << '--set-output-j2k-xform' << 'I97' << '--set-output-j2k-psnr' << '46'
-                end
-              when :progression_order
-                options << '--set-output-j2k-progression-order' << value.to_s
-              when :tile_size
-                options << '--set-output-j2k-tile-size' << value[0].to_s << value[1].to_s
-              when :codeblock_size
-                options << '--set-output-j2k-codeblock-size' << value[0].to_s << value[1].to_s
+            when :color_xform
+              options << '--set-output-j2k-color-xform' << (value ? 'YES' : 'NO')
+            when :error_resilience
+              options << '--set-output-j2k-error-resilience' << value.to_s
+            when :lossless
+              if value
+                options << '--set-output-j2k-xform' << 'R53' << '5' << '--set-output-j2k-ratio' << '0'
               else
-                #do nothing
+                options << '--set-output-j2k-xform' << 'I97' << '--set-output-j2k-psnr' << '46'
+              end
+            when :progression_order
+              options << '--set-output-j2k-progression-order' << value.to_s
+            when :tile_size
+              options << '--set-output-j2k-tile-size' << value[0].to_s << value[1].to_s
+            when :codeblock_size
+              options << '--set-output-j2k-codeblock-size' << value[0].to_s << value[1].to_s
+            else # rubocop:disable Style/EmptyElse
+              # do nothing
             end
           end
 
-
           result = Libis::Tools::Command.run(
-              Libis::Format::Config[:j2k_cmd],
-              '--input-file-name', source,
-              '--set-output-type', 'JP2',
-              *options,
-              '--output-file-name', target,
+            Libis::Format::Config[:j2k_cmd],
+            '--input-file-name', source,
+            '--set-output-type', 'JP2',
+            *options,
+            '--output-file-name', target
           )
 
           result.merge(files: [target], converter: self.class.name)
-
         end
       end
     end

data/lib/libis/format/converter/office_converter.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require_relative 'base'
 
@@ -8,47 +8,43 @@ require 'libis/format/type_database'
 module Libis
   module Format
     module Converter
-
       class OfficeConverter < Libis::Format::Converter::Base
-
         def self.input_types
-          [
-              :TXT,
-              :RTF,
-              :HTML,
-              :MSDOC,
-              :MSDOT,
-              :MSXLS,
-              :MSPPT,
-              :MSDOCX,
-              :MSDOTX,
-              :MSXLSX,
-              :MSPPTX,
-              :WORDPERFECT,
-              :OO_WRITER,
-              :OO_IMPRESS,
-              :OO_CALC
+          %i[
+            TXT
+            RTF
+            HTML
+            MSDOC
+            MSDOT
+            MSXLS
+            MSPPT
+            MSDOCX
+            MSDOTX
+            MSXLSX
+            MSPPTX
+            WORDPERFECT
+            OO_WRITER
+            OO_IMPRESS
+            OO_CALC
           ]
         end
 
         def self.output_types(format = nil)
           return [] unless input_types.include?(format)
+
           [:PDF]
         end
 
         def office_convert(_)
-          #force usage of this converter
+          # force usage of this converter
         end
 
         def convert(source, target, format, opts = {})
           super
 
           Format::Tool::OfficeToPdf.run(source, target)
-
         end
-
       end
-
     end
   end
 end