libis-format 0.9.44 → 0.9.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22fe2305d1461bf58825e88933f215cd64fffdba
-  data.tar.gz: 454e2fc45afeae5b338723df845923c7f4364d10
+  metadata.gz: 90f7a025d3c3669dbb927c8c9b15c69f2d56920e
+  data.tar.gz: 2f44a0d3433882991a5bb2f68a40b0b68c1ae6e8
 SHA512:
-  metadata.gz: ecf6f26241e61b34c6162c31ee1f55896a8d9bb67b01e2484db1714d1c5dfc75ce5666fad215dc8bc99d6e12d6f50fac3e81f92c9f47a5d8f26bdb43c0766d7b
-  data.tar.gz: 8743beb8af9bc17f9953e9488d0fc78ccb8e709a5fcbc551470926fea972e39560b6ab092faa52789109ff796b7309f45bba9844e395c1e2cc0f3c10d94b27b8
+  metadata.gz: ac9e8ca2115f0d57fd3d161bbab2e9ecd5d1f7e08b2517bfaa5793a644555921ea404f806f2a99cba44044b72f236636cadd4a4258a199ec0fbed1021dfd095a
+  data.tar.gz: 2a61012eb18282b6f0164abf4948d5018e207c414cebc489296b50679594877c4bd33cd38003901ec0d05a6349fa25fd06e98ecb2707207e3aced31e9c173b1c

data/bin/formatinfo

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require 'libis-format'
+require 'libis-tools'
+require 'awesome_print'
+
+::Libis::Tools::Config.logger.level = :WARN
+
+result = ::Libis::Format::Identifier.get ARGV[0]
+
+puts '--- messages ---'
+result[:messages].each do |message|
+  puts "#{message[0]} : #{message[1]}"
+end
+
+puts '--- formats ---'
+result[:formats].each do |file, info|
+  puts "#{file}:"
+  ap info
+end

data/data/types.yml

@@ -131,7 +131,7 @@ AUDIO:
   M4A:
     NAME: MPEG-4 Media File (M4A)
     MIME: audio/mp4
-    PUID: fmt/199, fmt/596
+    PUID: fmt/596
     EXTENSIONS: m4a f4a
 
 VIDEO:

data/lib/libis/format/identifier.rb

@@ -97,7 +97,7 @@ module Libis
       end
 
       def get_fido_identification(file, result, options)
-        output = ::Libis::Format::Tool::Fido.run(file, options[:recursive])
+        output = ::Libis::Format::Tool::Fido.run(file, options[:recursive], options[:fido_options])
         process_tool_output(output, result, options[:base_dir])
         output
       end
@@ -197,7 +197,7 @@ module Libis
 
       def process_tool_output(output, result, base_dir)
         output.each do |file, file_output|
-          file = Pathname.new(file).relative_path_from(Pathname(base_dir)).to_s.freeze if base_dir
+          file = Pathname.new(file).relative_path_from(Pathname(File.absolute_path(base_dir))).to_s.freeze if base_dir
           result[:output][file] ||= []
           result[:output][file] += file_output
         end

data/lib/libis/format/tool/droid.rb

@@ -20,28 +20,24 @@ module Libis
 
       class Droid < Libis::Format::Tool::IdentificationTool
 
-        def run_list(filelist)
+        def run_list(filelist, _options = {})
           runner(filelist)
         end
 
-        def run_dir(dir, recursive = true)
-          profile = profile_file_name
-          report = result_file_name
-          create_profile(dir, profile, recursive)
-          create_report(profile, report)
-          parse_report(report)
+        def run_dir(dir, recursive = true, _options = {})
+          runner(dir, recursive)
         end
 
-        def run(file)
+        def run(file, _options = {})
           runner(file)
         end
 
         protected
 
-        def runner(file_or_list)
+        def runner(file_or_list, recursive = false)
           profile = profile_file_name
           report = result_file_name
-          create_profile(file_or_list, profile)
+          create_profile(file_or_list, profile, recursive)
           create_report(profile, report)
           parse_report(report)
         end

data/lib/libis/format/tool/extension_identification.rb

@@ -6,7 +6,7 @@ module Libis
 
       class ExtensionIdentification < Libis::Format::Tool::IdentificationTool
 
-        def run_list(filelist)
+        def run_list(filelist, _options = {})
 
           output = runner(nil, filelist)
 
@@ -14,7 +14,7 @@ module Libis
 
         end
 
-        def run_dir(dir, recursive = true)
+        def run_dir(dir, recursive = true, _options = {})
 
           filelist = find_files(dir, recursive)
 
@@ -24,7 +24,7 @@ module Libis
 
         end
 
-        def run(file)
+        def run(file, _options)
 
           output = runner(file)
 

data/lib/libis/format/tool/fido.rb

@@ -22,22 +22,23 @@ module Libis
 
         attr_reader :formats
 
-        def run_list(filelist)
+        def run_list(filelist, options = {})
           create_list_file(filelist) do |list_file|
-            output = runner(nil, '-input', list_file.escape_for_string)
+            output = runner(nil, '-input', list_file.escape_for_string, options)
             process_output(output)
           end
         end
 
-        def run_dir(dir, recursive = true)
+        def run_dir(dir, recursive = true, options = {})
           args = []
           args << '-recurse' if recursive
+          args << options
           output = runner(dir, *args)
           process_output(output)
         end
 
-        def run(file)
-          output = runner(file)
+        def run(file, options = {})
+          output = runner(file, options)
           process_output(output)
         end
 
@@ -53,11 +54,18 @@ module Libis
         attr_writer :formats
 
         def runner(filename, *args)
+          options = {}
+          options = args.pop if args.last.is_a?(Hash)
           # Load custome format definitions if present
           args << '-loadformats' << "#{formats.join(',')}" unless formats.empty?
 
           # Workaround for Fido performance bug
-          args << '-bufsize' << '1000'
+          args << '-bufsize' << (options[:bufsize] || 1000).to_s
+
+          # Other options
+          args << '-container_bufsize' << options[:container_bufsize].to_s if options[:container_bufsize]
+          args << '-pronom_only' if options[:pronom_only]
+          args << '-nocontainer' if options[:nocontainer]
 
           # Add filename to argument list (optional)
           args << "#{filename.escape_for_string}" if filename

data/lib/libis/format/tool/file_tool.rb

@@ -6,7 +6,7 @@ module Libis
 
       class FileTool < Libis::Format::Tool::IdentificationTool
 
-        def run_list(filelist)
+        def run_list(filelist, _options = {})
 
           create_list_file(filelist) do |list_file|
 
@@ -18,7 +18,7 @@ module Libis
 
         end
 
-        def run_dir(dir, recursive = true)
+        def run_dir(dir, recursive = true, _options = {})
 
           filelist = find_files(dir, recursive)
 
@@ -32,7 +32,7 @@ module Libis
 
         end
 
-        def run(file)
+        def run(file, _options = {})
 
           output = runner(file)
 

data/lib/libis/format/tool/identification_tool.rb

@@ -21,26 +21,27 @@ module Libis
           self.instance.bad_mimetype(mimetype)
         end
 
-        def self.run(file, recursive = false)
+        def self.run(file, recursive = false, options = {})
+          options ||= {}
           if file.is_a?(Array)
-            return run_list file
+            return run_list file, options
           elsif file.is_a?(String) && File.exists?(file) && File.readable?(file)
             if File.directory?(file)
-              return run_dir(file, recursive)
+              return run_dir(file, recursive, options)
             elsif File.file?(file)
-              return self.instance.run(file)
+              return self.instance.run(file, options)
             end
           end
           raise ArgumentError,
                 'IdentificationTool: file argument should be a path to an existing file or directory or a list of those'
         end
 
-        def self.run_dir(file, recursive = true)
-          self.instance.run_dir file, recursive
+        def self.run_dir(file, recursive = true, options = {})
+          self.instance.run_dir file, recursive, options
         end
 
-        def self.run_list(filelist)
-          self.instance.run_list filelist
+        def self.run_list(filelist , options = {})
+          self.instance.run_list filelist, options
         end
 
         protected
@@ -83,9 +84,9 @@ module Libis
         #
         def process_output(output)
           output.reduce({}) do |results, x|
-            filepath = x.delete(:filepath)
+            filepath = File.absolute_path(x.delete(:filepath)).freeze
             results[filepath] ||= []
-            results[filepath.freeze] << annotate(x)
+            results[filepath] << annotate(x)
             results
           end
         end

data/lib/libis/format/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Format
-    VERSION = '0.9.44'
+    VERSION = '0.9.45'
   end
 end

data/spec/identifier_spec.rb

@@ -96,7 +96,7 @@ describe 'Identfier' do
       File.exists?(Libis::Format::Config[:fido_path])) do
 
     it 'should identify all files in a folder at once' do
-      result = identifier.get (dir)
+      result = identifier.get(dir)
       expect(result[:formats].size).to be >= formatlist.size
       formatlist.each do |file, format|
         expect(result[:formats][File.join(dir, file)]).to include format

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 0.9.44
+  version: 0.9.45
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,6 +143,7 @@ email:
 executables:
 - droid
 - fido
+- formatinfo
 - pdf_copy
 extensions: []
 extra_rdoc_files: []
@@ -156,6 +157,7 @@ files:
 - Rakefile
 - bin/droid
 - bin/fido
+- bin/formatinfo
 - bin/pdf_copy
 - data/ISOcoated_v2_eci.icc
 - data/PDFA_def.ps