libis-format 0.9.35 → 0.9.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da9fb9519c4c34acf71a1d337b38a575be668b59
-  data.tar.gz: 22f23bb3cc7f5772c95891b2fa2a356bbc881d43
+  metadata.gz: 102c089d1a23d177c40e693c0e2d87182659e6e9
+  data.tar.gz: 4a9b393229a17eac40db9a2540a84fc8e2e75eeb
 SHA512:
-  metadata.gz: 2a6e12bd802a6f12b6367c07e08d1ad59d7c55ff53f0669ac82b11074c96930e3cb61b9dae44c0fc2590284e223efb27b2bb41b06978893620ae7abe3d5a5548
-  data.tar.gz: 21c025acb844ec485e65ca494b565cbc620024f77255c19f0eaf96e51739f44b57061740ecf497c532763eb9c745b5304eff56b08eed5d6bcc136ea3f5f6753f
+  metadata.gz: 3470b7edeab6bea691f5a25ba02d76cba85618026a61beb1ace8023c73d3270a916b585ae006189792cc0b064f760c28f4f7871f983859d7158bf7037aad8067
+  data.tar.gz: 6d90ae9419afb3c2cda8d060e4fb6b809fa575cfacf407049dc25694ff51fa74bc812ad38f2b5f1cc38a41a50fedcf2130290fa3913fd2ce6bfc267ea46947d2

data/lib/libis/format/identifier.rb

@@ -43,6 +43,7 @@ module Libis
         options[:droid] = true unless options.keys.include?(:droid) and options[:tool] and options[:tool] != :droid
         options[:fido] = true unless options.keys.include?(:fido) and options[:tool] and options[:tool] != :fido
         options[:file] = true unless options.keys.include?(:file) and options[:tool] and options[:tool] != :file
+        options[:xml_validation] = true unless options.keys.include?(:xml_validation) and !options[:xml_validation]
 
         result = {messages: [], output: {}, formats: {}}
 
@@ -64,11 +65,16 @@ module Libis
           log_msg(result, :error, "Error running File: #{e.message} @ #{e.backtrace.first}")
         end
 
+        # Let's not waiste time on this. If not standard, it will fail in Rosetta anyway.
         # get_extension_identification(file, options[:recursive], result)
 
         # determine XML type. Add custom types at runtime with
         # Libis::Tools::Format::Identifier.add_xml_validation('my_type', '/path/to/my_type.xsd')
-        validate_against_xml_schema(result)
+        begin
+          validate_against_xml_schema(result) if options[:xml_validation]
+        rescue => e
+          log_msg(result, :error, "Error validating XML files: #{e.message} @ #{e.backtrace.first}")
+        end
 
         process_results(result)
 
@@ -129,9 +135,15 @@ module Libis
             # Do nothing - probably Nokogiri chrashed during validation. Could have many causes
             # (remote schema (firewall, network, link rot, ...), schema syntax error, corrupt XML,...)
             # so we log and continue.
-            log_msg(result, :warn, "Error during XML validation: #{e.message}")
+            log_msg(result, :warn,
+                    "Error during XML validation of file #{file} against #{File.basename(xsd_file)}: #{e.message}")
           end
         end
+      rescue => e
+        # Not much we can do. probably Nokogiri chrashed opening the XML file. What caused this?
+        # (XML not parsable, false XML identification, ???)
+        # so we log and continue.
+        log_msg(result, :warn, "Error paring XML file #{file}: #{e.message} @ #{e.backtrace.first}")
       end
 
       def process_results(result)
@@ -171,7 +183,7 @@ module Libis
         file_result[:alternatives] = []
         format_matches.keys.each do |mime, puid|
           next if file_result[:mimetype] == mime && puid.nil?
-              selection = output.select {|x| x[:mimetype] == mime && x[:puid] == puid}
+          selection = output.select {|x| x[:mimetype] == mime && x[:puid] == puid}
           file_result[:alternatives] << get_best_result(selection)
         end
         file_result[:alternatives] = file_result[:alternatives].sort_by {|x| x[:score]}.reverse

data/lib/libis/format/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Format
-    VERSION = '0.9.35'
+    VERSION = '0.9.36'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 0.9.35
+  version: 0.9.36
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler