aboutcode-org · JonoYang · May 15, 2024 · May 16, 2024 · May 16, 2024 · May 16, 2024
diff --git a/.github/workflows/test-ci-mac.yml b/.github/workflows/test-ci-mac.yml
@@ -0,0 +1,35 @@
+name: Test CI Mac
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: macos-latest
+
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: ["3.10", "3.11"]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install system dependencies
+        run: |
+          brew update
+          brew install p7zip libarchive libmagic
+
+      - name: Set up venv
+        run: |
+          python3 -m venv venv
+          source venv/bin/activate
+          pip install -e .[system_provided,testing]
+
+      - name: Run tests
+        run: venv/bin/pytest -n 3 -vvs .
diff --git a/setup.cfg b/setup.cfg
@@ -68,6 +68,9 @@ where = src
 full =
     typecode_libmagic >= 5.39.210223
 
+system_provided =
+    typecode_libmagic_system_provided >= 32.0.0
+
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-filetype_file: PE32+ executable (DLL) x86-64, for MS Windows
+filetype_file: PE32+
 mimetype_file: application/x-dosexec
 mimetype_python: application/x-msdownload
 is_file: yes

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-filetype_file: UTF-8 Unicode text
+filetype_file: UTF-8
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-filetype_file: PE32 executable (console) Intel 80386 (stripped to external PDB), for MS Windows
+filetype_file: PE32
 mimetype_file: application/x-dosexec
 mimetype_python: application/x-msdownload
 is_file: yes

diff --git a/tests/data/filetest/compiled/win/zlib1.dll.yml b/tests/data/filetest/compiled/win/zlib1.dll.yml
@@ -1,5 +1,4 @@
-filetype_file: PE32 executable (DLL) (console) Intel 80386 (stripped to external PDB), for MS
-  Windows
+filetype_file: PE32
 mimetype_file: application/x-dosexec
 mimetype_python: application/x-msdownload
 is_file: yes

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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