0001-models-handle-ENOENT-from-file-magic-22745.patch

Benjamin Dauvergne, 23 mars 2018 14:21

Voir les différences: en ligne côte à côte

Subject: [PATCH] models: handle ENOENT from file-magic (#22745)

magic.Magic.file() does not return None or raise an exception on a
missing file, it just return the string "cannot open ...".

 fargo/fargo/models.py | 12 ++----------
 fargo/fargo/utils.py  | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 10 deletions(-)

     import re
     import threading
     try:
         import magic
     except ImportError:
         magic = None
     from django.conf import settings
     from django.core.urlresolvers import reverse
     from django.db import models
-...
             '''Create content_hash if new'''
             if not self.content_hash:
                 self.content_hash = utils.sha256_of_file(self.content)
             if magic is not None:
                 magic_object = magic.open(magic.MIME)
                 magic_object.load()
                 self.mime_type = magic_object.file(str(self.content.file.name)).split(';')[0]
                 magic_object.close()
             if not self.mime_type:
                 self.mime_type = utils.get_mime_type(self.content.file.name) or ''
             super(Document, self).save(*args, **kwargs)
         @property

     import hashlib
     from django.utils.timezone import utc
     from django.utils.encoding import smart_bytes
     try:
         import magic
     except ImportError:
         magic = None
     def to_isodate(dt):
-...
         for chunk in f.chunks():
             hasher.update(chunk)
         return hasher.hexdigest()
     def get_mime_type(path):
         if magic is None:
             raise Exception
             return None
         magic_object = magic.open(magic.MIME)
         magic_object.load()
         mime_type = magic_object.file(smart_bytes(path))
         magic_object.close()
         if mime_type:
             mime_type = mime_type.split(';')[0]
             if mime_type.startswith('cannot open'):
                 mime_type = None
         return mime_type
+    -

Produits Entr'ouvert » Fargo