Merge branch 'master' into master

Author: h2non

.gitignore

@@ -1,205 +1,26 @@
-# https://raw.githubusercontent.com/github/gitignore/master/Global/Archives.gitignore
-
-# It's better to unpack these files and commit the raw source because
-# git has its own built in compression methods.
-*.7z
-*.jar
-*.rar
-*.zip
-*.gz
-*.tgz
-*.bzip
-*.bz2
-*.xz
-*.lzma
-*.cab
-
-# Packing-only formats
-*.iso
-*.tar
-
-# Package management formats
-*.dmg
-*.xpi
-*.gem
-*.egg
-*.deb
-*.rpm
-*.msi
-*.msm
-*.msp
-
-
-# https://raw.githubusercontent.com/github/gitignore/master/Global/Linux.gitignore
-
-*~
-
-# Temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
-
-
-# https://raw.githubusercontent.com/github/gitignore/master/Global/Windows.gitignore
-
-# Windows thumbnail cache files
-Thumbs.db
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-
-# https://raw.githubusercontent.com/github/gitignore/master/Global/macOS.gitignore
-
-*.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-
-# https://raw.githubusercontent.com/github/gitignore/master/Python.gitignore
-
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
 *$py.class
 
-# C extensions
-*.so
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
 
 # Distribution / packaging
 .Python
 build/
 develop-eggs/
 dist/
-downloads/
 eggs/
 .eggs/
-lib/
-lib64/
-parts/
 sdist/
 var/
 wheels/
 *.egg-info/
 .installed.cfg
 *.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-.hypothesis/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# pyenv
-.python-version
-
-# celery beat schedule file
-celerybeat-schedule
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
+docs/

.travis.yml

@@ -2,20 +2,27 @@ language: python
 
 dist: xenial
 
-python:
-  - 2.7
-  - 3.5
-  - 3.6
-  - 3.7
-  - 3.8
+jobs:
+  include:
+    - python: 2.7
+      env: TOXENV=py27
+    - python: 3.5
+      env: TOXENV=py35
+    - python: 3.6
+      env: TOXENV=py36
+    - python: 3.7
+      env: TOXENV=py37
+    - python: 3.8
+      env: TOXENV=py3
+    - python: 3.9
+      env: TOXENV=py39
+    - env: TOXENV=lint
 
 install:
-  - pip install coveralls
-  - pip install -r requirements-dev.txt
+  - pip install tox coveralls
 
 script:
-  - make lint
-  - make test
+  - tox
 
 after_success:
-  coveralls
+  coveralls

README.rst

@@ -62,6 +62,8 @@ Supported types
 Image
 ^^^^^
 
+-  **dwg** - ``image/vnd.dwg``
+-  **xcf** - ``image/x-xcf``
 -  **jpg** - ``image/jpeg``
 -  **jpx** - ``image/jpx``
 -  **png** - ``image/png``
@@ -78,6 +80,7 @@ Image
 Video
 ^^^^^
 
+-  **3gp** - ``video/3gpp``
 -  **mp4** - ``video/mp4``
 -  **m4v** - ``video/x-m4v``
 -  **mkv** - ``video/x-matroska``
@@ -91,6 +94,7 @@ Video
 Audio
 ^^^^^
 
+-  **aac** - ``audio/aac``
 -  **mid** - ``audio/midi``
 -  **mp3** - ``audio/mpeg``
 -  **m4a** - ``audio/m4a``
@@ -102,6 +106,9 @@ Audio
 Archive
 ^^^^^^^
 
+-  **br** - ``application/x-brotli``
+-  **rpm** - ``application/x-rpm``
+-  **dcm** - ``application/dicom``
 -  **epub** - ``application/epub+zip``
 -  **zip** - ``application/zip``
 -  **tar** - ``application/x-tar``
@@ -124,7 +131,9 @@ Archive
 -  **deb** - ``application/x-deb``
 -  **ar** - ``application/x-unix-archive``
 -  **Z** - ``application/x-compress``
+-  **lzo** - ``application/x-lzop``
 -  **lz** - ``application/x-lzip``
+-  **lz4** - ``application/x-lz4``
 
 Font
 ^^^^
@@ -134,6 +143,11 @@ Font
 -  **ttf** - ``application/font-sfnt``
 -  **otf** - ``application/font-sfnt``
 
+Application
+^^^^
+
+-  **wasm** - ``application/wasm``
+
 .. _Python: http://python.org
 .. _magic numbers: https://en.wikipedia.org/wiki/Magic_number_(programming)#Magic_numbers_in_files
 .. _filetype: https://github.com/h2non/filetype

filetype/match.py

@@ -4,6 +4,7 @@
 
 from .types import ARCHIVE as archive_matchers
 from .types import AUDIO as audio_matchers
+from .types import APPLICATION as application_matchers
 from .types import FONT as font_matchers
 from .types import IMAGE as image_matchers
 from .types import VIDEO as video_matchers
@@ -117,3 +118,20 @@ def archive_match(obj):
         TypeError: if obj is not a supported type.
     """
     return match(obj, archive_matchers)
+
+
+def application_match(obj):
+    """
+    Matches the given input againts the available
+    application type matchers.
+
+    Args:
+        obj: path to file, bytes or bytearray.
+
+    Returns:
+        Type instance if matches. Otherwise None.
+
+    Raises:
+        TypeError: if obj is not a supported type.
+    """
+    return match(obj, application_matchers)