diff --git a/setup.cfg b/setup.cfg index e38d83b..8c7d056 100644 --- a/setup.cfg +++ b/setup.cfg @@ -68,6 +68,9 @@ where = src full = typecode_libmagic >= 5.39.210223 +system_provided = + typecode_libmagic_system_provided + testing = pytest >= 6, != 7.0.0 pytest-xdist >= 2 diff --git a/tests/data/filetest/archive/a.tar.gz.yml b/tests/data/filetest/archive/a.tar.gz.yml index f643d7e..deb884d 100644 --- a/tests/data/filetest/archive/a.tar.gz.yml +++ b/tests/data/filetest/archive/a.tar.gz.yml @@ -1,4 +1,4 @@ -filetype_file: gzip compressed data, last modified +filetype_file: gzip compressed data mimetype_file: application/gzip mimetype_python: application/x-tar is_file: yes diff --git a/tests/data/filetest/archive/e.tar.bz2.yml b/tests/data/filetest/archive/e.tar.bz2.yml index 681efae..a8b49a2 100644 --- a/tests/data/filetest/archive/e.tar.bz2.yml +++ b/tests/data/filetest/archive/e.tar.bz2.yml @@ -1,4 +1,4 @@ -filetype_file: bzip2 compressed data, block size = 900k +filetype_file: bzip2 compressed data mimetype_file: application/x-bzip2 mimetype_python: application/x-tar is_file: yes diff --git a/tests/data/filetest/archive/e.tar.gz.yml b/tests/data/filetest/archive/e.tar.gz.yml index 152a217..d06757a 100644 --- a/tests/data/filetest/archive/e.tar.gz.yml +++ b/tests/data/filetest/archive/e.tar.gz.yml @@ -1,4 +1,4 @@ -filetype_file: gzip compressed data, last modified +filetype_file: gzip compressed data mimetype_file: application/gzip mimetype_python: application/x-tar is_file: yes diff --git a/tests/data/filetest/archive/file_4.26-1.diff.gz.yml b/tests/data/filetest/archive/file_4.26-1.diff.gz.yml index bcd7d61..39c83fb 100644 --- a/tests/data/filetest/archive/file_4.26-1.diff.gz.yml +++ b/tests/data/filetest/archive/file_4.26-1.diff.gz.yml @@ -1,4 +1,4 @@ -filetype_file: gzip compressed data, last modified +filetype_file: gzip compressed data mimetype_file: application/gzip is_file: yes is_regular: yes diff --git a/tests/data/filetest/archive/test.tar.lzma.yml b/tests/data/filetest/archive/test.tar.lzma.yml index 6e4a166..72555bb 100644 --- a/tests/data/filetest/archive/test.tar.lzma.yml +++ b/tests/data/filetest/archive/test.tar.lzma.yml @@ -1,4 +1,4 @@ -filetype_file: LZMA compressed data, streamed +filetype_file: LZMA compressed data mimetype_file: application/x-lzma is_file: yes is_regular: yes diff --git a/tests/data/filetest/archive/test.zip.yml b/tests/data/filetest/archive/test.zip.yml index eb437d2..0b80883 100644 --- a/tests/data/filetest/archive/test.zip.yml +++ b/tests/data/filetest/archive/test.zip.yml @@ -1,4 +1,4 @@ -filetype_file: Zip archive data, at least v1.0 to extract +filetype_file: Zip archive data mimetype_file: application/zip mimetype_python: application/zip is_file: yes diff --git a/tests/data/filetest/binary/jruby_time_zone_TimeOfDay.dat.yml b/tests/data/filetest/binary/jruby_time_zone_TimeOfDay.dat.yml index 387d427..81e8fc0 100644 --- a/tests/data/filetest/binary/jruby_time_zone_TimeOfDay.dat.yml +++ b/tests/data/filetest/binary/jruby_time_zone_TimeOfDay.dat.yml @@ -1,4 +1,4 @@ -filetype_file: Java serialization data, version 5 +filetype_file: Java serialization data mimetype_file: application/octet-stream is_file: yes is_regular: yes diff --git a/tests/data/filetest/binary/windows.dll.yml b/tests/data/filetest/binary/windows.dll.yml index a25f02a..bc82286 100644 --- a/tests/data/filetest/binary/windows.dll.yml +++ b/tests/data/filetest/binary/windows.dll.yml @@ -1,5 +1,5 @@ -filetype_file: PE32+ executable (DLL) x86-64, for MS Windows -mimetype_file: application/x-dosexec +filetype_file: PE32+ executable (DLL) (Control Panel Item) x86-64 +mimetype_file: application/vnd.microsoft.portable-executable mimetype_python: application/x-msdownload is_file: yes is_regular: yes diff --git a/tests/data/filetest/build/Makefile.inc.yml b/tests/data/filetest/build/Makefile.inc.yml index 1687ca0..fc936e0 100644 --- a/tests/data/filetest/build/Makefile.inc.yml +++ b/tests/data/filetest/build/Makefile.inc.yml @@ -1,4 +1,4 @@ -filetype_file: makefile script, ASCII text, with CRLF line terminators +filetype_file: makefile script mimetype_file: text/x-makefile filetype_pygment: PHP is_file: yes diff --git a/tests/data/filetest/build/ar-ER.css.map.yml b/tests/data/filetest/build/ar-ER.css.map.yml index 0a08b75..d64720a 100644 --- a/tests/data/filetest/build/ar-ER.css.map.yml +++ b/tests/data/filetest/build/ar-ER.css.map.yml @@ -1,4 +1,4 @@ -filetype_file: JSON data +filetype_file: JSON text data mimetype_file: application/json is_file: yes is_regular: yes diff --git a/tests/data/filetest/build/ar-ER.js.map.yml b/tests/data/filetest/build/ar-ER.js.map.yml index 0a08b75..d64720a 100644 --- a/tests/data/filetest/build/ar-ER.js.map.yml +++ b/tests/data/filetest/build/ar-ER.js.map.yml @@ -1,4 +1,4 @@ -filetype_file: JSON data +filetype_file: JSON text data mimetype_file: application/json is_file: yes is_regular: yes diff --git a/tests/data/filetest/build/binary.js.map.yml b/tests/data/filetest/build/binary.js.map.yml index 5ff5f00..0343f94 100644 --- a/tests/data/filetest/build/binary.js.map.yml +++ b/tests/data/filetest/build/binary.js.map.yml @@ -1,4 +1,4 @@ -filetype_file: Zip archive data, at least v1.0 to extract +filetype_file: Zip archive data mimetype_file: application/zip is_file: yes is_regular: yes diff --git a/tests/data/filetest/build/build.xml.yml b/tests/data/filetest/build/build.xml.yml index 6cd44e1..337c238 100644 --- a/tests/data/filetest/build/build.xml.yml +++ b/tests/data/filetest/build/build.xml.yml @@ -1,4 +1,4 @@ -filetype_file: exported SGML document, ASCII text, with CRLF line terminators +filetype_file: exported SGML document mimetype_file: text/plain mimetype_python: application/xml is_file: yes diff --git a/tests/data/filetest/build/m/Makefile.yml b/tests/data/filetest/build/m/Makefile.yml index 4bdecb6..94c0752 100644 --- a/tests/data/filetest/build/m/Makefile.yml +++ b/tests/data/filetest/build/m/Makefile.yml @@ -1,4 +1,4 @@ -filetype_file: makefile script, ASCII text, with CRLF line terminators +filetype_file: makefile script mimetype_file: text/x-makefile is_file: yes is_regular: yes diff --git a/tests/data/filetest/build/pom.pom.yml b/tests/data/filetest/build/pom.pom.yml index 8f523fb..b366ff8 100644 --- a/tests/data/filetest/build/pom.pom.yml +++ b/tests/data/filetest/build/pom.pom.yml @@ -1,4 +1,4 @@ -filetype_file: XML 1.0 document, ASCII text +filetype_file: XML 1.0 document mimetype_file: text/xml is_file: yes is_regular: yes diff --git a/tests/data/filetest/build/pom.xml.yml b/tests/data/filetest/build/pom.xml.yml index 1ace2c1..f317f10 100644 --- a/tests/data/filetest/build/pom.xml.yml +++ b/tests/data/filetest/build/pom.xml.yml @@ -1,4 +1,4 @@ -filetype_file: exported SGML document, ASCII text +filetype_file: exported SGML document mimetype_file: text/plain mimetype_python: application/xml is_file: yes diff --git a/tests/data/filetest/certificate/ECLIPSE.RSA.yml b/tests/data/filetest/certificate/ECLIPSE.RSA.yml index 33de057..61ec92d 100644 --- a/tests/data/filetest/certificate/ECLIPSE.RSA.yml +++ b/tests/data/filetest/certificate/ECLIPSE.RSA.yml @@ -1,8 +1,7 @@ -filetype_file: data +filetype_file: DER Encoded PKCS#7 Signed Data mimetype_file: application/octet-stream is_file: yes is_regular: yes size: 3487 is_binary: yes -is_data: yes contains_text: yes diff --git a/tests/data/filetest/code/assembly/bcopy.s.yml b/tests/data/filetest/code/assembly/bcopy.s.yml index 78cd1c8..56ed00e 100644 --- a/tests/data/filetest/code/assembly/bcopy.s.yml +++ b/tests/data/filetest/code/assembly/bcopy.s.yml @@ -1,4 +1,4 @@ -filetype_file: C source, ASCII text, with CRLF line terminators +filetype_file: C source mimetype_file: text/x-c mimetype_python: text/x-asm filetype_pygment: GAS diff --git a/tests/data/filetest/code/c/CcccDevStudioAddIn.rc2.yml b/tests/data/filetest/code/c/CcccDevStudioAddIn.rc2.yml index d759ed0..7cef59b 100644 --- a/tests/data/filetest/code/c/CcccDevStudioAddIn.rc2.yml +++ b/tests/data/filetest/code/c/CcccDevStudioAddIn.rc2.yml @@ -1,10 +1,7 @@ filetype_file: ASCII text mimetype_file: text/plain -filetype_pygment: C -programming_language: C is_file: yes is_regular: yes size: 397 is_text: yes contains_text: yes -is_source: yes diff --git a/tests/data/filetest/code/c/SIMPLE.C.yml b/tests/data/filetest/code/c/SIMPLE.C.yml index 205cf68..7b87c16 100644 --- a/tests/data/filetest/code/c/SIMPLE.C.yml +++ b/tests/data/filetest/code/c/SIMPLE.C.yml @@ -1,4 +1,4 @@ -filetype_file: C source, ASCII text +filetype_file: C source mimetype_file: text/x-c mimetype_python: text/x-c filetype_pygment: C++ diff --git a/tests/data/filetest/code/c/TEST.H.yml b/tests/data/filetest/code/c/TEST.H.yml index a61e07a..bed622d 100644 --- a/tests/data/filetest/code/c/TEST.H.yml +++ b/tests/data/filetest/code/c/TEST.H.yml @@ -1,4 +1,4 @@ -filetype_file: C source, ASCII text +filetype_file: C source mimetype_file: text/x-c mimetype_python: text/x-c filetype_pygment: C++ diff --git a/tests/data/filetest/code/c/TEST_LOWERCASE.h.yml b/tests/data/filetest/code/c/TEST_LOWERCASE.h.yml index acc02cf..0ea285c 100644 --- a/tests/data/filetest/code/c/TEST_LOWERCASE.h.yml +++ b/tests/data/filetest/code/c/TEST_LOWERCASE.h.yml @@ -1,4 +1,4 @@ -filetype_file: C source, ASCII text +filetype_file: C source mimetype_file: text/x-c mimetype_python: text/x-c filetype_pygment: C diff --git a/tests/data/filetest/code/c/cpu.c.yml b/tests/data/filetest/code/c/cpu.c.yml index 49af5e1..0270d57 100644 --- a/tests/data/filetest/code/c/cpu.c.yml +++ b/tests/data/filetest/code/c/cpu.c.yml @@ -1,4 +1,4 @@ -filetype_file: C source, ASCII text +filetype_file: C source mimetype_file: text/x-c mimetype_python: text/x-c filetype_pygment: C diff --git a/tests/data/filetest/code/c/main.c.yml b/tests/data/filetest/code/c/main.c.yml index 6cbdff1..dc8e79e 100644 --- a/tests/data/filetest/code/c/main.c.yml +++ b/tests/data/filetest/code/c/main.c.yml @@ -1,4 +1,4 @@ -filetype_file: C source, ASCII text +filetype_file: C source mimetype_file: text/x-c mimetype_python: text/x-c filetype_pygment: C diff --git a/tests/data/filetest/code/c/mm.c.yml b/tests/data/filetest/code/c/mm.c.yml index ef64034..cce2b5b 100644 --- a/tests/data/filetest/code/c/mm.c.yml +++ b/tests/data/filetest/code/c/mm.c.yml @@ -1,4 +1,4 @@ -filetype_file: C source, ASCII text +filetype_file: C source mimetype_file: text/x-c mimetype_python: text/x-c filetype_pygment: C diff --git a/tests/data/filetest/code/c/pci.c.yml b/tests/data/filetest/code/c/pci.c.yml index 5e52bb6..6646e0c 100644 --- a/tests/data/filetest/code/c/pci.c.yml +++ b/tests/data/filetest/code/c/pci.c.yml @@ -1,4 +1,4 @@ -filetype_file: C source, ASCII text +filetype_file: C source mimetype_file: text/x-c mimetype_python: text/x-c filetype_pygment: C diff --git a/tests/data/filetest/code/c/pci_v3.c.yml b/tests/data/filetest/code/c/pci_v3.c.yml index fbc0bf3..a18f408 100644 --- a/tests/data/filetest/code/c/pci_v3.c.yml +++ b/tests/data/filetest/code/c/pci_v3.c.yml @@ -1,4 +1,4 @@ -filetype_file: C source, ASCII text +filetype_file: C source mimetype_file: text/x-c mimetype_python: text/x-c filetype_pygment: C diff --git a/tests/data/filetest/code/c/resource.h.yml b/tests/data/filetest/code/c/resource.h.yml index 227f489..a070ea6 100644 --- a/tests/data/filetest/code/c/resource.h.yml +++ b/tests/data/filetest/code/c/resource.h.yml @@ -1,4 +1,4 @@ -filetype_file: ASCII text, with CRLF line terminators +filetype_file: ASCII text mimetype_file: text/plain mimetype_python: text/x-c filetype_pygment: C diff --git a/tests/data/filetest/code/cpp/StdAfx.cpp.yml b/tests/data/filetest/code/cpp/StdAfx.cpp.yml index 76123d1..cad69e3 100644 --- a/tests/data/filetest/code/cpp/StdAfx.cpp.yml +++ b/tests/data/filetest/code/cpp/StdAfx.cpp.yml @@ -1,4 +1,4 @@ -filetype_file: C source, ASCII text +filetype_file: C source mimetype_file: text/x-c mimetype_python: text/x-c filetype_pygment: C++ diff --git a/tests/data/filetest/code/cpp/stacktrace.cpp.yml b/tests/data/filetest/code/cpp/stacktrace.cpp.yml index 79ed736..c8e69b5 100644 --- a/tests/data/filetest/code/cpp/stacktrace.cpp.yml +++ b/tests/data/filetest/code/cpp/stacktrace.cpp.yml @@ -1,4 +1,4 @@ -filetype_file: C source, ASCII text +filetype_file: C source mimetype_file: text/x-c mimetype_python: text/x-c filetype_pygment: C++ diff --git a/tests/data/filetest/code/cpp/string.CPP.yml b/tests/data/filetest/code/cpp/string.CPP.yml index 4e9543d..b49e8e1 100644 --- a/tests/data/filetest/code/cpp/string.CPP.yml +++ b/tests/data/filetest/code/cpp/string.CPP.yml @@ -1,4 +1,4 @@ -filetype_file: C++ source, ASCII text +filetype_file: C++ source mimetype_file: text/x-c++ mimetype_python: text/x-c filetype_pygment: C++ diff --git a/tests/data/filetest/code/groff/example.ms.yml b/tests/data/filetest/code/groff/example.ms.yml index 3df2bcf..346a7b9 100644 --- a/tests/data/filetest/code/groff/example.ms.yml +++ b/tests/data/filetest/code/groff/example.ms.yml @@ -1,11 +1,8 @@ -filetype_file: troff or preprocessor input, ASCII text +filetype_file: troff or preprocessor input mimetype_file: text/troff mimetype_python: text/troff -filetype_pygment: -programming_language: is_file: yes is_regular: yes size: 93 is_text: yes contains_text: yes -is_source: yes diff --git a/tests/data/filetest/code/java/Appender.java.yml b/tests/data/filetest/code/java/Appender.java.yml index e398034..6e06323 100644 --- a/tests/data/filetest/code/java/Appender.java.yml +++ b/tests/data/filetest/code/java/Appender.java.yml @@ -1,4 +1,4 @@ -filetype_file: Java source, ASCII text +filetype_file: Java source mimetype_file: text/x-java mimetype_python: text/x-java-source filetype_pygment: Java diff --git a/tests/data/filetest/code/java/CommonViewerSiteFactory.jad.yml b/tests/data/filetest/code/java/CommonViewerSiteFactory.jad.yml index 41f92e8..fe02ddd 100644 --- a/tests/data/filetest/code/java/CommonViewerSiteFactory.jad.yml +++ b/tests/data/filetest/code/java/CommonViewerSiteFactory.jad.yml @@ -1,8 +1,6 @@ -filetype_file: Java source, ASCII text +filetype_file: Java source mimetype_file: text/x-java mimetype_python: text/vnd.sun.j2me.app-descriptor -filetype_pygment: -programming_language: is_file: yes is_regular: yes size: 1447 diff --git a/tests/data/filetest/code/java/Logger.JAVA.yml b/tests/data/filetest/code/java/Logger.JAVA.yml index 1d5db7d..51247ff 100644 --- a/tests/data/filetest/code/java/Logger.JAVA.yml +++ b/tests/data/filetest/code/java/Logger.JAVA.yml @@ -1,4 +1,4 @@ -filetype_file: Java source, ASCII text +filetype_file: Java source mimetype_file: text/x-java mimetype_python: text/x-java-source filetype_pygment: Java @@ -8,4 +8,5 @@ is_regular: yes size: 6800 is_text: yes contains_text: yes +is_java_source: yes is_source: yes diff --git a/tests/data/filetest/code/java/contenttype.java.yml b/tests/data/filetest/code/java/contenttype.java.yml index 862f80c..9329f3f 100644 --- a/tests/data/filetest/code/java/contenttype.java.yml +++ b/tests/data/filetest/code/java/contenttype.java.yml @@ -1,4 +1,4 @@ -filetype_file: Java source, ASCII text +filetype_file: Java source mimetype_file: text/x-java mimetype_python: text/x-java-source filetype_pygment: Java diff --git a/tests/data/filetest/code/js/a.js.yml b/tests/data/filetest/code/js/a.js.yml index b77dfc2..72c0dcb 100644 --- a/tests/data/filetest/code/js/a.js.yml +++ b/tests/data/filetest/code/js/a.js.yml @@ -1,4 +1,4 @@ -filetype_file: ASCII text, with CRLF line terminators +filetype_file: ASCII text mimetype_file: text/plain mimetype_python: application/javascript filetype_pygment: JavaScript diff --git a/tests/data/filetest/code/python/__init__.py.yml b/tests/data/filetest/code/python/__init__.py.yml index bb9f21e..f3d3cc1 100644 --- a/tests/data/filetest/code/python/__init__.py.yml +++ b/tests/data/filetest/code/python/__init__.py.yml @@ -1,4 +1,4 @@ -filetype_file: Python script, ASCII text executable +filetype_file: Python script mimetype_file: text/x-script.python mimetype_python: text/x-python filetype_pygment: Python diff --git a/tests/data/filetest/code/python/contenttype.py.yml b/tests/data/filetest/code/python/contenttype.py.yml index dcc6114..72fe658 100644 --- a/tests/data/filetest/code/python/contenttype.py.yml +++ b/tests/data/filetest/code/python/contenttype.py.yml @@ -1,4 +1,4 @@ -filetype_file: Python script, ASCII text executable +filetype_file: Python script mimetype_file: text/x-script.python mimetype_python: text/x-python filetype_pygment: Python diff --git a/tests/data/filetest/code/scala/Applicative.scala.yml b/tests/data/filetest/code/scala/Applicative.scala.yml index 00951b7..5d1e34e 100644 --- a/tests/data/filetest/code/scala/Applicative.scala.yml +++ b/tests/data/filetest/code/scala/Applicative.scala.yml @@ -1,4 +1,4 @@ -filetype_file: UTF-8 Unicode text +filetype_file: Unicode text mimetype_file: text/plain filetype_pygment: Scala programming_language: Scala diff --git a/tests/data/filetest/compiled/flash/a.swf.yml b/tests/data/filetest/compiled/flash/a.swf.yml index fdcff27..8dd0477 100644 --- a/tests/data/filetest/compiled/flash/a.swf.yml +++ b/tests/data/filetest/compiled/flash/a.swf.yml @@ -1,4 +1,4 @@ -filetype_file: Macromedia Flash data, version 7 +filetype_file: Macromedia Flash data mimetype_file: application/x-shockwave-flash mimetype_python: application/x-shockwave-flash is_file: yes diff --git a/tests/data/filetest/compiled/flash/b.swf.yml b/tests/data/filetest/compiled/flash/b.swf.yml index 95bf14e..530d332 100644 --- a/tests/data/filetest/compiled/flash/b.swf.yml +++ b/tests/data/filetest/compiled/flash/b.swf.yml @@ -1,4 +1,4 @@ -filetype_file: Macromedia Flash data, version 7 +filetype_file: Macromedia Flash data mimetype_file: application/x-shockwave-flash mimetype_python: application/x-shockwave-flash is_file: yes diff --git a/tests/data/filetest/compiled/linux/i686-shash.yml b/tests/data/filetest/compiled/linux/i686-shash.yml index 1c49cc6..e56af34 100644 --- a/tests/data/filetest/compiled/linux/i686-shash.yml +++ b/tests/data/filetest/compiled/linux/i686-shash.yml @@ -1,5 +1,4 @@ -filetype_file: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), dynamically linked, - interpreter /lib/ld-linux.so.2, for GNU/Linux 2.6.4, with debug_info, not stripped +filetype_file: ELF 32-bit LSB executable mimetype_file: application/x-executable elf_type: executable is_file: yes diff --git a/tests/data/filetest/compiled/linux/x86_64-shash.yml b/tests/data/filetest/compiled/linux/x86_64-shash.yml index 012489e..39e5ab7 100644 --- a/tests/data/filetest/compiled/linux/x86_64-shash.yml +++ b/tests/data/filetest/compiled/linux/x86_64-shash.yml @@ -1,5 +1,4 @@ -filetype_file: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked, interpreter - /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.9, not stripped +filetype_file: ELF 64-bit LSB executable mimetype_file: application/x-executable elf_type: executable is_file: yes diff --git a/tests/data/filetest/compiled/win/file.exe.yml b/tests/data/filetest/compiled/win/file.exe.yml index 5bc928f..97eeecb 100644 --- a/tests/data/filetest/compiled/win/file.exe.yml +++ b/tests/data/filetest/compiled/win/file.exe.yml @@ -1,5 +1,5 @@ -filetype_file: PE32 executable (console) Intel 80386 (stripped to external PDB), for MS Windows -mimetype_file: application/x-dosexec +filetype_file: PE32 executable (console) Intel 80386 (stripped to external PDB) +mimetype_file: application/vnd.microsoft.portable-executable mimetype_python: application/x-msdownload is_file: yes is_regular: yes diff --git a/tests/data/filetest/compiled/win/zlib1.dll.yml b/tests/data/filetest/compiled/win/zlib1.dll.yml index 69fb2c0..263b906 100644 --- a/tests/data/filetest/compiled/win/zlib1.dll.yml +++ b/tests/data/filetest/compiled/win/zlib1.dll.yml @@ -1,6 +1,5 @@ -filetype_file: PE32 executable (DLL) (console) Intel 80386 (stripped to external PDB), for MS - Windows -mimetype_file: application/x-dosexec +filetype_file: PE32 executable (DLL) (console) Intel 80386 (stripped to external PDB) +mimetype_file: application/vnd.microsoft.portable-executable mimetype_python: application/x-msdownload is_file: yes is_regular: yes diff --git a/tests/data/filetest/config/config.conf.yml b/tests/data/filetest/config/config.conf.yml index 0cfd5a5..2246fc7 100644 --- a/tests/data/filetest/config/config.conf.yml +++ b/tests/data/filetest/config/config.conf.yml @@ -1,4 +1,4 @@ -filetype_file: ASCII text, with CRLF line terminators +filetype_file: ASCII text mimetype_file: text/plain mimetype_python: text/plain is_file: yes diff --git a/tests/data/filetest/config/wrapper.conf.yml b/tests/data/filetest/config/wrapper.conf.yml index 0cfd5a5..2246fc7 100644 --- a/tests/data/filetest/config/wrapper.conf.yml +++ b/tests/data/filetest/config/wrapper.conf.yml @@ -1,4 +1,4 @@ -filetype_file: ASCII text, with CRLF line terminators +filetype_file: ASCII text mimetype_file: text/plain mimetype_python: text/plain is_file: yes diff --git a/tests/data/filetest/data/mysql-arch.ARZ.yml b/tests/data/filetest/data/mysql-arch.ARZ.yml index ac3ca3f..5716f56 100644 --- a/tests/data/filetest/data/mysql-arch.ARZ.yml +++ b/tests/data/filetest/data/mysql-arch.ARZ.yml @@ -1,4 +1,4 @@ -filetype_file: gzip compressed data, from Unix, original size modulo 2^32 305 +filetype_file: gzip compressed data mimetype_file: application/gzip is_file: yes is_regular: yes diff --git a/tests/data/filetest/data/mysql-arch.yml b/tests/data/filetest/data/mysql-arch.yml index 3edf27d..41afebc 100644 --- a/tests/data/filetest/data/mysql-arch.yml +++ b/tests/data/filetest/data/mysql-arch.yml @@ -1,4 +1,4 @@ -filetype_file: MySQL table definition file Version 224, type DIAM_ISAM, MySQL version -1515870811 +filetype_file: MySQL table definition file Version -32 mimetype_file: application/octet-stream is_file: yes is_regular: yes diff --git a/tests/data/filetest/data/nulls.txt.yml b/tests/data/filetest/data/nulls.txt.yml index 68d8632..75af567 100644 --- a/tests/data/filetest/data/nulls.txt.yml +++ b/tests/data/filetest/data/nulls.txt.yml @@ -1,4 +1,4 @@ -filetype_file: ASCII text, with very long lines, with no line terminators +filetype_file: ASCII text mimetype_file: text/plain mimetype_python: text/plain is_file: yes diff --git a/tests/data/filetest/debug/QTMovieWin.pdb.yml b/tests/data/filetest/debug/QTMovieWin.pdb.yml index 718e117..f57a4b1 100644 --- a/tests/data/filetest/debug/QTMovieWin.pdb.yml +++ b/tests/data/filetest/debug/QTMovieWin.pdb.yml @@ -1,4 +1,4 @@ -filetype_file: MSVC program database ver 7.00, 1024*843 bytes +filetype_file: MSVC program database ver 7.00 mimetype_file: application/x-ms-pdb mimetype_python: application/vnd.palm is_file: yes diff --git a/tests/data/filetest/doc/html/Label.html.yml b/tests/data/filetest/doc/html/Label.html.yml index eca6c3f..fc632eb 100644 --- a/tests/data/filetest/doc/html/Label.html.yml +++ b/tests/data/filetest/doc/html/Label.html.yml @@ -1,4 +1,4 @@ -filetype_file: HTML document, ASCII text, with very long lines +filetype_file: HTML document mimetype_file: text/html mimetype_python: text/html filetype_pygment: HTML diff --git a/tests/data/filetest/doc/html/a.htm.yml b/tests/data/filetest/doc/html/a.htm.yml index dd9eaf1..eb0542b 100644 --- a/tests/data/filetest/doc/html/a.htm.yml +++ b/tests/data/filetest/doc/html/a.htm.yml @@ -1,4 +1,4 @@ -filetype_file: HTML document, ASCII text, with CRLF line terminators +filetype_file: HTML document mimetype_file: text/html mimetype_python: text/html filetype_pygment: HTML diff --git a/tests/data/filetest/doc/html/allclasses-frame.html.yml b/tests/data/filetest/doc/html/allclasses-frame.html.yml index 373c743..298ee70 100644 --- a/tests/data/filetest/doc/html/allclasses-frame.html.yml +++ b/tests/data/filetest/doc/html/allclasses-frame.html.yml @@ -1,4 +1,4 @@ -filetype_file: HTML document, ASCII text +filetype_file: HTML document mimetype_file: text/html mimetype_python: text/html filetype_pygment: HTML diff --git a/tests/data/filetest/doc/html/contenttype.html.yml b/tests/data/filetest/doc/html/contenttype.html.yml index c247a22..b6ba39a 100644 --- a/tests/data/filetest/doc/html/contenttype.html.yml +++ b/tests/data/filetest/doc/html/contenttype.html.yml @@ -1,4 +1,4 @@ -filetype_file: HTML document, ASCII text +filetype_file: HTML document mimetype_file: text/html mimetype_python: text/html filetype_pygment: HTML diff --git a/tests/data/filetest/doc/office/excel.xls.yml b/tests/data/filetest/doc/office/excel.xls.yml index 00c5214..33adc8c 100644 --- a/tests/data/filetest/doc/office/excel.xls.yml +++ b/tests/data/filetest/doc/office/excel.xls.yml @@ -1,7 +1,4 @@ -filetype_file: 'Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.1, - Code page: 1252, Author: pombredanne, Last Saved By: pombredanne, Name of Creating Application: - Microsoft Excel, Create Time/Date: Sun Mar 22 20:33:44 2015, Last Saved Time/Date: Sun Mar - 22 20:34:00 2015, Security: 0' +filetype_file: Composite Document File V2 Document mimetype_file: application/vnd.ms-excel mimetype_python: application/vnd.ms-excel is_file: yes diff --git a/tests/data/filetest/doc/pdf/a.pdf.yml b/tests/data/filetest/doc/pdf/a.pdf.yml index 8ce4b7c..facf2e0 100644 --- a/tests/data/filetest/doc/pdf/a.pdf.yml +++ b/tests/data/filetest/doc/pdf/a.pdf.yml @@ -1,4 +1,4 @@ -filetype_file: PDF document, version 1.2 +filetype_file: PDF document mimetype_file: application/pdf mimetype_python: application/pdf is_file: yes diff --git a/tests/data/filetest/doc/pdf/notpdf.pdf.yml b/tests/data/filetest/doc/pdf/notpdf.pdf.yml index b1b78eb..8a43ab0 100644 --- a/tests/data/filetest/doc/pdf/notpdf.pdf.yml +++ b/tests/data/filetest/doc/pdf/notpdf.pdf.yml @@ -1,5 +1,5 @@ -filetype_file: CSV text -mimetype_file: application/csv +filetype_file: CSV ASCII text +mimetype_file: text/csv mimetype_python: application/pdf is_file: yes is_regular: yes diff --git a/tests/data/filetest/doc/pdf/pdf.pdf.yml b/tests/data/filetest/doc/pdf/pdf.pdf.yml index c5f8f1a..d672e0b 100644 --- a/tests/data/filetest/doc/pdf/pdf.pdf.yml +++ b/tests/data/filetest/doc/pdf/pdf.pdf.yml @@ -1,4 +1,4 @@ -filetype_file: PDF document, version 1.4 +filetype_file: PDF document mimetype_file: application/pdf mimetype_python: application/pdf is_file: yes diff --git a/tests/data/filetest/doc/postscript/a.ps.yml b/tests/data/filetest/doc/postscript/a.ps.yml index 61fa5c4..3c363ef 100644 --- a/tests/data/filetest/doc/postscript/a.ps.yml +++ b/tests/data/filetest/doc/postscript/a.ps.yml @@ -1,4 +1,4 @@ -filetype_file: PostScript document text conforming DSC level 3.0, Level 3 +filetype_file: PostScript document text conforming DSC level 3.0 mimetype_file: application/postscript mimetype_python: application/postscript is_file: yes diff --git a/tests/data/filetest/doc/xml/some.xml.yml b/tests/data/filetest/doc/xml/some.xml.yml index ab14cac..eec0405 100644 --- a/tests/data/filetest/doc/xml/some.xml.yml +++ b/tests/data/filetest/doc/xml/some.xml.yml @@ -1,4 +1,4 @@ -filetype_file: XML 1.0 document, ASCII text, with CRLF line terminators +filetype_file: XML 1.0 document mimetype_file: text/xml mimetype_python: application/xml is_file: yes diff --git a/tests/data/filetest/doc/xml/somespring.xml.yml b/tests/data/filetest/doc/xml/somespring.xml.yml index b0d343f..cce16c1 100644 --- a/tests/data/filetest/doc/xml/somespring.xml.yml +++ b/tests/data/filetest/doc/xml/somespring.xml.yml @@ -1,4 +1,4 @@ -filetype_file: XML xxx document, ASCII text, with CRLF line terminators +filetype_file: XML xxx document mimetype_file: text/xml mimetype_python: application/xml is_file: yes diff --git a/tests/data/filetest/media/Image-ascii.pgm.yml b/tests/data/filetest/media/Image-ascii.pgm.yml index e40165c..2fa008d 100644 --- a/tests/data/filetest/media/Image-ascii.pgm.yml +++ b/tests/data/filetest/media/Image-ascii.pgm.yml @@ -1,5 +1,5 @@ -filetype_file: Netpbm image data, size = 62 x 23, greymap, ASCII text -mimetype_file: image/x-portable-greymap +filetype_file: Netpbm image data +mimetype_file: image/x-portable-graymap mimetype_python: image/x-portable-graymap is_file: yes is_regular: yes diff --git a/tests/data/filetest/media/Image.pgm.yml b/tests/data/filetest/media/Image.pgm.yml index e82c904..d7eeedc 100644 --- a/tests/data/filetest/media/Image.pgm.yml +++ b/tests/data/filetest/media/Image.pgm.yml @@ -1,4 +1,4 @@ -filetype_file: Netpbm image data, size = 62 x 23, rawbits, greymap +filetype_file: Netpbm image data mimetype_file: image/x-portable-greymap mimetype_python: image/x-portable-graymap is_file: yes diff --git a/tests/data/filetest/media/Image1.bmp.yml b/tests/data/filetest/media/Image1.bmp.yml index d3c61bf..1de06b5 100644 --- a/tests/data/filetest/media/Image1.bmp.yml +++ b/tests/data/filetest/media/Image1.bmp.yml @@ -1,5 +1,4 @@ -filetype_file: PC bitmap, Windows 3.x format, 1 x 1 x 1, image size 4, resolution 2834 x 2834 - px/m, 2 important colors, cbSize 66, bits offset 62 +filetype_file: PC bitmap mimetype_file: image/bmp mimetype_python: image/bmp is_file: yes diff --git a/tests/data/filetest/media/Image1.dib.yml b/tests/data/filetest/media/Image1.dib.yml index 4a0f1c7..e1aca10 100644 --- a/tests/data/filetest/media/Image1.dib.yml +++ b/tests/data/filetest/media/Image1.dib.yml @@ -1,5 +1,4 @@ -filetype_file: PC bitmap, Windows 3.x format, 1 x 1 x 1, image size 4, resolution 2834 x 2834 - px/m, 2 important colors, cbSize 66, bits offset 62 +filetype_file: PC bitmap mimetype_file: image/bmp is_file: yes is_regular: yes diff --git a/tests/data/filetest/media/Image1.gif.yml b/tests/data/filetest/media/Image1.gif.yml index d9695a5..1db1141 100644 --- a/tests/data/filetest/media/Image1.gif.yml +++ b/tests/data/filetest/media/Image1.gif.yml @@ -1,4 +1,4 @@ -filetype_file: GIF image data, version 87a, 1 x 1 +filetype_file: GIF image data mimetype_file: image/gif mimetype_python: image/gif is_file: yes diff --git a/tests/data/filetest/media/Image1.ico.yml b/tests/data/filetest/media/Image1.ico.yml index 7c5eeeb..e3769f3 100644 --- a/tests/data/filetest/media/Image1.ico.yml +++ b/tests/data/filetest/media/Image1.ico.yml @@ -1,4 +1,4 @@ -filetype_file: MS Windows icon resource - 1 icon, 1x1, 2 colors +filetype_file: MS Windows icon resource - 1 icon mimetype_file: image/vnd.microsoft.icon mimetype_python: image/x-icon is_file: yes diff --git a/tests/data/filetest/media/Image1.iff.yml b/tests/data/filetest/media/Image1.iff.yml index 8006b7d..b8147ec 100644 --- a/tests/data/filetest/media/Image1.iff.yml +++ b/tests/data/filetest/media/Image1.iff.yml @@ -1,4 +1,4 @@ -filetype_file: IFF data, ILBM interleaved image, 1 x 1 +filetype_file: IFF data mimetype_file: application/octet-stream is_file: yes is_regular: yes diff --git a/tests/data/filetest/media/Image1.jif.yml b/tests/data/filetest/media/Image1.jif.yml index a319b35..26ff080 100644 --- a/tests/data/filetest/media/Image1.jif.yml +++ b/tests/data/filetest/media/Image1.jif.yml @@ -1,5 +1,4 @@ -filetype_file: JPEG image data, JFIF standard 1.01, resolution (DPI), density 72x72, segment - length 16, progressive, precision 8, 1x1, components 1 +filetype_file: JPEG image data mimetype_file: image/jpeg is_file: yes is_regular: yes diff --git a/tests/data/filetest/media/Image1.jpeg.yml b/tests/data/filetest/media/Image1.jpeg.yml index e4e4e22..d48741a 100644 --- a/tests/data/filetest/media/Image1.jpeg.yml +++ b/tests/data/filetest/media/Image1.jpeg.yml @@ -1,5 +1,4 @@ -filetype_file: JPEG image data, JFIF standard 1.01, resolution (DPI), density 72x72, segment - length 16, progressive, precision 8, 1x1, components 1 +filetype_file: JPEG image data mimetype_file: image/jpeg mimetype_python: image/jpeg is_file: yes diff --git a/tests/data/filetest/media/Image1.jpg.yml b/tests/data/filetest/media/Image1.jpg.yml index e4e4e22..d48741a 100644 --- a/tests/data/filetest/media/Image1.jpg.yml +++ b/tests/data/filetest/media/Image1.jpg.yml @@ -1,5 +1,4 @@ -filetype_file: JPEG image data, JFIF standard 1.01, resolution (DPI), density 72x72, segment - length 16, progressive, precision 8, 1x1, components 1 +filetype_file: JPEG image data mimetype_file: image/jpeg mimetype_python: image/jpeg is_file: yes diff --git a/tests/data/filetest/media/Image1.pbm.yml b/tests/data/filetest/media/Image1.pbm.yml index 5af71b0..74fdcfa 100644 --- a/tests/data/filetest/media/Image1.pbm.yml +++ b/tests/data/filetest/media/Image1.pbm.yml @@ -1,4 +1,4 @@ -filetype_file: Netpbm image data, size = 1 x 1, bitmap, ASCII text +filetype_file: Netpbm image data mimetype_file: image/x-portable-bitmap mimetype_python: image/x-portable-bitmap is_file: yes diff --git a/tests/data/filetest/media/Image1.pcx.yml b/tests/data/filetest/media/Image1.pcx.yml index 7f7cc6d..950bb7d 100644 --- a/tests/data/filetest/media/Image1.pcx.yml +++ b/tests/data/filetest/media/Image1.pcx.yml @@ -1,5 +1,4 @@ -filetype_file: PCX ver. 3.0 image data bounding box [0, 0] - [0, 0], 1-bit colour, 72 x 72 dpi, - RLE compressed +filetype_file: PCX ver. 3.0 image data bounding box [0 mimetype_file: image/x-pcx mimetype_python: image/x-pcx is_file: yes diff --git a/tests/data/filetest/media/Image1.ppm.yml b/tests/data/filetest/media/Image1.ppm.yml index de50b7e..8848e20 100644 --- a/tests/data/filetest/media/Image1.ppm.yml +++ b/tests/data/filetest/media/Image1.ppm.yml @@ -1,4 +1,4 @@ -filetype_file: Netpbm image data, size = 1 x 1, pixmap, ASCII text +filetype_file: Netpbm image data mimetype_file: image/x-portable-pixmap mimetype_python: image/x-portable-pixmap is_file: yes diff --git a/tests/data/filetest/media/Image1.psd.yml b/tests/data/filetest/media/Image1.psd.yml index e2e284b..6fba127 100644 --- a/tests/data/filetest/media/Image1.psd.yml +++ b/tests/data/filetest/media/Image1.psd.yml @@ -1,4 +1,4 @@ -filetype_file: Adobe Photoshop Image, 1 x 1, bitmap, 1-bit channel +filetype_file: Adobe Photoshop Image mimetype_file: image/vnd.adobe.photoshop mimetype_python: image/vnd.adobe.photoshop is_file: yes diff --git a/tests/data/filetest/media/Image1.ras.yml b/tests/data/filetest/media/Image1.ras.yml index 9415acf..220cedd 100644 --- a/tests/data/filetest/media/Image1.ras.yml +++ b/tests/data/filetest/media/Image1.ras.yml @@ -1,4 +1,4 @@ -filetype_file: Sun raster image data, 1 x 1, 1-bit, no colormap +filetype_file: Sun raster image data mimetype_file: application/octet-stream mimetype_python: image/x-cmu-raster is_file: yes diff --git a/tests/data/filetest/media/Image1.tga.yml b/tests/data/filetest/media/Image1.tga.yml index 75af116..d6aa4c1 100644 --- a/tests/data/filetest/media/Image1.tga.yml +++ b/tests/data/filetest/media/Image1.tga.yml @@ -1,9 +1,9 @@ -filetype_file: data -mimetype_file: application/octet-stream +filetype_file: Targa image data - RGB - RLE 1 x 1 x 24 - author " " - comment " " 23-2-2010 + 10:24:54 - job " " - Paint Shop Pro 12.80 +mimetype_file: image/x-tga is_file: yes is_regular: yes size: 543 is_binary: yes -is_data: yes is_media: yes is_media_with_meta: yes diff --git a/tests/data/filetest/media/Image1.tif.yml b/tests/data/filetest/media/Image1.tif.yml index 1be33b6..909baa4 100644 --- a/tests/data/filetest/media/Image1.tif.yml +++ b/tests/data/filetest/media/Image1.tif.yml @@ -1,5 +1,4 @@ -filetype_file: TIFF image data, little-endian, direntries=14, height=1, bps=1, compression=LZW, - PhotometricIntepretation=BlackIsZero, width=1 +filetype_file: TIFF image data mimetype_file: image/tiff mimetype_python: image/tiff is_file: yes diff --git a/tests/data/filetest/media/Movie.wmv.yml b/tests/data/filetest/media/Movie.wmv.yml index d4c6128..33ab5b4 100644 --- a/tests/data/filetest/media/Movie.wmv.yml +++ b/tests/data/filetest/media/Movie.wmv.yml @@ -1,8 +1,4 @@ -filetype_file: Microsoft ASF ASF_Extended_Content_Description_Object, Audio Media (Codec Id - 353, Number of channels 1, Samples Per Second 8000, Average Number of Bytes Per Second 1000, - Block Alignment 1048896, Bits Per Sample 10, Error correction type ASF_Audio_Spread), Video - Media (Encoded Image Width 160, Encoded Image Height 120, Image Width 160, Image Height 120, - Bits Per Pixel Count 24, Error correction type ASF_No_Error_Correction) ASF_Stream_Bitrate_Properties_Object +filetype_file: Microsoft ASF ASF_Extended_Content_Description_Object mimetype_file: video/x-ms-asf mimetype_python: video/x-ms-wmv is_file: yes diff --git a/tests/data/filetest/media/Movie_0001.wmv.yml b/tests/data/filetest/media/Movie_0001.wmv.yml index 4dd1eb5..58df249 100644 --- a/tests/data/filetest/media/Movie_0001.wmv.yml +++ b/tests/data/filetest/media/Movie_0001.wmv.yml @@ -1,9 +1,4 @@ -filetype_file: Microsoft ASF ASF_Extended_Content_Description_Object, Audio Media (Codec Id - 353, Number of channels 2, Samples Per Second 44100, Average Number of Bytes Per Second 11112, - Block Alignment 1053035, Bits Per Sample 10, Error correction type ASF_Audio_Spread), Video - Media (Encoded Image Width 320, Encoded Image Height 240, Image Width 320, Image Height 240, - Bits Per Pixel Count 24, Error correction type ASF_No_Error_Correction) ASF_Stream_Bitrate_Properties_Object - ASF_Index_Object ASF_Index_Object +filetype_file: Microsoft ASF ASF_Extended_Content_Description_Object mimetype_file: video/x-ms-asf mimetype_python: video/x-ms-wmv is_file: yes diff --git a/tests/data/filetest/media/Movie_0002.wmv.yml b/tests/data/filetest/media/Movie_0002.wmv.yml index b23d19a..3140d24 100644 --- a/tests/data/filetest/media/Movie_0002.wmv.yml +++ b/tests/data/filetest/media/Movie_0002.wmv.yml @@ -1,8 +1,4 @@ -filetype_file: Microsoft ASF ASF_Extended_Content_Description_Object, Audio Media (Codec Id - 353, Number of channels 2, Samples Per Second 22050, Average Number of Bytes Per Second 4006, - Block Alignment 1049320, Bits Per Sample 10, Error correction type ASF_Audio_Spread), Video - Media (Encoded Image Width 208, Encoded Image Height 160, Image Width 208, Image Height 160, - Bits Per Pixel Count 24, Error correction type ASF_No_Error_Correction) ASF_Stream_Bitrate_Properties_Object +filetype_file: Microsoft ASF ASF_Extended_Content_Description_Object mimetype_file: video/x-ms-asf mimetype_python: video/x-ms-wmv is_file: yes diff --git a/tests/data/filetest/media/TBarLrge.bmp.yml b/tests/data/filetest/media/TBarLrge.bmp.yml index fb8a8d5..b57dfab 100644 --- a/tests/data/filetest/media/TBarLrge.bmp.yml +++ b/tests/data/filetest/media/TBarLrge.bmp.yml @@ -1,5 +1,4 @@ -filetype_file: PC bitmap, Windows 3.x format, 400 x 32 x 4, image size 6400, resolution 4730 - x 4720 px/m, cbSize 6518, bits offset 118 +filetype_file: PC bitmap mimetype_file: image/bmp mimetype_python: image/bmp is_file: yes diff --git a/tests/data/filetest/media/TBarMedm.bmp.yml b/tests/data/filetest/media/TBarMedm.bmp.yml index 23d904e..9e358b5 100644 --- a/tests/data/filetest/media/TBarMedm.bmp.yml +++ b/tests/data/filetest/media/TBarMedm.bmp.yml @@ -1,5 +1,4 @@ -filetype_file: PC bitmap, Windows 3.x format, 210 x 16 x 4, image size 1728, cbSize 1846, bits - offset 118 +filetype_file: PC bitmap mimetype_file: image/bmp mimetype_python: image/bmp is_file: yes diff --git a/tests/data/filetest/media/a.aif.yml b/tests/data/filetest/media/a.aif.yml index 33d115f..bf51260 100644 --- a/tests/data/filetest/media/a.aif.yml +++ b/tests/data/filetest/media/a.aif.yml @@ -1,4 +1,4 @@ -filetype_file: IFF data, AIFF audio +filetype_file: IFF data mimetype_file: audio/x-aiff mimetype_python: audio/x-aiff is_file: yes diff --git a/tests/data/filetest/media/a.aiff.yml b/tests/data/filetest/media/a.aiff.yml index 33d115f..bf51260 100644 --- a/tests/data/filetest/media/a.aiff.yml +++ b/tests/data/filetest/media/a.aiff.yml @@ -1,4 +1,4 @@ -filetype_file: IFF data, AIFF audio +filetype_file: IFF data mimetype_file: audio/x-aiff mimetype_python: audio/x-aiff is_file: yes diff --git a/tests/data/filetest/media/a.au.yml b/tests/data/filetest/media/a.au.yml index b9150c5..bd943f1 100644 --- a/tests/data/filetest/media/a.au.yml +++ b/tests/data/filetest/media/a.au.yml @@ -1,4 +1,4 @@ -filetype_file: 'Sun/NeXT audio data: 16-bit linear PCM, mono, 44100 Hz' +filetype_file: 'Sun/NeXT audio data: 16-bit linear PCM' mimetype_file: audio/basic mimetype_python: audio/basic is_file: yes diff --git a/tests/data/filetest/media/a.avi.yml b/tests/data/filetest/media/a.avi.yml index 24fbfda..12b6ad5 100644 --- a/tests/data/filetest/media/a.avi.yml +++ b/tests/data/filetest/media/a.avi.yml @@ -1,5 +1,4 @@ -filetype_file: Microsoft ASF, Video Media (Encoded Image Width 1680, Encoded Image Height 1050, - Image Width 1680, Image Height 1050, Bits Per Pixel Count 24, Error correction type ASF_No_Error_Correction) +filetype_file: Microsoft ASF mimetype_file: video/x-ms-asf mimetype_python: video/x-msvideo is_file: yes diff --git a/tests/data/filetest/media/a.flac.yml b/tests/data/filetest/media/a.flac.yml index c6aa9ec..7981333 100644 --- a/tests/data/filetest/media/a.flac.yml +++ b/tests/data/filetest/media/a.flac.yml @@ -1,4 +1,4 @@ -filetype_file: FLAC audio bitstream data, 16 bit, mono, 44.1 kHz, 4096 samples +filetype_file: FLAC audio bitstream data mimetype_file: audio/flac is_file: yes is_regular: yes diff --git a/tests/data/filetest/media/a.mp2.yml b/tests/data/filetest/media/a.mp2.yml index dc8e1c2..9880efa 100644 --- a/tests/data/filetest/media/a.mp2.yml +++ b/tests/data/filetest/media/a.mp2.yml @@ -1,4 +1,4 @@ -filetype_file: MPEG ADTS, layer II, v1, 160 kbps, 44.1 kHz, Monaural +filetype_file: MPEG ADTS mimetype_file: audio/mpeg mimetype_python: audio/mpeg is_file: yes diff --git a/tests/data/filetest/media/a.mp3.yml b/tests/data/filetest/media/a.mp3.yml index acac7c3..ac5f1b4 100644 --- a/tests/data/filetest/media/a.mp3.yml +++ b/tests/data/filetest/media/a.mp3.yml @@ -1,4 +1,4 @@ -filetype_file: MPEG ADTS, layer III, v1, 128 kbps, 44.1 kHz, Monaural +filetype_file: MPEG ADTS mimetype_file: audio/mpeg mimetype_python: audio/mpeg is_file: yes diff --git a/tests/data/filetest/media/a.ogg.yml b/tests/data/filetest/media/a.ogg.yml index 0a9bc4d..ac63df7 100644 --- a/tests/data/filetest/media/a.ogg.yml +++ b/tests/data/filetest/media/a.ogg.yml @@ -1,5 +1,4 @@ -filetype_file: 'Ogg data, Vorbis audio, mono, 44100 Hz, ~96000 bps, created by: Xiph.Org libVorbis - I (1.2.0)' +filetype_file: Ogg data mimetype_file: audio/ogg mimetype_python: audio/ogg is_file: yes diff --git a/tests/data/filetest/media/a.pdf.yml b/tests/data/filetest/media/a.pdf.yml index 8ce4b7c..facf2e0 100644 --- a/tests/data/filetest/media/a.pdf.yml +++ b/tests/data/filetest/media/a.pdf.yml @@ -1,4 +1,4 @@ -filetype_file: PDF document, version 1.2 +filetype_file: PDF document mimetype_file: application/pdf mimetype_python: application/pdf is_file: yes diff --git a/tests/data/filetest/media/a.png.yml b/tests/data/filetest/media/a.png.yml index 1afc4da..cb438cd 100644 --- a/tests/data/filetest/media/a.png.yml +++ b/tests/data/filetest/media/a.png.yml @@ -1,4 +1,4 @@ -filetype_file: PNG image data, 1 x 1, 1-bit colormap, non-interlaced +filetype_file: PNG image data mimetype_file: image/png mimetype_python: image/png is_file: yes diff --git a/tests/data/filetest/media/a.theo.ogg.yml b/tests/data/filetest/media/a.theo.ogg.yml index 4eda305..5a1aa20 100644 --- a/tests/data/filetest/media/a.theo.ogg.yml +++ b/tests/data/filetest/media/a.theo.ogg.yml @@ -1,4 +1,4 @@ -filetype_file: Ogg data, Theora video +filetype_file: Ogg data mimetype_file: video/ogg mimetype_python: audio/ogg is_file: yes diff --git a/tests/data/filetest/media/a.wav.yml b/tests/data/filetest/media/a.wav.yml index d057a3e..0c6d47d 100644 --- a/tests/data/filetest/media/a.wav.yml +++ b/tests/data/filetest/media/a.wav.yml @@ -1,4 +1,4 @@ -filetype_file: RIFF (little-endian) data, WAVE audio, Microsoft ADPCM, mono 44100 Hz +filetype_file: RIFF (little-endian) data mimetype_file: audio/x-wav mimetype_python: audio/x-wav is_file: yes diff --git a/tests/data/filetest/media/a4.mp4.yml b/tests/data/filetest/media/a4.mp4.yml index 6433f32..fab2b0b 100644 --- a/tests/data/filetest/media/a4.mp4.yml +++ b/tests/data/filetest/media/a4.mp4.yml @@ -1,4 +1,4 @@ -filetype_file: ISO Media, MP4 Base Media v1 [IS0 14496-12:2003] +filetype_file: ISO Media mimetype_file: video/mp4 mimetype_python: video/mp4 is_file: yes diff --git a/tests/data/filetest/media/a4.mpg.yml b/tests/data/filetest/media/a4.mpg.yml index 06470ba..e619131 100644 --- a/tests/data/filetest/media/a4.mpg.yml +++ b/tests/data/filetest/media/a4.mpg.yml @@ -1,4 +1,4 @@ -filetype_file: ISO Media, MP4 Base Media v1 [IS0 14496-12:2003] +filetype_file: ISO Media mimetype_file: video/mp4 mimetype_python: video/mpeg is_file: yes diff --git a/tests/data/filetest/media/mov.wvm.wmv.yml b/tests/data/filetest/media/mov.wvm.wmv.yml index aee0555..e119265 100644 --- a/tests/data/filetest/media/mov.wvm.wmv.yml +++ b/tests/data/filetest/media/mov.wvm.wmv.yml @@ -1,8 +1,4 @@ -filetype_file: Microsoft ASF ASF_Extended_Content_Description_Object, Audio Media (Codec Id - 353, Number of channels 1, Samples Per Second 8000, Average Number of Bytes Per Second 1000, - Block Alignment 1048896, Bits Per Sample 10, Error correction type ASF_Audio_Spread), Video - Media (Encoded Image Width 160, Encoded Image Height 120, Image Width 160, Image Height 120, - Bits Per Pixel Count 24, Error correction type ASF_No_Error_Correction) ASF_Stream_Bitrate_Properties_Object +filetype_file: Microsoft ASF ASF_Extended_Content_Description_Object mimetype_file: video/x-ms-asf mimetype_python: video/x-ms-wmv is_file: yes diff --git a/tests/data/filetest/package/TicketImport-0.7a-py2.5.egg.yml b/tests/data/filetest/package/TicketImport-0.7a-py2.5.egg.yml index 4b18f4e..8553aca 100644 --- a/tests/data/filetest/package/TicketImport-0.7a-py2.5.egg.yml +++ b/tests/data/filetest/package/TicketImport-0.7a-py2.5.egg.yml @@ -1,4 +1,4 @@ -filetype_file: Zip archive data, at least v2.0 to extract +filetype_file: Zip archive data mimetype_file: application/zip is_file: yes is_regular: yes diff --git a/tests/data/filetest/package/c.war.yml b/tests/data/filetest/package/c.war.yml index d4c4b8e..9bc663c 100644 --- a/tests/data/filetest/package/c.war.yml +++ b/tests/data/filetest/package/c.war.yml @@ -1,4 +1,4 @@ -filetype_file: Zip archive data, at least v1.0 to extract +filetype_file: Zip archive data mimetype_file: application/zip is_file: yes is_regular: yes diff --git a/tests/data/filetest/script/build_w32vc.bat.yml b/tests/data/filetest/script/build_w32vc.bat.yml index 19628c4..f177867 100644 --- a/tests/data/filetest/script/build_w32vc.bat.yml +++ b/tests/data/filetest/script/build_w32vc.bat.yml @@ -1,4 +1,4 @@ -filetype_file: DOS batch file, ASCII text +filetype_file: DOS batch file mimetype_file: text/x-msdos-batch mimetype_python: application/x-msdownload filetype_pygment: Batchfile diff --git a/tests/data/filetest/script/makelinks.yml b/tests/data/filetest/script/makelinks.yml index c83cf24..b531f94 100644 --- a/tests/data/filetest/script/makelinks.yml +++ b/tests/data/filetest/script/makelinks.yml @@ -1,4 +1,4 @@ -filetype_file: POSIX shell script, ASCII text executable, with CRLF line terminators +filetype_file: POSIX shell script mimetype_file: text/x-shellscript filetype_pygment: Bash programming_language: Bash diff --git a/tests/data/filetest/script/test.sh.yml b/tests/data/filetest/script/test.sh.yml index 32ea50f..9dfb4de 100644 --- a/tests/data/filetest/script/test.sh.yml +++ b/tests/data/filetest/script/test.sh.yml @@ -1,4 +1,4 @@ -filetype_file: POSIX shell script, ASCII text executable +filetype_file: POSIX shell script mimetype_file: text/x-shellscript mimetype_python: application/x-sh filetype_pygment: Bash diff --git a/tests/data/filetest/script/zip_src.bat.yml b/tests/data/filetest/script/zip_src.bat.yml index 2fa6f2f..c3205e3 100644 --- a/tests/data/filetest/script/zip_src.bat.yml +++ b/tests/data/filetest/script/zip_src.bat.yml @@ -1,4 +1,4 @@ -filetype_file: ASCII text, with CRLF line terminators +filetype_file: ASCII text mimetype_file: text/plain mimetype_python: application/x-msdownload filetype_pygment: Batchfile diff --git a/tests/data/filetest/test.sh.yml b/tests/data/filetest/test.sh.yml index 32ea50f..9dfb4de 100644 --- a/tests/data/filetest/test.sh.yml +++ b/tests/data/filetest/test.sh.yml @@ -1,4 +1,4 @@ -filetype_file: POSIX shell script, ASCII text executable +filetype_file: POSIX shell script mimetype_file: text/x-shellscript mimetype_python: application/x-sh filetype_pygment: Bash diff --git a/tests/filetype_test_utils.py b/tests/filetype_test_utils.py index 10d3778..965faa6 100644 --- a/tests/filetype_test_utils.py +++ b/tests/filetype_test_utils.py @@ -7,7 +7,6 @@ # See https://aboutcode.org for more information about nexB OSS projects. # -from collections import OrderedDict import io from os import path @@ -112,14 +111,18 @@ def __attrs_post_init__(self, *args, **kwargs): if isinstance(self.size, str): self.size = int(self.size) - def to_dict(self, filter_empty=False, filter_extra=False): + def to_dict(self, filter_empty=False, filter_extra=False, normalize_filetype_file=True): """ Serialize self to an ordered mapping. """ filtered = [field for field in attr.fields(FileTypeTest) if field.name in ('data_file', 'test_file')] fields_filter = attr.filters.exclude(*filtered) - data = attr.asdict(self, filter=fields_filter, dict_factory=OrderedDict) + if normalize_filetype_file: + split_filetype_file = self.filetype_file.split(',') + if split_filetype_file: + self.filetype_file = split_filetype_file[0] + data = attr.asdict(self, filter=fields_filter) data = data.items() if filter_empty: # skip empty fields @@ -127,7 +130,7 @@ def to_dict(self, filter_empty=False, filter_extra=False): if filter_extra: data = ((k, v) for k, v in data if k not in ('expected_failure', 'notes')) - return OrderedDict(data) + return dict(data) def dumps(self): """ diff --git a/tests/test_contenttype.py b/tests/test_contenttype.py index 252e85a..bbab4a3 100644 --- a/tests/test_contenttype.py +++ b/tests/test_contenttype.py @@ -141,6 +141,8 @@ def test_package_json(self): 'ascii text, with very long lines', # libmagic 5.39+ 'json data', + # Apple Silicon Homebrew libmagic + 'json text data', ) assert get_filetype(test_file) in expected @@ -255,6 +257,8 @@ def test_compiled_python_1(self): 'application/octet-stream', # libmagic 5.39 'text/x-bytecode.python', + # Apple Silicon Homebrew libmagic + 'application/x-bytecode.python', ) assert get_mimetype_file(test_file) in expected_mime assert get_filetype_pygment(test_file) == '' @@ -284,17 +288,15 @@ def test_doc_postscript_eps(self): get_filetype_file=get_filetype_file(test_file), get_mimetype_file=get_mimetype_file(test_file), ) - if on_windows: - expected = dict( - get_filetype_file='DOS EPS Binary File Postscript starts at byte 32 length 466 TIFF starts at byte 498 length 11890', - get_mimetype_file='application/octet-stream', - ) - else: - expected = dict( - get_filetype_file='DOS EPS Binary File Postscript starts at byte 32 length 466 TIFF starts at byte 498 length 11890', - get_mimetype_file='image/x-eps', + expected = dict( + get_filetype_file='DOS EPS Binary File', + get_mimetype_file=( + 'application/octet-stream', + 'image/x-eps', ) - assert results == expected + ) + assert expected['get_filetype_file'] in results['get_filetype_file'] + assert results['get_mimetype_file'] in expected['get_mimetype_file'] def test_media_image_img(self): test_file = self.get_test_loc('contenttype/media/Image1.img') @@ -320,6 +322,8 @@ def test_package_debian(self): 'debian binary package (format 2.0), with control.tar.gz, data compression gz', # libmagic 5.2x 'debian binary package (format 2.0)', + # Apple Silicon Homebrew libmagic + 'debian binary package (format 2.0), with control.tar.gz , data compression gz', ) assert get_filetype(test_file) in expected assert is_binary(test_file)