Removing magic from optionals, #112

requirements-optional.txt

@@ -1,5 +1,3 @@
-python-magic >= 0.4.12
-pillow
 requests
 Werkzeug
 requests-aws4auth >= 0.9

setup.py

@@ -12,6 +12,7 @@
 dependencies = [
     'sqlalchemy >= 1.1.0b3',
     'pillow',
+    'python-magic >= 0.4.12'
 ]
 
 

sphinx/api.rst

@@ -203,12 +203,6 @@ MagicAnalyzer
 .. autoclass:: MagicAnalyzer
 
 
-WandAnalyzer
-^^^^^^^^^^^^
-
-.. autoclass:: WandAnalyzer
-
-
 Validator
 ^^^^^^^^^
 

sphinx/index.rst

@@ -62,7 +62,7 @@ Overview
  - Limiting file size(min, max), to prevent DOS attacks.
  - Adding timestamp in url to help caching.
  - Auto generating thumbnails, using ``width``, ``height`` and or ``ratio``.
- - Analyzing files & images using ``magic`` and ``wand``.
+ - Analyzing files & images using ``magic`` and ``PIL``.
  - Validating ``mimetype``, ``width``, ``height`` and image ``ratio``.
  - Automatically resize & reformat images before store.
 

sphinx/install.rst

@@ -28,9 +28,11 @@ or
 Optional packages
 -----------------
 
-Some optional packages are required when using some features, such as: ``wand`` and or ``python-magic``.
+Some optional packages are required when using some features, such as: 
+``requests-aws4auth`` and or ``requests-aliyun``.
 
 
 ..  code-block:: console
 
-    $ pip install wand python-magic
+    $ pip install requests-aws4auth
+

sphinx/tutorials/image.rst

@@ -6,12 +6,9 @@ This is how to attach image file to sqlalchemy model using the :class:`.FileSyst
 0. Prerequisites
 ----------------
 
-Thumbnail generation required the ``wand``, and content type detection required ``magic`` package.
-These are optional packages. so you have to install them:
-
 .. code-block:: console
 
-   $ pip install wand python-magic
+   $ pip install sqlalchemy-media
 
 
 1. Creating workbench

sqlalchemy_media/mimetypes_.py

@@ -16,6 +16,23 @@
 """
 
 from os.path import splitext
+import magic
+
+
+# Libmagic
+def magic_mime_from_buffer(buffer: bytes) -> str:
+    """
+    Try to detect mimetype using ``magic`` library.
+
+    .. warning:: :exc:`.OptionalPackageRequirementError` will be raised if
+                 ``python-magic`` is not installed.
+
+    :param buffer: buffer from header of file.
+
+    :return: The mimetype
+    """
+    return magic.from_buffer(buffer, mime=True)
+
 
 
 def guess_extension(mimetype: str) -> str:

sqlalchemy_media/optionals.py

@@ -14,31 +14,6 @@
 from .exceptions import OptionalPackageRequirementError
 
 
-# Libmagic
-
-try:
-    import magic
-except ImportError:  # pragma: no cover
-    magic = None
-
-
-def magic_mime_from_buffer(buffer: bytes) -> str:
-    """
-    Try to detect mimetype using ``magic`` library.
-
-    .. warning:: :exc:`.OptionalPackageRequirementError` will be raised if
-                 ``python-magic`` is not installed.
-
-    :param buffer: buffer from header of file.
-
-    :return: The mimetype
-    """
-
-    if magic is None:  # pragma: no cover
-        raise OptionalPackageRequirementError('python-magic')
-
-    return magic.from_buffer(buffer, mime=True)
-
 
 # requests-aws4auth
 try:

sqlalchemy_media/processors.py

@@ -7,8 +7,7 @@
 from .exceptions import ContentTypeValidationError, DimensionValidationError, \
     AspectRatioValidationError, AnalyzeError
 from .helpers import validate_width_height_ratio, deprecated
-from .mimetypes_ import guess_extension, guess_type
-from .optionals import magic_mime_from_buffer
+from .mimetypes_ import guess_extension, guess_type, magic_mime_from_buffer
 from .typing_ import Dimension