Merge branch 'KayvanMazaheri-issue_9' into develop

- Add some additional filetypes (issue #9)

pysorter/filetypes.py

@@ -57,6 +57,7 @@ def impossible(match, path):
     (r'\.wma$', 'audio/'),
     (r'\.flac$', 'audio/'),
     (r'\.m4a$', 'audio/'),
+    (r'\.m4p$', 'audio/'),
     (r'\.m4r$', 'audio/'),
     (r'\.mp4$', 'videos/'),
     (r'\.wmv$', 'videos/'),
@@ -66,24 +67,36 @@ def impossible(match, path):
     (r'\.swf$', 'flash/swf/'),
     (r'\.m2ts$', 'videos/'),
     (r'\.m1v$', 'videos/'),
+    (r'\.m2v$', 'videos/'),
+    (r'\.mkv$', 'videos/'),
     (r'\.mov$', 'videos/'),
     (r'\.mp2$', 'videos/'),
     (r'\.mpe$', 'videos/'),
     (r'\.mpg$', 'videos/'),
     (r'\.mpeg$', 'videos/'),
+    (r'\.svi$', 'videos/'),
+    (r'\.vob$', 'videos/'),
+    (r'\.webm$', 'videos/'),
+    (r'\.srt$', 'videos/subtitles/'),
+    (r'\.sub$', 'videos/subtitles/'),
+    (r'\.sbv$', 'videos/subtitles/'),
+    (r'\.ai$', 'images/illustrator/'),
     (r'\.jpeg$', 'images/jpg/'),
     (r'\.jpg$', 'images/jpg/'),
     (r'\.ico$', 'images/icons/'),
     (r'\.gif$', 'images/gif/'),
     (r'\.bmp$', 'images/bitmap/'),
     (r'\.png$', 'images/png/'),
+    (r'\.psd$', 'images/photoshop/'),
     (r'\.svg$', 'images/svg/'),
     (r'\.xcf$', 'images/xcf/'),
     (r'\.tif$', 'images/tif/'),
+    (r'\.webp$', 'images/webp/'),
     (r'\.rtf$', 'documents/writing/'),
     (r'\.nfo$', 'documents/info/'),
     (r'\.diz$', 'documents/info/'),
     (r'\.xls$', 'documents/spreadsheets/'),
+    (r'\.xlr$', 'documents/spreadsheets/'),
     (r'\.xlsx$', 'documents/spreadsheets/'),
     (r'\.ods$', 'documents/spreadsheets/'),
     (r'\.tex$', 'documents/latex/'),
@@ -93,11 +106,13 @@ def impossible(match, path):
     (r'\.wpd$', 'documents/writing/'),
     (r'\.wps$', 'documents/writing/'),
     (r'\.odb$', 'documents/databases/'),
+    (r'\.key$', 'documents/presentations/'),
     (r'\.pps$', 'documents/presentations/'),
     (r'\.ppt$', 'documents/presentations/'),
     (r'\.pptx$', 'documents/presentations/'),
     (r'\.txt$', 'documents/plain_text/'),
     (r'\.pdf$', 'documents/pdf/'),
+    (r'\.xps$', 'documents/xps/'),
     (r'\.msg$', 'documents/email/outlook/'),
     (r'\.msi$', 'installers/microsoft/'),
     (r'\.deb$', 'installers/debian/'),
@@ -126,7 +141,10 @@ def impossible(match, path):
     (r'\.iso$', 'disc_images/iso/'),
     (r'\.xpi$', 'firefox/extensions/'),
     (r'\.jad$', 'javame/jads/'),
-    (r'\.ttf$', 'fonts/true_type/'),
+    (r'\.fnt$', 'fonts/'),
+    (r'\.fon$', 'fonts/'),
+    (r'\.otf$', 'fonts/'),
+    (r'\.ttf$', 'fonts/'),
     (r'\.gmx$', 'games/aoe_saved_games/'),
     (r'\.asb$', 'misc/hymn_assembler/'),
     (r'\.adr$', 'opera/addressbook_backups/'),