Skip to content

Commit

Permalink
Add extensions from IANA for model/* types
Browse files Browse the repository at this point in the history
  • Loading branch information
dougwilson committed Apr 21, 2019
1 parent 9dee875 commit f3f330b
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 22 deletions.
1 change: 1 addition & 0 deletions HISTORY.md
@@ -1,6 +1,7 @@
unreleased
==========

* Add extensions from IANA for `model/*` types
* Add `text/mdx` with extension `.mdx`

1.39.0 / 2019-04-04
Expand Down
27 changes: 18 additions & 9 deletions db.json
Expand Up @@ -6899,7 +6899,8 @@
"extensions": ["wsc"]
},
"model/3mf": {
"source": "iana"
"source": "iana",
"extensions": ["3mf"]
},
"model/gltf+json": {
"source": "iana",
Expand All @@ -6922,7 +6923,8 @@
"extensions": ["msh","mesh","silo"]
},
"model/stl": {
"source": "iana"
"source": "iana",
"extensions": ["stl"]
},
"model/vnd.collada+xml": {
"source": "iana",
Expand Down Expand Up @@ -6959,23 +6961,28 @@
"extensions": ["mts"]
},
"model/vnd.opengex": {
"source": "iana"
"source": "iana",
"extensions": ["ogex"]
},
"model/vnd.parasolid.transmit.binary": {
"source": "iana"
"source": "iana",
"extensions": ["x_b"]
},
"model/vnd.parasolid.transmit.text": {
"source": "iana"
"source": "iana",
"extensions": ["x_t"]
},
"model/vnd.rosette.annotated-data-model": {
"source": "iana"
},
"model/vnd.usdz+zip": {
"source": "iana",
"compressible": false
"compressible": false,
"extensions": ["usdz"]
},
"model/vnd.valve.source.compiled-map": {
"source": "iana"
"source": "iana",
"extensions": ["bsp"]
},
"model/vnd.vtu": {
"source": "iana",
Expand All @@ -6992,7 +6999,8 @@
"extensions": ["x3db","x3dbz"]
},
"model/x3d+fastinfoset": {
"source": "iana"
"source": "iana",
"extensions": ["x3db"]
},
"model/x3d+vrml": {
"source": "apache",
Expand All @@ -7005,7 +7013,8 @@
"extensions": ["x3d","x3dz"]
},
"model/x3d-vrml": {
"source": "iana"
"source": "iana",
"extensions": ["x3dv"]
},
"multipart/alternative": {
"source": "iana",
Expand Down
4 changes: 2 additions & 2 deletions scripts/fetch-iana.js
Expand Up @@ -12,7 +12,7 @@ var parser = require('csv-parse')
var toArray = require('stream-to-array')
var writedb = require('./lib/write-db')

var extensionsRegExp = /^\s*(?:\d\.\s+)?File extension(?:\(s\)|s|)\s?:\s+(?:\*\.|\.|)([0-9a-z_-]+)\s*(?:\(|$)/im
var extensionsRegExp = /(?:^\s*(?:\d\.\s+)?|\s+3\.\s+)File extension(?:\(s\)|s|)\s?:\s+(?:\*\.|\.|)([0-9a-z_-]+)\s*(?:\(|4\.\s+|$)/im
var extensionsQuotedRegExp = /^\s*(?:\d\.\s+)?File extension(?:\(s\)|s|)\s?:(?:[^'"\r\n]+)(?:"\.?([0-9a-z_-]+)"|'\.?([0-9a-z_-]+)')/im
var intendedUsageRegExp = /^\s*(?:(?:\d{1,2}\.|o)\s+)?Intended\s+Usage\s*:\s*(\S+)/im
var leadingSpacesRegExp = /^\s+/
Expand All @@ -34,7 +34,7 @@ co(function * () {
get('font', { extensions: true }),
get('image', { extensions: true }),
get('message', { extensions: true }),
get('model'),
get('model', { extensions: true }),
get('multipart'),
get('text'),
get('video')
Expand Down
12 changes: 1 addition & 11 deletions src/custom-types.json
Expand Up @@ -639,18 +639,8 @@
"http://en.wikipedia.org/wiki/MIME#Multipart_subtypes"
]
},
"model/gltf+json": {
"extensions": ["gltf"],
"sources": [
"https://github.com/KhronosGroup/glTF/tree/master/specification/2.0"
]
},
"model/gltf-binary": {
"compressible": true,
"extensions": ["glb"],
"sources": [
"https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#glb-file-format-specification"
]
"compressible": true
},
"model/iges": {
"compressible": false
Expand Down
17 changes: 17 additions & 0 deletions src/iana-types.json
Expand Up @@ -8408,17 +8408,20 @@
]
},
"model/3mf": {
"extensions": ["3mf"],
"sources": [
"http://www.3mf.io/specification",
"http://www.iana.org/assignments/media-types/model/3mf"
]
},
"model/gltf+json": {
"extensions": ["gltf"],
"sources": [
"http://www.iana.org/assignments/media-types/model/gltf+json"
]
},
"model/gltf-binary": {
"extensions": ["glb"],
"sources": [
"http://www.iana.org/assignments/media-types/model/gltf-binary"
]
Expand All @@ -8434,16 +8437,19 @@
]
},
"model/stl": {
"extensions": ["stl"],
"sources": [
"http://www.iana.org/assignments/media-types/model/stl"
]
},
"model/vnd.collada+xml": {
"extensions": ["dae"],
"sources": [
"http://www.iana.org/assignments/media-types/model/vnd.collada+xml"
]
},
"model/vnd.dwf": {
"extensions": ["dwf"],
"sources": [
"http://www.iana.org/assignments/media-types/model/vnd.dwf"
]
Expand All @@ -8464,6 +8470,7 @@
]
},
"model/vnd.gtw": {
"extensions": ["gtw"],
"sources": [
"http://www.iana.org/assignments/media-types/model/vnd.gtw"
]
Expand All @@ -8474,21 +8481,25 @@
]
},
"model/vnd.mts": {
"extensions": ["mts"],
"sources": [
"http://www.iana.org/assignments/media-types/model/vnd.mts"
]
},
"model/vnd.opengex": {
"extensions": ["ogex"],
"sources": [
"http://www.iana.org/assignments/media-types/model/vnd.opengex"
]
},
"model/vnd.parasolid.transmit.binary": {
"extensions": ["x_b"],
"sources": [
"http://www.iana.org/assignments/media-types/model/vnd.parasolid.transmit.binary"
]
},
"model/vnd.parasolid.transmit.text": {
"extensions": ["x_t"],
"sources": [
"http://www.iana.org/assignments/media-types/model/vnd.parasolid.transmit.text"
]
Expand All @@ -8499,16 +8510,19 @@
]
},
"model/vnd.usdz+zip": {
"extensions": ["usdz"],
"sources": [
"http://www.iana.org/assignments/media-types/model/vnd.usdz+zip"
]
},
"model/vnd.valve.source.compiled-map": {
"extensions": ["bsp"],
"sources": [
"http://www.iana.org/assignments/media-types/model/vnd.valve.source.compiled-map"
]
},
"model/vnd.vtu": {
"extensions": ["vtu"],
"sources": [
"http://www.iana.org/assignments/media-types/model/vnd.vtu"
]
Expand All @@ -8519,16 +8533,19 @@
]
},
"model/x3d+fastinfoset": {
"extensions": ["x3db"],
"sources": [
"http://www.iana.org/assignments/media-types/model/x3d+fastinfoset"
]
},
"model/x3d+xml": {
"extensions": ["x3d"],
"sources": [
"http://www.iana.org/assignments/media-types/model/x3d+xml"
]
},
"model/x3d-vrml": {
"extensions": ["x3dv"],
"sources": [
"http://www.iana.org/assignments/media-types/model/x3d-vrml"
]
Expand Down

0 comments on commit f3f330b

Please sign in to comment.