New style MIME typing; maps MIME types to DataTypes and DefIcon format names.

Currently only able to resolve DataTypes to MIME Types.

TODO:
- DT MIME type guessing needs mostly removing (only use if no matches in mimetypes
file)
- Migrate the rest of filetype.c to the new format (can filetype using icon.library
and reverse lookup MIME type, for example)
- Use to distinguish between CONTENT_IMAGE types
- Simplify so DefIcon type defaults to lowercase DataType name

svn path=/trunk/netsurf/; revision=12360

2 files changed, 69 insertions, 72 deletions

diff --git a/amiga/resources/MIME/dt.picture b/amiga/resources/MIME/dt.picture
deleted file mode 100644
index 5292f5381..000000000
--- a/amiga/resources/MIME/dt.picture
+++ /dev/null
@@ -1,66 +0,0 @@
-# This file contains a list of MIME types that can be handled by
-# picture class datatypes (subclasses of picture.datatype)
-#
-# It does not matter if this file contains MIME Types for formats
-# that a DataType is not installed for, unless a different
-# subclass handles this type.
-
-# BMP
-application/bmp
-application/preview
-application/x-bmp
-application/x-win-bitmap
-image/bmp
-image/ms-bmp
-image/x-bitmap
-image/x-bmp
-image/x-ms-bmp
-image/x-win-bitmap
-image/x-windows-bmp
-image/x-xbitmap
-
-# GIF
-# Expect this to cause problems with GIF anims if GIFANIM datatype installed
-image/gif
-
-# ICO
-application/ico
-application/x-ico
-image/ico
-image/vnd.microsoft.icon
-image/x-icon
-
-# .info
-image/x-amiga-icon
-
-# JNG
-image/jng
-image/x-jng
-
-# JPEG
-image/jpeg
-image/jpg
-image/pjpeg
-
-# JPEG2000
-image/jp2
-image/jpeg2000
-
-# MNG
-image/mng
-image/x-mng
-video/mng
-video/x-mng
-
-# PNG
-image/png
-
-# RISC OS Sprite
-image/x-riscos-sprite
-
-# SVG
-image/svg
-image/svg+xml
-
-# WebP
-image/webp
diff --git a/amiga/resources/mimetypes b/amiga/resources/mimetypes
index 8f9c0b3e0..800f422b6 100644
--- a/amiga/resources/mimetypes
+++ b/amiga/resources/mimetypes
@@ -1,7 +1,70 @@
-; mimetypes
-; this file is parsed using readargs
+; This file contains a list of MIME types that can be handled by NetSurf,
+; mapping them to DataType and DefIcons format names.
+; It is parsed by ReadArgs with the following template:
+; MIMETYPE/A,DT=DATATYPE/K,TYPE=DEFICON/K,CMD=PLUGINCMD/K
+
+; BMP
+application/bmp            DT=BMP      TYPE=bmp
+application/preview        DT=BMP      TYPE=bmp
+application/x-bmp          DT=BMP      TYPE=bmp
+application/x-win-bitmap   DT=BMP      TYPE=bmp
+image/bmp                  DT=BMP      TYPE=bmp
+image/ms-bmp               DT=BMP      TYPE=bmp
+image/x-bitmap             DT=BMP      TYPE=bmp
+image/x-bmp                DT=BMP      TYPE=bmp
+image/x-ms-bmp             DT=BMP      TYPE=bmp
+image/x-win-bitmap         DT=BMP      TYPE=bmp
+image/x-windows-bmp        DT=BMP      TYPE=bmp
+image/x-xbitmap            DT=BMP      TYPE=bmp
+
+; GIF
+; Expect problems with GIF anims if GIFANIM datatype installed
+image/gif                  DT=GIF      TYPE=gif
+;image/gif                  DT=GIFANIM  TYPE=gif
+
+; ICO
+application/ico            DT=ICO      TYPE=ico
+application/x-ico          DT=ICO      TYPE=ico
+image/ico                  DT=ICO      TYPE=ico
+image/vnd.microsoft.icon   DT=ICO      TYPE=ico
+image/x-icon               DT=ICO      TYPE=ico
+
+; .info
+image/x-amiga-icon         DT=INFO
+
+; JNG
+image/jng                  DT=JNG      TYPE=jng
+image/x-jng                DT=JNG      TYPE=jng
+
+; JPEG
+image/jpeg                 DT=JPEG     TYPE=jpeg
+image/jpg                  DT=JPEG     TYPE=jpeg
+image/pjpeg                DT=JPEG     TYPE=jpeg
+
+; JPEG2000
+image/jp2                  DT=JP2      TYPE=jp2
+image/jpeg2000             DT=JP2      TYPE=jp2
+
+; MNG
+image/mng                  DT=MNG      TYPE=mng
+image/x-mng                DT=MNG      TYPE=mng
+video/mng                  DT=MNG      TYPE=mng
+video/x-mng                DT=MNG      TYPE=mng
+
+; PNG
+image/png                  DT=PNG      TYPE=png
+
+; RISC OS Sprite
+image/x-riscos-sprite      DT=Sprite   TYPE=rosprite
+
+; SVG
+image/svg                  DT=SVG      TYPE=svg
+image/svg+xml              DT=SVG      TYPE=svg
+
+; WebP
+image/webp                 DT=WebP     TYPE=webp
+
 ;
-image/mng   DTPICTURE
-image/x-mng DTPICTURE
-video/mng   DTPICTURE
-video/x-mng DTPICTURE
+; Experimental
+;
+application/x-shockwave-flash   CMD=gnash:aos4-gnash