[Checkins] SVN: z3c.filetype/trunk/src/z3c/filetype/ fixed handling of empty results in magic, added avi filetype

Bernd Dorn bernd.dorn at fhv.at
Mon Aug 14 13:23:19 EDT 2006


Log message for revision 69483:
  fixed handling of empty results in magic, added avi filetype

Changed:
  U   z3c.filetype/trunk/src/z3c/filetype/README.txt
  U   z3c.filetype/trunk/src/z3c/filetype/interfaces/filetypes.py
  U   z3c.filetype/trunk/src/z3c/filetype/magic.py
  U   z3c.filetype/trunk/src/z3c/filetype/magic.txt
  A   z3c.filetype/trunk/src/z3c/filetype/testdata/faces_gray.avi

-=-
Modified: z3c.filetype/trunk/src/z3c/filetype/README.txt
===================================================================
--- z3c.filetype/trunk/src/z3c/filetype/README.txt	2006-08-14 16:41:23 UTC (rev 69482)
+++ z3c.filetype/trunk/src/z3c/filetype/README.txt	2006-08-14 17:23:18 UTC (rev 69483)
@@ -24,10 +24,12 @@
   ...     print i
   DS_Store
   set([<InterfaceClass z3c.filetype.interfaces.filetypes.IBinaryFile>])
+  faces_gray.avi
+  set([<InterfaceClass z3c.filetype.interfaces.filetypes.IAVIFile>])
   ftyp.mov
-  set([<InterfaceClass z3c.filetype.interfaces.filetypes.IVideoFile>])
+  set([<InterfaceClass z3c.filetype.interfaces.filetypes.IQuickTimeFile>])
   jumps.mov
-  set([<InterfaceClass z3c.filetype.interfaces.filetypes.IVideoFile>])
+  set([<InterfaceClass z3c.filetype.interfaces.filetypes.IQuickTimeFile>])
   logo.gif
   set([<InterfaceClass z3c.filetype.interfaces.filetypes.IGIFFile>])
   logo.gif.bz2
@@ -173,3 +175,9 @@
   [<InterfaceClass z3c.filetype.interfaces.filetypes.IBinaryFile>]  
 
 
+  >>> foo.data = file(os.path.join(testData,'ftyp.mov'))
+  >>> notify(ObjectModifiedEvent(foo))
+  >>> sorted((interface.directlyProvidedBy(foo)))
+  [<InterfaceClass z3c.filetype.interfaces.filetypes.IQuickTimeFile>]
+  >>> interfaces.IFileType(foo).contentType
+  'video/quicktime'

Modified: z3c.filetype/trunk/src/z3c/filetype/interfaces/filetypes.py
===================================================================
--- z3c.filetype/trunk/src/z3c/filetype/interfaces/filetypes.py	2006-08-14 16:41:23 UTC (rev 69482)
+++ z3c.filetype/trunk/src/z3c/filetype/interfaces/filetypes.py	2006-08-14 17:23:18 UTC (rev 69483)
@@ -58,6 +58,16 @@
     """video file"""
 IVideoFile.setTaggedValue(MTM,re.compile('^video/.+$'))
 
+class IQuickTimeFile(IVideoFile, IBinaryFile):
+    """Quicktime Video File Format"""
+IQuickTimeFile.setTaggedValue(MTM,re.compile('video/quicktime'))
+IQuickTimeFile.setTaggedValue(MT,'video/quicktime')
+
+class IAVIFile(IVideoFile, IBinaryFile):
+    """Quicktime Video File Format"""
+IAVIFile.setTaggedValue(MTM,re.compile('video/x-msvideo'))
+IAVIFile.setTaggedValue(MT,'video/x-msvideo')
+
 class IFLVFile(IVideoFile, IBinaryFile):
     """Macromedia Flash FLV Video File Format"""
 IFLVFile.setTaggedValue(MTM,re.compile('video/x-flv'))

Modified: z3c.filetype/trunk/src/z3c/filetype/magic.py
===================================================================
--- z3c.filetype/trunk/src/z3c/filetype/magic.py	2006-08-14 16:41:23 UTC (rev 69482)
+++ z3c.filetype/trunk/src/z3c/filetype/magic.py	2006-08-14 17:23:18 UTC (rev 69483)
@@ -497,7 +497,7 @@
         answers = set()
         for test in self.tests :
             message = test.run( file )
-            if message :
+            if message and message.strip():
                 self.ack_tests += 1
                 answers.add( message.strip().split()[0] )
             else:

Modified: z3c.filetype/trunk/src/z3c/filetype/magic.txt
===================================================================
--- z3c.filetype/trunk/src/z3c/filetype/magic.txt	2006-08-14 16:41:23 UTC (rev 69482)
+++ z3c.filetype/trunk/src/z3c/filetype/magic.txt	2006-08-14 17:23:18 UTC (rev 69483)
@@ -14,6 +14,7 @@
   ...     path = os.path.join(testData, name)
   ...     print name, m.detect(file(path))
   DS_Store set([])
+  faces_gray.avi set(['video/x-msvideo'])
   ftyp.mov set(['video/quicktime'])
   jumps.mov set(['video/quicktime'])
   logo.gif set(['image/gif'])

Added: z3c.filetype/trunk/src/z3c/filetype/testdata/faces_gray.avi
===================================================================
(Binary files differ)


Property changes on: z3c.filetype/trunk/src/z3c/filetype/testdata/faces_gray.avi
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream



More information about the Checkins mailing list