fix various invalid type entries

dougwilson · dougwilson · commit c6543625d920 · 2014-12-22T15:28:51.000-05:00
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,12 @@
+unreleased
+==========
+
+  * Fix various invalid MIME type entries
+    - `application/mbox+xml`
+    - `application/oscp-response`
+    - `application/vwg-multiplexed`
+    - `audio/g721`
+
 1.4.0 / 2014-12-21
 ==================
 
diff --git a/db.json b/db.json
@@ -547,12 +547,9 @@
     "source": "iana"
   },
   "application/mbox": {
-    "source": "apache",
+    "source": "iana",
     "extensions": ["mbox"]
   },
-  "application/mbox+xml": {
-    "source": "iana"
-  },
   "application/media-policy-dataset+xml": {
     "source": "iana"
   },
@@ -661,7 +658,7 @@
     "source": "iana"
   },
   "application/ocsp-response": {
-    "source": "apache"
+    "source": "iana"
   },
   "application/octet-stream": {
     "source": "iana",
@@ -692,9 +689,6 @@
     "source": "apache",
     "extensions": ["onetoc","onetoc2","onetmp","onepkg"]
   },
-  "application/oscp-response": {
-    "source": "iana"
-  },
   "application/oxps": {
     "source": "iana",
     "extensions": ["oxps"]
@@ -3310,7 +3304,7 @@
     "extensions": ["ptid"]
   },
   "application/vnd.pwg-multiplexed": {
-    "source": "apache"
+    "source": "iana"
   },
   "application/vnd.pwg-xhtml-print+xml": {
     "source": "iana"
@@ -3956,9 +3950,6 @@
   "application/vq-rtcpxr": {
     "source": "iana"
   },
-  "application/vwg-multiplexed": {
-    "source": "iana"
-  },
   "application/watcherinfo+xml": {
     "source": "iana"
   },
@@ -4705,14 +4696,11 @@
   "audio/g719": {
     "source": "iana"
   },
-  "audio/g721": {
-    "source": "iana"
-  },
   "audio/g722": {
     "source": "iana"
   },
   "audio/g7221": {
-    "source": "apache"
+    "source": "iana"
   },
   "audio/g723": {
     "source": "iana"
diff --git a/scripts/types.js b/scripts/types.js
@@ -70,6 +70,11 @@ function addTemplateData(data) {
       console.log('template ' + data.template + ' not found')
       data.template = ref
       res = yield* cogent('http://www.iana.org/assignments/media-types/' + ref)
+
+      // replace the guessed mime
+      if (res.statusCode === 200) {
+        data.mime = data.template
+      }
     }
 
     if (res.statusCode === 404) {
diff --git a/src/iana.json b/src/iana.json
@@ -863,7 +863,7 @@
     "template": "application/mbms-user-service-description+xml",
     "type": "application"
   },
-  "application/mbox+xml": {
+  "application/mbox": {
     "name": "mbox",
     "reference": "[RFC4155]",
     "template": "application/mbox",
@@ -1055,6 +1055,12 @@
     "template": "application/ocsp-request",
     "type": "application"
   },
+  "application/ocsp-response": {
+    "name": "ocsp-response",
+    "reference": "[RFC6960]",
+    "template": "application/ocsp-response",
+    "type": "application"
+  },
   "application/octet-stream": {
     "name": "octet-stream",
     "reference": "[RFC2045][RFC2046]",
@@ -1085,12 +1091,6 @@
     "template": "application/ogg",
     "type": "application"
   },
-  "application/oscp-response": {
-    "name": "ocsp-response",
-    "reference": "[RFC6960]",
-    "template": "application/ocsp-response",
-    "type": "application"
-  },
   "application/oxps": {
     "name": "oxps",
     "reference": "[Ecma_International_Helpdesk]",
@@ -5435,6 +5435,12 @@
     "template": "application/vnd.pvi.ptid1",
     "type": "application"
   },
+  "application/vnd.pwg-multiplexed": {
+    "name": "vnd.pwg-multiplexed",
+    "reference": "[RFC3391]",
+    "template": "application/vnd.pwg-multiplexed",
+    "type": "application"
+  },
   "application/vnd.pwg-xhtml-print+xml": {
     "name": "vnd.pwg-xhtml-print+xml",
     "reference": "[Don_Wright]",
@@ -6431,12 +6437,6 @@
     "template": "application/vq-rtcpxr",
     "type": "application"
   },
-  "application/vwg-multiplexed": {
-    "name": "vnd.pwg-multiplexed",
-    "reference": "[RFC3391]",
-    "template": "application/vnd.pwg-multiplexed",
-    "type": "application"
-  },
   "application/watcherinfo+xml": {
     "name": "watcherinfo+xml",
     "reference": "[RFC3858]",
@@ -6665,6 +6665,12 @@
     "template": "audio/3gpp2",
     "type": "audio"
   },
+  "audio/G7221": {
+    "name": "G7221",
+    "reference": "[RFC5577]",
+    "template": "audio/G7221",
+    "type": "audio"
+  },
   "audio/ac3": {
     "name": "ac3",
     "reference": "[RFC4184]",
@@ -6899,12 +6905,6 @@
     "template": "audio/G719",
     "type": "audio"
   },
-  "audio/g721": {
-    "name": "G7221",
-    "reference": "[RFC5577]",
-    "template": "audio/G7221",
-    "type": "audio"
-  },
   "audio/g722": {
     "name": "G722",
     "reference": "[RFC4856]",
