Merge pull request #7289 from owncloud/fix-filetype-icons

Fix filetype icons

2 files changed, 106 insertions, 65 deletions

diff --git a/lib/private/helper.php b/lib/private/helper.php
index e5d1fa9b513..1aab2f296e1 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -152,7 +152,32 @@ class OC_Helper {
 	public static function mimetypeIcon($mimetype) {
 		$alias = array(
 			'application/octet-stream' => 'file', // use file icon as fallback
-			'application/xml' => 'code/xml',
+
+			'application/illustrator' => 'image',
+			'application/coreldraw' => 'image',
+			'application/x-gimp' => 'image',
+			'application/x-photoshop' => 'image',
+
+			'application/x-font-ttf' => 'font',
+			'application/font-woff' => 'font',
+			'application/vnd.ms-fontobject' => 'font',
+
+			'application/json' => 'text/code',
+			'application/x-perl' => 'text/code',
+			'application/x-php' => 'text/code',
+			'text/x-shellscript' => 'text/code',
+			'application/xml' => 'text/html',
+			'text/css' => 'text/code',
+			'application/x-tex' => 'text',
+
+			'application/x-compressed' => 'package/x-generic',
+			'application/x-7z-compressed' => 'package/x-generic',
+			'application/x-deb' => 'package/x-generic',
+			'application/x-gzip' => 'package/x-generic',
+			'application/x-rar-compressed' => 'package/x-generic',
+			'application/x-tar' => 'package/x-generic',
+			'application/zip' => 'package/x-generic',
+
 			'application/msword' => 'x-office/document',
 			'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'x-office/document',
 			'application/vnd.openxmlformats-officedocument.wordprocessingml.template' => 'x-office/document',
@@ -162,6 +187,7 @@ class OC_Helper {
 			'application/vnd.oasis.opendocument.text-template' => 'x-office/document',
 			'application/vnd.oasis.opendocument.text-web' => 'x-office/document',
 			'application/vnd.oasis.opendocument.text-master' => 'x-office/document',
+
 			'application/mspowerpoint' => 'x-office/presentation',
 			'application/vnd.ms-powerpoint' => 'x-office/presentation',
 			'application/vnd.openxmlformats-officedocument.presentationml.presentation' => 'x-office/presentation',
@@ -173,6 +199,7 @@ class OC_Helper {
 			'application/vnd.ms-powerpoint.slideshow.macroEnabled.12' => 'x-office/presentation',
 			'application/vnd.oasis.opendocument.presentation' => 'x-office/presentation',
 			'application/vnd.oasis.opendocument.presentation-template' => 'x-office/presentation',
+
 			'application/msexcel' => 'x-office/spreadsheet',
 			'application/vnd.ms-excel' => 'x-office/spreadsheet',
 			'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'x-office/spreadsheet',
@@ -183,6 +210,8 @@ class OC_Helper {
 			'application/vnd.ms-excel.sheet.binary.macroEnabled.12' => 'x-office/spreadsheet',
 			'application/vnd.oasis.opendocument.spreadsheet' => 'x-office/spreadsheet',
 			'application/vnd.oasis.opendocument.spreadsheet-template' => 'x-office/spreadsheet',
+			'text/csv' => 'x-office/spreadsheet',
+
 			'application/msaccess' => 'database',
 		);
 
diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php
index 174877d623b..9bd07b89023 100644
--- a/lib/private/mimetypes.list.php
+++ b/lib/private/mimetypes.list.php
@@ -24,11 +24,13 @@
  * Array mapping file extensions to mimetypes (in alphabetical order).
  */
 return array(
-	'accdb'=>'application/msaccess',
+	'7z' => 'application/x-7z-compressed',
+	'accdb' => 'application/msaccess',
 	'ai' => 'application/illustrator',
-	'avi'=>'video/x-msvideo',
+	'avi' => 'video/x-msvideo',
 	'bash' => 'text/x-shellscript',
-	'blend'=>'application/x-blender',
+	'blend' => 'application/x-blender',
+	'bin' => 'application/x-bin',
 	'cb7' => 'application/x-cbr',
 	'cba' => 'application/x-cbr',
 	'cbr' => 'application/x-cbr',
@@ -38,81 +40,91 @@ return array(
 	'cc' => 'text/x-c',
 	'cdr' => 'application/coreldraw',
 	'cpp' => 'text/x-c++src',
-	'css'=>'text/css',
+	'css' => 'text/css',
+	'csv' => 'text/csv',
 	'cvbdl' => 'application/x-cbr',
 	'c' => 'text/x-c',
 	'c++' => 'text/x-c++src',
-	'doc'=>'application/msword',
-	'docx'=>'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-	'dot'=>'application/msword',
-	'dotx'=>'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
-	'dv'=>'video/dv',
+	'deb' => 'application/x-deb',
+	'doc' => 'application/msword',
+	'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+	'dot' => 'application/msword',
+	'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+	'dv' => 'video/dv',
+	'eot' => 'application/vnd.ms-fontobject',
 	'epub' => 'application/epub+zip',
-	'exe'=>'application/x-ms-dos-executable',
-	'flac'=>'audio/flac',
-	'gif'=>'image/gif',
-	'gz'=>'application/x-gzip',
-	'gzip'=>'application/x-gzip',
-	'html'=>'text/html',
-	'htm'=>'text/html',
-	'ical'=>'text/calendar',
-	'ics'=>'text/calendar',
+	'exe' => 'application/x-ms-dos-executable',
+	'flac' => 'audio/flac',
+	'gif' => 'image/gif',
+	'gz' => 'application/x-gzip',
+	'gzip' => 'application/x-gzip',
+	'html' => 'text/html',
+	'htm' => 'text/html',
+	'ical' => 'text/calendar',
+	'ics' => 'text/calendar',
 	'impress' => 'text/impress',
-	'jpeg'=>'image/jpeg',
-	'jpg'=>'image/jpeg',
-	'js'=>'application/javascript',
-	'keynote'=>'application/x-iwork-keynote-sffkey',
-	'kra'=>'application/x-krita',
-	'm2t'=>'video/mp2t',
-	'm4v'=>'video/mp4',
+	'jpeg' => 'image/jpeg',
+	'jpg' => 'image/jpeg',
+	'js' => 'application/javascript',
+	'json' => 'application/json',
+	'keynote' => 'application/x-iwork-keynote-sffkey',
+	'kra' => 'application/x-krita',
+	'm2t' => 'video/mp2t',
+	'm4v' => 'video/mp4',
 	'markdown' => 'text/markdown',
 	'mdown' => 'text/markdown',
 	'md' => 'text/markdown',
-	'mdb'=>'application/msaccess',
+	'mdb' => 'application/msaccess',
 	'mdwn' => 'text/markdown',
 	'mobi' => 'application/x-mobipocket-ebook',
-	'mov'=>'video/quicktime',
-	'mp3'=>'audio/mpeg',
-	'mp4'=>'video/mp4',
-	'mpeg'=>'video/mpeg',
-	'mpg'=>'video/mpeg',
-	'msi'=>'application/x-msi',
-	'numbers'=>'application/x-iwork-numbers-sffnumbers',
-	'odg'=>'application/vnd.oasis.opendocument.graphics',
-	'odp'=>'application/vnd.oasis.opendocument.presentation',
-	'ods'=>'application/vnd.oasis.opendocument.spreadsheet',
-	'odt'=>'application/vnd.oasis.opendocument.text',
-	'oga'=>'audio/ogg',
-	'ogg'=>'audio/ogg',
-	'ogv'=>'video/ogg',
-	'pages'=>'application/x-iwork-pages-sffpages',
-	'pdf'=>'application/pdf',
-	'php'=>'application/x-php',
-	'pl'=>'application/x-pearl',
-	'png'=>'image/png',
-	'ppt'=>'application/mspowerpoint',
-	'pptx'=>'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-	'psd'=>'application/x-photoshop',
-	'py'=>'text/x-script.python',
+	'mov' => 'video/quicktime',
+	'mp3' => 'audio/mpeg',
+	'mp4' => 'video/mp4',
+	'mpeg' => 'video/mpeg',
+	'mpg' => 'video/mpeg',
+	'msi' => 'application/x-msi',
+	'numbers' => 'application/x-iwork-numbers-sffnumbers',
+	'odg' => 'application/vnd.oasis.opendocument.graphics',
+	'odp' => 'application/vnd.oasis.opendocument.presentation',
+	'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+	'odt' => 'application/vnd.oasis.opendocument.text',
+	'oga' => 'audio/ogg',
+	'ogg' => 'audio/ogg',
+	'ogv' => 'video/ogg',
+	'otf' => 'font/opentype',
+	'pages' => 'application/x-iwork-pages-sffpages',
+	'pdf' => 'application/pdf',
+	'php' => 'application/x-php',
+	'pl' => 'application/x-perl',
+	'png' => 'image/png',
+	'ppt' => 'application/mspowerpoint',
+	'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+	'psd' => 'application/x-photoshop',
+	'py' => 'text/x-python',
+	'rar' => 'application/x-rar-compressed',
 	'reveal' => 'text/reveal',
 	'sgf' => 'application/sgf',
 	'sh-lib' => 'text/x-shellscript',
 	'sh' => 'text/x-shellscript',
-	'svg'=>'image/svg+xml',
-	'tar'=>'application/x-tar',
-	'tar.gz'=>'application/x-compressed',
-	'tgz'=>'application/x-compressed',
-	'tiff'=>'image/tiff',
-	'tif'=>'image/tiff',
-	'txt'=>'text/plain',
+	'svg' => 'image/svg+xml',
+	'swf' => 'application/x-shockwave-flash',
+	'tar' => 'application/x-tar',
+	'tar.gz' => 'application/x-compressed',
+	'tex' => 'application/x-tex',
+	'tgz' => 'application/x-compressed',
+	'tiff' => 'image/tiff',
+	'tif' => 'image/tiff',
+	'ttf' => 'application/x-font-ttf',
+	'txt' => 'text/plain',
 	'vcard' => 'text/vcard',
 	'vcf' => 'text/vcard',
-	'wav'=>'audio/wav',
-	'webm'=>'video/webm',
-	'wmv'=>'video/x-ms-asf',
-	'xcf'=>'application/x-gimp',
-	'xls'=>'application/msexcel',
-	'xlsx'=>'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-	'xml'=>'application/xml',
-	'zip'=>'application/zip',
+	'wav' => 'audio/wav',
+	'webm' => 'video/webm',
+	'woff' => 'application/font-woff',
+	'wmv' => 'video/x-ms-asf',
+	'xcf' => 'application/x-gimp',
+	'xls' => 'application/msexcel',
+	'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+	'xml' => 'application/xml',
+	'zip' => 'application/zip',
 );