Add support for RTF files

hydrus/client/caches/ClientCaches.py

@@ -790,7 +790,7 @@ class ThumbnailCache( object ):
             
             self._special_thumbs = {}
             
-            names = [ 'hydrus', 'pdf', 'psd', 'clip', 'sai', 'krita', 'xcf', 'svg', 'audio', 'video', 'zip', 'epub', 'djvu' ]
+            names = [ 'hydrus', 'pdf', 'psd', 'clip', 'sai', 'krita', 'xcf', 'svg', 'audio', 'video', 'zip', 'epub', 'djvu', 'rtf' ]
             
             bounding_dimensions = self._controller.options[ 'thumbnail_dimensions' ]
             thumbnail_scale_type = self._controller.new_options.GetInteger( 'thumbnail_scale_type' )
@@ -902,6 +902,7 @@ class ThumbnailCache( object ):
             elif mime == HC.APPLICATION_PDF: return self._special_thumbs[ 'pdf' ]
             elif mime == HC.APPLICATION_EPUB: return self._special_thumbs[ 'epub' ]
             elif mime == HC.APPLICATION_DJVU: return self._special_thumbs[ 'djvu' ]
+            elif mime == HC.APPLICATION_RTF: return self._special_thumbs[ 'rtf' ]
             elif mime == HC.APPLICATION_PSD: return self._special_thumbs[ 'psd' ]
             elif mime == HC.APPLICATION_SAI2: return self._special_thumbs[ 'sai' ]
             elif mime == HC.APPLICATION_KRITA: return self._special_thumbs[ 'krita' ]

hydrus/core/HydrusConstants.py

@@ -740,6 +740,7 @@ APPLICATION_EPUB = 71
 APPLICATION_DJVU = 72
 APPLICATION_CBZ = 73
 ANIMATION_UGOIRA = 74
+APPLICATION_RTF = 75
 APPLICATION_OCTET_STREAM = 100
 APPLICATION_UNKNOWN = 101
 
@@ -792,6 +793,7 @@ SEARCHABLE_MIMES = {
     APPLICATION_PDF,
     APPLICATION_EPUB,
     APPLICATION_DJVU,
+    APPLICATION_RTF,
     APPLICATION_ZIP,
     APPLICATION_RAR,
     APPLICATION_7Z,
@@ -886,7 +888,8 @@ APPLICATIONS = [
     APPLICATION_FLASH,
     APPLICATION_PDF,
     APPLICATION_EPUB,
-    APPLICATION_DJVU
+    APPLICATION_DJVU,
+    APPLICATION_RTF
 ]
 
 IMAGE_PROJECT_FILES = [
@@ -1030,6 +1033,8 @@ mime_enum_lookup = {
     'image/vnd.djvu' : APPLICATION_DJVU,
     'image/vnd.djvu+multipage' : APPLICATION_DJVU,
     'image/x-djvu' : APPLICATION_DJVU,
+    'text/rtf' : APPLICATION_RTF,
+    'application/rtf': APPLICATION_RTF,
     'application/vnd.comicbook+zip' : APPLICATION_CBZ,
     'application/zip' : APPLICATION_ZIP,
     'application/vnd.rar' : APPLICATION_RAR,
@@ -1098,6 +1103,7 @@ mime_string_lookup = {
     APPLICATION_PDF : 'pdf',
     APPLICATION_EPUB : 'epub',
     APPLICATION_DJVU : 'djvu',
+    APPLICATION_RTF : 'rtf',
     APPLICATION_PSD : 'psd',
     APPLICATION_CLIP : 'clip',
     APPLICATION_SAI2 : 'sai2',
@@ -1179,6 +1185,7 @@ mime_mimetype_string_lookup = {
     APPLICATION_PDF : 'application/pdf',
     APPLICATION_EPUB : 'application/epub+zip',
     APPLICATION_DJVU : 'image/vnd.djvu',
+    APPLICATION_RTF: 'application/rtf',
     APPLICATION_PSD : 'image/vnd.adobe.photoshop',
     APPLICATION_CLIP : 'application/clip', # made up
     APPLICATION_SAI2: 'application/sai2', # made up
@@ -1258,6 +1265,7 @@ mime_ext_lookup = {
     APPLICATION_PDF : '.pdf',
     APPLICATION_EPUB : '.epub',
     APPLICATION_DJVU : '.djvu',
+    APPLICATION_RTF : '.rtf',
     APPLICATION_PSD : '.psd',
     APPLICATION_CLIP : '.clip',
     APPLICATION_SAI2: '.sai2',

hydrus/core/HydrusFileHandling.py

@@ -593,6 +593,7 @@ headers_and_mime = [
     ( ( ( [38, 42, 58, 63],[ b'application/x-krita'] ), ), HC.APPLICATION_KRITA ), # important this comes before zip files because this is also a zip file
     ( ( ( [38, 43],[ b'application/epub+zip'] ), ), HC.APPLICATION_EPUB ),
     ( ( ( [4], [b'FORM'] ), ( [12], [b'DJVU', b'DJVM', b'PM44', b'BM44', b'SDJV'] ), ), HC.APPLICATION_DJVU ),
+    ( ( ( [0], [b'{\\rtf'] ), ), HC.APPLICATION_RTF ),
     ( ( ( [0], [b'PK\x03\x04', b'PK\x05\x06', b'PK\x07\x08'] ), ), HC.APPLICATION_ZIP ),
     ( ( ( [0], [b'7z\xBC\xAF\x27\x1C'] ), ), HC.APPLICATION_7Z ),
     ( ( ( [0], [b'\x52\x61\x72\x21\x1A\x07\x00', b'\x52\x61\x72\x21\x1A\x07\x01\x00'] ), ), HC.APPLICATION_RAR ),