libis-format 0.9.37 → 0.9.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 675cfff96c503a9e4815f6b8f63521ebef16e18d
-  data.tar.gz: c7194c4d45dec03b46fb82fe77ee627e820e01fe
+  metadata.gz: aee2f761cde56c377abdfff7b7d40d09c32c0c93
+  data.tar.gz: 5d6384f6484d04ec01705883e04ead5b0d02dacb
 SHA512:
-  metadata.gz: d88b635b271233ad6123d42998760ee032219fc5e1a1beb76154e49a2cafc1cab5fd6dbe7d95b093dd624b3935ffe21edc863e3f8767a023d1b5c25575d6441f
-  data.tar.gz: e63ae8359c4278fc5df9736ffd58f65918e09c461d1b9653327df72d09863f8ac8801d5c1f97231fd4648aa3099c942830d0585dfc28e494dbbc10e15b494ce9
+  metadata.gz: 5a359cd06cc1f3f442b69981858e44e55f4cd085e0e0291e4b03c0a530e86d5f5e72d1083cc7b2fa306fdd4dba033ce4eb985c49373fe0d4467052f1406146a3
+  data.tar.gz: 619bdb26cfea98753544d47fd1096150cd2f7ec56e5322bffabf6a4c598797f31be68d22b3f7f267aebcc5f743ae6d60bcd498a1eb27af183a5b0a5cbae7c0a9

data/lib/libis/format/identifier.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'singleton'
+require 'pathname'
 
 require 'libis-tools'
 require 'libis/tools/extend/hash'
@@ -48,19 +49,19 @@ module Libis
         result = {messages: [], output: {}, formats: {}}
 
         begin
-          get_droid_identification(file, options[:recursive], result) if options[:droid]
+          get_droid_identification(file, result, options) if options[:droid]
         rescue => e
           log_msg(result, :error, "Error running Droid: #{e.message} @ #{e.backtrace.first}")
         end
 
         begin
-          get_fido_identification(file, options[:recursive], result) if options[:fido]
+          get_fido_identification(file, result, options) if options[:fido]
         rescue => e
           log_msg(result, :error, "Error running Fido: #{e.message} @ #{e.backtrace.first}")
         end
 
         begin
-          get_file_identification(file, options[:recursive], result) if options[:file]
+          get_file_identification(file, result, options) if options[:file]
         rescue => e
           log_msg(result, :error, "Error running File: #{e.message} @ #{e.backtrace.first}")
         end
@@ -71,7 +72,7 @@ module Libis
         # determine XML type. Add custom types at runtime with
         # Libis::Tools::Format::Identifier.add_xml_validation('my_type', '/path/to/my_type.xsd')
         begin
-          validate_against_xml_schema(result) if options[:xml_validation]
+          validate_against_xml_schema(result, options[:base_dir]) if options[:xml_validation]
         rescue => e
           log_msg(result, :error, "Error validating XML files: #{e.message} @ #{e.backtrace.first}")
         end
@@ -88,41 +89,42 @@ module Libis
         @xml_validations = Libis::Format::Config[:xml_validations].to_h
       end
 
-      def get_file_identification(file, recursive, result)
-        output = ::Libis::Format::FileTool.run(file, recursive)
-        process_tool_output(output, result)
+      def get_file_identification(file, result, options)
+        output = ::Libis::Format::FileTool.run(file, options[:recursive])
+        process_tool_output(output, result, options[:base_dir])
         output
       end
 
-      def get_fido_identification(file, recursive, result)
-        output = ::Libis::Format::Fido.run(file, recursive)
-        process_tool_output(output, result)
+      def get_fido_identification(file, result, options)
+        output = ::Libis::Format::Fido.run(file, options[:recursive])
+        process_tool_output(output, result, options[:base_dir])
         output
       end
 
-      def get_droid_identification(file, recursive, result)
-        output = ::Libis::Format::Droid.run(file, recursive)
-        process_tool_output(output, result)
+      def get_droid_identification(file, result, options)
+        output = ::Libis::Format::Droid.run(file, options[:recursive])
+        process_tool_output(output, result, options[:base_dir])
         output
       end
 
-      def get_extension_identification(file, recursive, result)
-        output = ::Libis::Format::ExtensionIdentification.run(file, recursive)
-        process_tool_output(output, result)
+      def get_extension_identification(file, result, options)
+        output = ::Libis::Format::ExtensionIdentification.run(file, options[:recursive])
+        process_tool_output(output, result, options[:base_dir])
         output
       end
 
-      def validate_against_xml_schema(result)
+      def validate_against_xml_schema(result, base_dir)
         result[:output].each do |file, file_results|
           file_results.each do |file_result|
-            xml_validate(file, file_result, result)
+            xml_validate(file, file_result, result, base_dir)
           end
         end
       end
 
-      def xml_validate(file, file_result, result)
+      def xml_validate(file, file_result, result, base_dir)
         return unless file_result[:mimetype] =~ /^(text|application)\/xml$/
-        doc = ::Libis::Tools::XmlDocument.open file
+        filepath = base_dir ? File.join(base_dir, file) : file
+        doc = ::Libis::Tools::XmlDocument.open filepath
         xml_validations.each do |mime, xsd_file|
           next unless xsd_file
           begin
@@ -165,7 +167,7 @@ module Libis
             end
             case format_matches.count
               when 0
-                # No this really cannot happen. If there are not hits, there will be at least a format [nil,nil]
+                # No this really cannot happen. If there are no hits, there will be at least a format [nil,nil]
               when 1
                 # only one match, that's easy. The first of the highest score will be used
                 file_result.merge!(get_best_result(output))
@@ -192,8 +194,9 @@ module Libis
 
       private
 
-      def process_tool_output(output, result)
+      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
           result[:output][file] ||= []
           result[:output][file] += file_output
         end

data/lib/libis/format/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Format
-    VERSION = '0.9.37'
+    VERSION = '0.9.38'
   end
 end

data/spec/identifier_spec.rb

@@ -70,10 +70,10 @@ describe 'Identfier' do
         ::Logging::Appenders.string_io('StringIO', layout: ::Libis::Tools::Config.get_log_formatter)
     ::Libis::Tools::Config.logger.level = :all
     ::Libis::Format::Config[:droid_path] = '/opt/droid/droid.sh'
-    ::Libis::Format::Config[:fido_path] = '/usr/local/bin/fido'
+    ::Libis::Format::Config[:fido_path] = File.join(ENV['HOME'], 'bin', 'fido')
   end
 
-  let (:identifier) { ::Libis::Format::Identifier }
+  let (:identifier) {::Libis::Format::Identifier}
   let (:logoutput) {::Libis::Tools::Config.logger.appenders.last.sio}
   let (:dir) {File.join File.absolute_path(File.dirname(__FILE__)), 'data'}
 
@@ -114,6 +114,14 @@ describe 'Identfier' do
     end
   end
 
+  it 'should identify all files in a folder with base_dir option' do
+    result = identifier.get(dir, base_dir: dir)
+    expect(result[:formats].size).to be >= formatlist.size
+    formatlist.each do |file, format|
+      expect(result[:formats][file]).to include format
+    end
+  end
+
   it 'should identify all files in a list at once' do
     filelist = fidolist.keys.map {|file| File.join(dir, file)}
     result = identifier.get (filelist)
@@ -123,6 +131,15 @@ describe 'Identfier' do
     end
   end
 
+  it 'should identify all files in a list with base_dir option' do
+    filelist = fidolist.keys.map {|file| File.join(dir, file)}
+    result = identifier.get(filelist, base_dir: dir)
+    expect(result[:formats].size).to be >= formatlist.size
+    formatlist.each do |file, format|
+      expect(result[:formats][file]).to include format
+    end
+  end
+
   context 'individual files' do
 
     formatlist.each do |file, format|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 0.9.37
+  version: 0.9.38
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler