libis-format 1.2.9 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c29bb20892b78bbab9995bdd7ce9e41510c58eaa3f6b63677d4decabd58fa3c
-  data.tar.gz: ee9f707483006aef00181ca19ddb2db59f7b57cba73dcced0783651e6736b1e2
+  metadata.gz: 68f64b7c012a051d6c25eb3cb02fb74d662c0f1da348d4b3b5b4af5b7004d543
+  data.tar.gz: 62708947cef69d89540b2dd73b85a546eb012fae7e6565e329e989ab0573949b
 SHA512:
-  metadata.gz: 9df967f1e7548534c9f030d85e823af89c811501b28279ff390904f1ffccef27ecfc34467d5e858d1faa4b24fef018e2c5dc67a79041cebb80bdee02d0f1075d
-  data.tar.gz: fa62cdcc7d6182bf9092af071e1657ac6dd41d47f1ad7327ac66d604e6df3218117f07745c16cbd8b45043901f79ee86ece53d735b223a850c84ad3a5306cff4
+  metadata.gz: ed3dc449c70eb71f081a6c55f06d8a2b484afb0094a6988aad0ca018ae36e07beb1d9fae3a8fb0a3a026e90c13386f83686b7c66be34b8a028d588ef9412bd99
+  data.tar.gz: 44bc49f3315e99974e5c7f992e1f496ec3e59dbd15839f93a0e2f8b20fc73dcbfba0f77e178514f0e78f0f561961f55f31895e843ba217e70e2a3cc79b47cdfb

data/Gemfile

@@ -11,3 +11,7 @@ group :development do
   gem 'debug'
   gem 'standard'
 end
+
+# Gem publishing and changelog
+gem 'gem-release'
+gem 'github_changelog_generator'

data/bin/{pdf_copy → pdf_tool}

@@ -5,9 +5,10 @@ require 'libis-tools'
 
 ::Libis::Tools::Config.logger.level = :WARN
 
+command = ARGV.shift
+command = command.split('_')
 source = ARGV.shift
 target = ARGV.shift
 options = ARGV
 
-::Libis::Format::Tool::PdfCopy.run source, target, options
-
+::Libis::Format::Tool::PdfTool.run command, source, target, *options

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,33 +15,30 @@ 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[:preflight_jar] = File.join(Libis::Format::TOOL_DIR, 'pdfbox', 'preflight-app-3.0.3.jar')
     Config[:wkhtmltopdf] = 'wkhtmltopdf'
     Config[:xml_validations] = [['archive/ead', File.join(Libis::Format::DATA_DIR, 'ead.xsd')]]
     Config[:type_database] = File.join(Libis::Format::DATA_DIR, 'types.yml')
     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_tool: 5 * 60,
+      pdf_optimizer: 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