libis-format 0.9.45 → 0.9.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90f7a025d3c3669dbb927c8c9b15c69f2d56920e
-  data.tar.gz: 2f44a0d3433882991a5bb2f68a40b0b68c1ae6e8
+  metadata.gz: c702defaa0d1e02ec76075f37ef75296420f25d7
+  data.tar.gz: 388175008ed119a9245a66bf3f325c561f63251b
 SHA512:
-  metadata.gz: ac9e8ca2115f0d57fd3d161bbab2e9ecd5d1f7e08b2517bfaa5793a644555921ea404f806f2a99cba44044b72f236636cadd4a4258a199ec0fbed1021dfd095a
-  data.tar.gz: 2a61012eb18282b6f0164abf4948d5018e207c414cebc489296b50679594877c4bd33cd38003901ec0d05a6349fa25fd06e98ecb2707207e3aced31e9c173b1c
+  metadata.gz: 4bdbc44e8424e749d22a34acfe1d94138708cc4e5df3fe3795bd2531a0ae89bec1c52fd911f12544fe5319ca55f212f885939721c6d317773837d8ec3f749a71
+  data.tar.gz: 0fd44ec84de3896163df19f69bd2eef5f5910f358794a83698355c530d8f35f8d6e377f7135c9d970674269628e6a01a1c315ebb6101798ee02ed866e075060d

data/README.md

@@ -128,7 +128,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                       :mimetype => "image/bmp",
                    :format_name => "Windows Bitmap",
                 :format_version => "3.0",
-                        :source => :droid,
+                          :tool => :droid,
                           :TYPE => :BMP,
                          :GROUP => :IMAGE,
                          :score => 7
@@ -139,7 +139,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                 :format_version => "Windows Bitmap 3.0",
                       :mimetype => "image/bmp",
                      :matchtype => "signature",
-                        :source => :fido,
+                          :tool => :fido,
                           :TYPE => :BMP,
                          :GROUP => :IMAGE,
                          :score => 7
@@ -147,7 +147,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
             [2] {
                  :mimetype => "image/bmp",
                 :matchtype => "magic",
-                   :source => :file,
+                     :tool => :file,
                      :TYPE => :BMP,
                     :GROUP => :IMAGE,
                     :score => 2
@@ -161,7 +161,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                       :mimetype => "image/jp2",
                    :format_name => "JP2 (JPEG 2000 part 1)",
                 :format_version => "",
-                        :source => :droid,
+                          :tool => :droid,
                           :TYPE => :JP2,
                          :GROUP => :IMAGE,
                          :score => 7
@@ -172,7 +172,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                 :format_version => "JPEG2000",
                       :mimetype => "image/jp2",
                      :matchtype => "signature",
-                        :source => :fido,
+                          :tool => :fido,
                           :TYPE => :JP2,
                          :GROUP => :IMAGE,
                          :score => 7
@@ -180,7 +180,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
             [2] {
                  :mimetype => "image/jp2",
                 :matchtype => "magic",
-                   :source => :file,
+                     :tool => :file,
                      :TYPE => :JP2,
                     :GROUP => :IMAGE,
                     :score => 2
@@ -196,7 +196,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                   :mimetype => "image/bmp",
                :format_name => "Windows Bitmap",
             :format_version => "3.0",
-                    :source => :droid,
+                      :tool => :droid,
                       :TYPE => :BMP,
                      :GROUP => :IMAGE,
                      :score => 7
@@ -208,7 +208,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                   :mimetype => "image/jp2",
                :format_name => "JP2 (JPEG 2000 part 1)",
             :format_version => "JPEG2000",
-                    :source => :droid,
+                      :tool => :droid,
                       :TYPE => :JP2,
                      :GROUP => :IMAGE,
                      :score => 7
@@ -220,7 +220,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                   :mimetype => "image/tiff",
                :format_name => "Tagged Image File Format",
             :format_version => "TIFF generic (little-endian)",
-                    :source => :droid,
+                      :tool => :droid,
                       :TYPE => :TIFF,
                      :GROUP => :IMAGE,
                      :score => 7
@@ -232,7 +232,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                   :mimetype => "image/tiff",
                :format_name => "Exchangeable Image File Format (Uncompressed)",
             :format_version => "2.2",
-                    :source => :droid,
+                      :tool => :droid,
                       :TYPE => :TIFF,
                      :GROUP => :IMAGE,
                      :score => 7,
@@ -243,7 +243,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                     :format_version => "TIFF generic (little-endian)",
                           :mimetype => "image/tiff",
                          :matchtype => "signature",
-                            :source => :fido,
+                              :tool => :fido,
                               :TYPE => :TIFF,
                              :GROUP => :IMAGE,
                              :score => 7
@@ -255,7 +255,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                           :mimetype => "image/tiff",
                        :format_name => "Exchangeable Image File Format (Uncompressed)",
                     :format_version => "2.2",
-                            :source => :droid,
+                              :tool => :droid,
                               :TYPE => :TIFF,
                              :GROUP => :IMAGE,
                              :score => 7
@@ -269,7 +269,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                   :mimetype => "archive/ead",
                :format_name => "Encoded Archival Description (EAD)",
             :format_version => "",
-                    :source => :xsd_validation,
+                      :tool => :xsd_validation,
                       :TYPE => :EAD,
                      :GROUP => :ARCHIVE,
                      :score => 7,
@@ -283,7 +283,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                   :mimetype => "application/msword",
                :format_name => "Microsoft Word Document",
             :format_version => "97-2003",
-                    :source => :droid,
+                      :tool => :droid,
                       :TYPE => :MSDOC,
                      :GROUP => :TEXT,
                      :score => 9,
@@ -295,7 +295,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                           :mimetype => "application/msword",
                        :format_name => "Microsoft Word Document",
                     :format_version => "97-2003",
-                            :source => :droid,
+                              :tool => :droid,
                               :TYPE => :MSDOC,
                              :GROUP => :TEXT,
                              :score => 9
@@ -306,7 +306,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                     :format_version => "OLE2 Compound Document Format",
                           :mimetype => nil,
                          :matchtype => "signature",
-                            :source => :fido,
+                              :tool => :fido,
                              :score => 3
                 }
             ]
@@ -318,7 +318,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                   :mimetype => "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
                :format_name => "Microsoft Word for Windows",
             :format_version => "2007 onwards",
-                    :source => :droid,
+                      :tool => :droid,
                       :TYPE => :MSDOCX,
                      :GROUP => :TEXT,
                      :score => 9
@@ -330,7 +330,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                   :mimetype => "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
                :format_name => "Microsoft Excel for Windows",
             :format_version => "2007 onwards",
-                    :source => :droid,
+                      :tool => :droid,
                       :TYPE => :MSXLSX,
                      :GROUP => :TABULAR,
                      :score => 9,
@@ -342,7 +342,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                           :mimetype => "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
                        :format_name => "Microsoft Excel for Windows",
                     :format_version => "2007 onwards",
-                            :source => :droid,
+                              :tool => :droid,
                               :TYPE => :MSXLSX,
                              :GROUP => :TABULAR,
                              :score => 9
@@ -350,7 +350,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                 [1] {
                      :mimetype => "application/octet-stream",
                     :matchtype => "magic",
-                       :source => :file,
+                         :tool => :file,
                         :score => -2
                 }
             ]
@@ -362,7 +362,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                   :mimetype => "application/pdf",
                :format_name => "Acrobat PDF/A - Portable Document Format",
             :format_version => "1b",
-                    :source => :droid,
+                      :tool => :droid,
                       :TYPE => :PDFA,
                      :GROUP => :TEXT,
                      :score => 7,
@@ -373,7 +373,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                     :format_version => "PDF 1.5",
                           :mimetype => "application/pdf",
                          :matchtype => "signature",
-                            :source => :fido,
+                              :tool => :fido,
                               :TYPE => :PDF,
                              :GROUP => :TEXT,
                              :score => 7
@@ -385,7 +385,7 @@ XML type you should add an entry to your Type Database with the same MIME-type.
                           :mimetype => "application/pdf",
                        :format_name => "Acrobat PDF/A - Portable Document Format",
                     :format_version => "1b",
-                            :source => :droid,
+                              :tool => :droid,
                               :TYPE => :PDFA,
                              :GROUP => :TEXT,
                              :score => 7

data/data/types.yml

@@ -154,12 +154,6 @@ VIDEO:
     MIME:  video/webm
     EXTENSIONS: webm
 
-  FLASH:
-    NAME: Macromedia Flash
-    MIME: application/x-shockwave-flash
-    PUID: fmt/104 fmt/105 fmt/106 fmt/107 fmt/108 fmt/109 fmt/110
-    EXTENSIONS: swf
-
   MKV:
     NAME: Matroska Multimedia Container (MKV)
     MIME: video/x-matroska
@@ -202,12 +196,18 @@ VIDEO:
     PUID: x-fmt/152
     EXTENSIONS: dv
 
-  FLASH:
+  FLV:
     NAME: Flash video (FLV)
     MIME: video/x-flv
     PUID: x-fmt/382
     EXTENSIONS: flv
 
+  SWF:
+    NAME: Macromedia Flash
+    MIME: application/x-shockwave-flash
+    PUID: fmt/104 fmt/105 fmt/106 fmt/107 fmt/108 fmt/109 fmt/110
+    EXTENSIONS: swf
+
 TEXT:
 
   TXT:

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

@@ -10,12 +10,12 @@ module Libis
       class VideoConverter < Libis::Format::Converter::Base
 
         def self.input_types
-          [:WEBM, :M4V, :MPEG, :MJP2, :QTFF, :AVI, :OGGV, :WMV, :DV, :FLASH]
+          [:WEBM, :MP4, :MPG, :MKV, :MJP2, :QTFF, :AVI, :OGGV, :WMV, :DV, :FLV, :SWF]
         end
 
         def self.output_types(format = nil)
           return [] unless input_types.include?(format)
-          [:GIF, :AVI, :FLV, :MKV, :MOV, :MP4, :MPG, :OGGV, :SWF, :WEBM, :WMV]
+          [:GIF, :WEBM, :MP4, :MPG, :MKV, :MJP2, :QTFF, :AVI, :OGGV, :WMV, :DV, :FLV, :SWF]
         end
 
         def initialize

data/lib/libis/format/identifier.rb

@@ -131,7 +131,7 @@ module Libis
           begin
             if doc.validates_against?(xsd_file)
               log_msg result, :debug, "XML file validated against XML Schema: #{xsd_file}"
-              info = {mimetype: mime, tool: file_result[:source], source: :xsd_validation, match_type: 'xsd_validation', format_version: '', }
+              info = {mimetype: mime, tool_raw: file_result[:tool], tool: :xsd_validation, match_type: 'xsd_validation', format_version: '', }
               file_result.merge! Libis::Format::TypeDatabase.enrich(info, PUID: :puid, MIME: :mimetype, NAME: :format_name)
             end
           rescue => e
@@ -159,7 +159,7 @@ module Libis
                 mimetype: 'application/octet-stream',
                 puid: 'fmt/unknown',
                 score: 0,
-                source: nil
+                tool: nil
             }
           else
             format_matches = output.group_by {|x| [x[:mimetype], x[:puid]]}

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

@@ -62,7 +62,7 @@ module Libis
             r.delete(:mod_time)
             r.delete(:hash)
             r.delete(:format_count)
-            r[:source] = :droid
+            r[:tool] = :droid
           end
           File.delete report
           process_output(result)

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

@@ -44,7 +44,7 @@ module Libis
                   mimetype: (info[:MIME].first rescue nil),
                   puid: (info[:PUID].first rescue nil),
                   matchtype: 'extension',
-                  source: :type_database
+                  tool: :type_database
               }
             end
           end.cleanup

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

@@ -88,7 +88,7 @@ module Libis
             r.delete(:time)
             r.delete(:status)
             r.delete(:filesize)
-            r[:source] = :fido
+            r[:tool] = :fido
           end
         end
 

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

@@ -67,7 +67,7 @@ module Libis
           # Parse output text into array and return result
           file_tool[:out].map do |line|
             r = line.split(/:\s+/)
-            {filepath: r[0], mimetype: r[1], matchtype: 'magic', source: :file}
+            {filepath: r[0], mimetype: r[1], matchtype: 'magic', tool: :file}
           end
         end
 

data/lib/libis/format/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-format
 version: !ruby/object:Gem::Version
-  version: 0.9.45
+  version: 0.9.46
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-21 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler