libis-format 1.2.9 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c29bb20892b78bbab9995bdd7ce9e41510c58eaa3f6b63677d4decabd58fa3c
-  data.tar.gz: ee9f707483006aef00181ca19ddb2db59f7b57cba73dcced0783651e6736b1e2
+  metadata.gz: b8282db4cf37eea292436474d401bcc2725c31eaa1eb882ea9475be14912f6c9
+  data.tar.gz: 6eaf1dfe05d24bd0df1ad20f61137a4007f02828b97138601c87afc5215d7454
 SHA512:
-  metadata.gz: 9df967f1e7548534c9f030d85e823af89c811501b28279ff390904f1ffccef27ecfc34467d5e858d1faa4b24fef018e2c5dc67a79041cebb80bdee02d0f1075d
-  data.tar.gz: fa62cdcc7d6182bf9092af071e1657ac6dd41d47f1ad7327ac66d604e6df3218117f07745c16cbd8b45043901f79ee86ece53d735b223a850c84ad3a5306cff4
+  metadata.gz: 8a242dc0d21da39ec434a7e2f59b2d8ff3c57e427512909c792bce05de5a29a03fdc726484059f13dc0b931f4ec2be13e75dc06f0e06b8736d77c541fd6aeb7e
+  data.tar.gz: 34a6d942f8fc39392528d03e5d367d8d476c58da12424ba5a8a87b4cf749a85ca485dba6ee1741dd5b865a25aaa57d562c1b97d96f03af83a5485f4c142dcdeb

data/Gemfile

@@ -6,6 +6,8 @@ gem 'coveralls', group: :test, require: false
 
 gemspec name: 'libis-format', development_group: :test
 
+gem 'gem-release'
+
 group :development do
   gem 'byebug'
   gem 'debug'

data/data/types.yml

@@ -377,7 +377,7 @@ PRESENTATION:
 
   OO_IMPRESS:
     NAME: OpenDocument Presentation (ODP)
-    PUIID: fmt/138 fmt/292 fmt/293
+    PUID: fmt/138 fmt/292 fmt/293
     MIME: application/vnd.oasis.opendocument.presentation application/vnd.oasis.opendocument.presentation-template
     EXTENSIONS: odp otp
 

data/lib/libis/format/command_line.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'tty-prompt'
 require 'tty-config'
@@ -7,9 +9,7 @@ require 'libis/format/cli/format'
 
 module Libis
   module Format
-
     class CommandLine < Thor
-
       def self.exit_on_failure?
         true
       end
@@ -20,6 +20,5 @@ module Libis
       desc 'format', 'perform format identification on a given file or directory'
       subcommand 'format', Cli::Format
     end
-
   end
 end

data/lib/libis/format/config.rb

@@ -1,10 +1,10 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'os'
 require 'libis-tools'
 
 module Libis
   module Format
-
     Config = ::Libis::Tools::Config
 
     Config[:converter_chain_max_level] = 8
@@ -15,10 +15,10 @@ module Libis
     Config[:ghostscript_cmd] = 'gs'
     Config[:droid_cmd] = '/opt/droid/droid.sh'
     Config[:droid_temp_path] = '/tmp'
-    Config[:fido_cmd] = '/usr/local/bin/fido'
+    Config[:fido_cmd] = 'fido'
     Config[:fop_jar] = File.join(Libis::Format::TOOL_DIR, 'fop', 'build', 'fop.jar')
     Config[:ffmpeg_cmd] = 'ffmpeg'
-    Config[:fido_formats] = [(File.join(Libis::Format::DATA_DIR, 'lias_formats.xml'))]
+    Config[:fido_formats] = [File.join(Libis::Format::DATA_DIR, 'lias_formats.xml')]
     Config[:pdf_tool] = File.join(Libis::Format::TOOL_DIR, 'PdfTool.jar')
     Config[:preflight_jar] = File.join(Libis::Format::TOOL_DIR, 'pdfbox', 'preflight-app-2.0.13.jar')
     Config[:wkhtmltopdf] = 'wkhtmltopdf'
@@ -27,21 +27,20 @@ module Libis
     Config[:raw_audio_convert_cmd] = 'sox -V1 %s -e signed -b 16 -t wav %s rate %d channels %d'
     Config[:watermark_font] = '/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf'
     Config[:timeouts] = {
-        droid: 20 * 60,
-        ffmpeg: 5 * 60,
-        fido: 20 * 60,
-        file_tool: 5 * 60,
-        fop: 5 * 60,
-        identification_tool: 5 * 60,
-        office_to_pdf: 5 * 60,
-        email2pdf: 5 * 60,
-        pdf_copy: 5 * 60,
-        pdf_merge: 5 * 60,
-        pdf_optimizer: 5 * 60,
-        pdf_split: 5 * 60,
-        pdf_to_pdfa: 5 * 60,
-        pdfa_validator: 5 * 60,
+      droid: 20 * 60,
+      ffmpeg: 5 * 60,
+      fido: 20 * 60,
+      file_tool: 5 * 60,
+      fop: 5 * 60,
+      identification_tool: 5 * 60,
+      office_to_pdf: 5 * 60,
+      email2pdf: 5 * 60,
+      pdf_copy: 5 * 60,
+      pdf_merge: 5 * 60,
+      pdf_optimizer: 5 * 60,
+      pdf_split: 5 * 60,
+      pdf_to_pdfa: 5 * 60,
+      pdfa_validator: 5 * 60
     }
-
   end
 end

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

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 ### require 'tools/string'
 require 'tmpdir'
@@ -11,7 +11,6 @@ require_relative 'repository'
 module Libis
   module Format
     module Converter
-
       class Base
         include Libis::Tools::Logger
 
@@ -22,7 +21,7 @@ module Libis
           @flags = {}
         end
 
-        def convert(source, target, format, opts = {})
+        def convert(source, _target, _format, opts = {})
           unless File.exist? source
             error "Cannot find file '#{source}'."
             return nil
@@ -32,35 +31,33 @@ module Libis
         end
 
         def self.input_types
-          raise RuntimeError, 'Method #input_types needs to be overridden in converter'
+          raise 'Method #input_types needs to be overridden in converter'
         end
 
         def self.output_types(_format = nil)
-          raise RuntimeError, 'Method #output_types needs to be overridden in converter'
+          raise 'Method #output_types needs to be overridden in converter'
         end
 
         def using_temp(target, &block)
           self.class.using_temp(target, &block)
         end
 
-        def Base.using_temp(target)
+        def self.using_temp(target)
           tempfile = Tools::TempFile.name("convert-#{File.basename(target, '.*').gsub(/\s/, '_')}", File.extname(target))
           result = yield tempfile
           return nil unless result
+
           FileUtils.move result, target
           target
         end
 
-        def Base.inherited( klass )
-
+        def self.inherited(klass) # rubocop:disable Lint/MissingSuper
           Repository.register klass
 
           class << self
-
             def conversions
-              input_types.inject({}) do |hash, input_type|
+              input_types.each_with_object({}) do |input_type, hash|
                 hash[input_type] = output_types
-                hash
               end
             end
 
@@ -83,7 +80,7 @@ module Libis
             end
 
             def conversion?(input_type, output_type)
-              conversions[input_type] and conversions[input_type].any? { |t| t == output_type }
+              conversions[input_type]&.any? { |t| t == output_type }
             end
 
             def output_for(input_type)
@@ -93,13 +90,9 @@ module Libis
             def extension?(extension)
               !TypeDatabase.ext_types(extension).first.nil?
             end
-
           end
-
         end
-
       end
-
     end
   end
 end

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

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require 'fileutils'
 require 'deep_dive'
@@ -10,7 +10,6 @@ require 'libis/format/type_database'
 module Libis
   module Format
     module Converter
-
       class Chain
         include ::Libis::Tools::Logger
         include DeepDive
@@ -26,15 +25,16 @@ module Libis
         # @return [Array[Hash]]
         def append(converter)
           return [] unless converter
+
           valid_chain_nodes(converter).map do |node|
-            self.ddup.add_chain_node(node)
+            ddup.add_chain_node(node)
           end.compact
         end
 
         def closed?
           !@converter_chain.empty? &&
-              @converter_chain.first[:input].to_sym == @source_format &&
-              @converter_chain.last[:output].to_sym == @target_format
+            @converter_chain.first[:input].to_sym == @source_format &&
+            @converter_chain.last[:output].to_sym == @target_format
         end
 
         def valid?
@@ -49,19 +49,14 @@ module Libis
           @converter_chain.size
         end
 
-        alias_method :length, :size
+        alias length size
 
         def to_s
-          "#{@source_format}->-#{@converter_chain.map do |node|
-            "#{node[:converter].name.gsub(/^.*::/, '')}#{node[:operations].empty? ? '' :
-                "(#{node[:operations].each do |operation|
-                  "#{operation[:method]}:#{operation[:argument]}"
-                end.join(',')})"}->-#{node[:output]}"
-          end.join('->-')}"
+          result = @source_format.to_s
+          result << @converter_chain.map { |node| node_to_s(node) }.join('->-')
         end
 
         def convert(src_file, target_file)
-
           unless valid?
             error 'Converter chain is not valid'
             return nil
@@ -74,15 +69,13 @@ module Libis
 
           # noinspection RubyParenthesesAroundConditionInspection
           conversion_success = @converter_chain.each_with_index do |node, i|
-
             target_type = node[:output]
             converter_class = node[:converter]
             converter = converter_class.new
 
-
-            node[:operations].each do |operation|
+            node[:operations]&.each do |operation|
               converter.send operation[:method], operation[:argument]
-            end if node[:operations]
+            end
 
             target = target_file
 
@@ -103,7 +96,6 @@ module Libis
             result[:commands] << r.merge(converter: converter_class.name)
 
             :success
-
           end
 
           result[:files] = [src_file] + xtra_files
@@ -113,16 +105,20 @@ module Libis
           end
 
           conversion_success == :failed ? nil : result
-
         end
 
         def valid_chain_nodes(converter)
-          source_format = @converter_chain.last[:output] rescue @source_format
+          source_format = begin
+            @converter_chain.last[:output]
+          rescue StandardError
+            @source_format
+          end
           nodes = []
           if converter.input_types.include? source_format
             converter.output_types(source_format).each do |format|
-              node = {converter: converter, input: source_format, output: format}
+              node = { converter:, input: source_format, output: format }
               next if node_exists?(node)
+
               nodes << node
             end
           end
@@ -137,6 +133,7 @@ module Libis
           return nil unless node[:output] && node[:converter].output_types(source_format).include?(node[:output])
           return nil unless node[:converter].input_types.include? source_format
           return nil if node_exists?(node)
+
           @converter_chain << node
           # debug "Chain: #{self}"
           self
@@ -145,15 +142,16 @@ module Libis
         def apply_operations
           temp_chain = @converter_chain.reverse.ddup
           applied = true
-          operations = @operations && @operations.ddup || {}
+          operations = @operations&.ddup || {}
           while (operation = operations.shift)
             method = operation.first.to_s.to_sym
-            applied &&= :found == temp_chain.each do |node|
+            applied &&= temp_chain.each do |node|
               next unless node[:converter].instance_methods.include?(method)
+
               node[:operations] ||= []
-              node[:operations] << {method: method, argument: operation.last}
+              node[:operations] << { method:, argument: operation.last }
               break :found
-            end
+            end == :found
           end
           if applied && operations.empty?
             @converter_chain = temp_chain.reverse
@@ -163,17 +161,27 @@ module Libis
           false
         end
 
-
         private
 
+        def node_to_s(node)
+          result = node[:converter].name.gsub(/^.*::/, '').to_s
+          unless node[:operations].empty?
+            result << '('
+            result << node[:operations].map do |operation|
+              "#{operation[:method]}:#{operation[:argument]}"
+            end.join(',')
+            result << ')'
+          end
+          result << '->-'
+          result << node[:output].to_s
+        end
+
         def node_exists?(node)
           @converter_chain.detect do |n|
             n[:converter] == node[:converter] && n[:input] == node[:input] && n[:output] == node[:output]
           end
         end
-
       end
-
     end
   end
 end

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

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require_relative 'base'
 
@@ -9,20 +9,19 @@ require 'rexml/document'
 module Libis
   module Format
     module Converter
-
       class EmailConverter < Libis::Format::Converter::Base
-
         def self.input_types
-          [ :MSG ]
+          [:MSG]
         end
 
         def self.output_types(format = nil)
           return [] unless input_types.include?(format)
-          [ :PDF ]
+
+          [:PDF]
         end
 
         def email_convert(_)
-          #force usage of this converter
+          # force usage of this converter
         end
 
         def convert(source, target, format, opts = {})
@@ -30,9 +29,7 @@ module Libis
 
           Format::Tool::MsgToPdf.run(source, target)
         end
-
       end
-
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'nokogiri'
 
 require_relative 'base'
@@ -7,15 +9,14 @@ require 'libis/format/tool/fop_pdf'
 module Libis
   module Format
     module Converter
-
       class FopPdfConverter < Libis::Format::Converter::Base
-
         def self.input_types
           [:XML]
         end
 
         def self.output_types(format = nil)
-          return [] unless input_types.include?(format) if format
+          return [] if format && !input_types.include?(format)
+
           [:PDF]
         end
 
@@ -30,11 +31,8 @@ module Libis
           FileUtils.mkpath(File.dirname(target))
 
           Libis::Format::Tool::FopPdf.run(source, target)
-
         end
-
       end
-
     end
   end
 end

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