Version 1.6 (#21)

* Added more Microsoft Office formats (#20)
* Adding support for lz4 and zst

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 python:
     - "2.7"
-    - "3.3"
     - "3.4"
     - "3.5"
     - "3.6"

AUTHORS.rst

@@ -7,3 +7,5 @@ A big thank you to everyone that has helped!
 - Victor Domingos (victordomingos)
 - David Shunfenthal (dshunfen)
 - Andrey Zakharevich (andreyz4k)
+- Sergey Ponomarev (stokito)
+- andrewpmk

CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+Version 1.6
+-----------
+
+- Adding support for LZ4 and ZSTD archives (Thanks to Sergey Ponomarev)
+- Adding support for more office formats (Thanks to andrewpmk)
+
 Version 1.5
 -----------
 

README.rst

@@ -36,7 +36,7 @@ Compatibility
 ~~~~~~~~~~~~~
 
 -  Python 2.7+
--  Python 3.3+
+-  Python 3.4+
 -  Pypy
 
 Using travis-ci to run continuous integration tests on listed platforms.
@@ -141,7 +141,7 @@ https://cgit.freedesktop.org/xdg/shared-mime-info/
 License
 -------
 
-MIT Licenced, see LICENSE, Copyright (c) 2013-2018 Chris Griffith
+MIT Licenced, see LICENSE, Copyright (c) 2013-2019 Chris Griffith
 
 .. |BuildStatus| image:: https://travis-ci.org/cdgriffith/puremagic.png?branch=master
    :target: https://travis-ci.org/cdgriffith/puremagic

puremagic/magic_data.json

@@ -64,6 +64,17 @@
         ["504b0304", 0, ".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "MS Office Open XML Format Document"],
         ["504b0304", 0, ".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation", "MS Office Open XML Format Document"],
         ["504b0304", 0, ".xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "MS Office Open XML Format Document"],
+        ["504b0304", 0, ".xlsb", "application/vnd.ms-excel.sheet.binary.macroenabled.12", "Microsoft Excel - Binary Workbook"],
+        ["504b0304", 0, ".xltm", "application/vnd.ms-excel.template.macroenabled.12", "Microsoft Excel - Macro-Enabled Template File"],
+        ["504b0304", 0, ".xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template", "Microsoft Office - OOXML - Spreadsheet Template"],
+        ["504b0304", 0, ".xlam", "application/vnd.ms-excel.addin.macroenabled.12", "Microsoft Excel - Add-In File"],
+        ["504b0304", 0, ".docm", "application/vnd.ms-word.document.macroEnabled.12", "Microsoft Word - Macro-Enabled Document"],
+        ["504b0304", 0, ".dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template", "Microsoft Office - OOXML - Word Document Template"],
+        ["504b0304", 0, ".dotm", "application/vnd.ms-word.template.macroenabled.12", "Microsoft Word - Macro-Enabled Template"],
+        ["504b0304", 0, ".pptm", "application/vnd.ms-powerpoint.presentation.macroEnabled.12", "Microsoft PowerPoint - Macro-Enabled Presentation File"],
+        ["504b0304", 0, ".potx", "application/vnd.openxmlformats-officedocument.presentationml.template", "Microsoft Office - OOXML - Presentation Template"],
+        ["504b0304", 0, ".potm", "application/vnd.ms-powerpoint.template.macroenabled.12", "Microsoft PowerPoint - Macro-Enabled Template File"],
+        ["504b0304", 0, ".xlsm", "application/vnd.ms-excel.sheet.macroEnabled.12", "Microsoft Excel - Macro-Enabled Workbook"],
         ["7a626578", 0, ".info", "", "ZoomBrowser Image Index"],
         ["425a68", 0, ".tbz2", "", "bzip2 compressed archive"],
         ["ffd8ff", 0, ".jfif", "", "JPEG|EXIF|SPIFF images"],
@@ -1062,6 +1073,12 @@
         ["2320786d6364", 0, "", "text/xmcd", "XMCD CD database"],
         ["4344303031", 32769, ".iso", "application/octet-stream", "ISO-9660 CD Disc Image file"],
         ["4344303031", 34817, ".iso", "application/octet-stream", "ISO-9660 CD Disc Image file"],
-        ["4344303031", 36865, ".iso", "application/octet-stream", "ISO-9660 CD Disc Image file"]
+        ["4344303031", 36865, ".iso", "application/octet-stream", "ISO-9660 CD Disc Image file"],
+        ["28b52ffd", 0, ".zst", "application/zstd", "ZStandard Archive"],
+        ["28b52ffd", 0, ".tzst", "application/x-zstd-compressed-tar", "ZStandard Tar Archive"],
+        ["28b52ffd", 0, ".tar.zst", "application/x-zstd-compressed-tar", "ZStandard Tar Archive"],
+        ["04224d18", 0, ".lz4", "application/x-lz4", "LZ4 Archive"],
+        ["04224d18", 0, ".tlz4", "application/x-lz4-compressed-tar", "LZ4 Tar Archive"],
+        ["04224d18", 0, ".tar.lz4", "application/x-lz4-compressed-tar", "LZ4 Tar Archive"]
     ]
 }

puremagic/main.py

@@ -5,7 +5,7 @@
 magic numbers. It is designed to be minimalistic and inherently cross platform
 compatible, with no imports when used as a module.
 
-© 2013-2018 Chris Griffith - License: MIT (see LICENSE)
+© 2013-2019 Chris Griffith - License: MIT (see LICENSE)
 
 Acknowledgements
 Gary C. Kessler
@@ -19,7 +19,7 @@
 from collections import namedtuple
 
 __author__ = "Chris Griffith"
-__version__ = "1.5"
+__version__ = "1.6"
 __all__ = ['magic_file', 'magic_string', 'from_file', 'from_string',
            'ext_from_filename', 'PureError', 'magic_footer_array',
            'magic_header_array']