Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not append an identical file extension #1328

Closed
wants to merge 2 commits into from
Closed

Do not append an identical file extension #1328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0314a1
Add failing test for .mp3 extension.
bourgeoa Oct 23, 2019
b00b158
Only add extension if it changes the content type.
RubenVerborgh Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions lib/resource-mapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ResourceMapper {
this._defaultContentType = defaultContentType
this._types = { ...types, ...overrideTypes }
this._indexFilename = indexFilename
this._indexContentType = this._getContentTypeByExtension(indexFilename)
this._indexContentType = this._getContentTypeFromExtension(indexFilename)

// If the host needs to be replaced on every call, pre-split the root URL
if (includeHost) {
Expand Down Expand Up @@ -79,7 +79,7 @@ class ResourceMapper {
// Determine the URL by chopping off everything after the dollar sign
const pathname = this._removeDollarExtension(path)
const url = `${this.resolveUrl(hostname)}${encodeURI(pathname)}`
return { url, contentType: this._getContentTypeByExtension(path) }
return { url, contentType: this._getContentTypeFromExtension(path) }
}

// Maps the request for a given resource and representation format to a server file
Expand All @@ -94,7 +94,7 @@ class ResourceMapper {
let isFolder = filePath.endsWith('/')
let isIndex = searchIndex && filePath.endsWith('/')

// Create the path for a new ressource
// Create the path for a new resource
let path
if (createIfNotExists) {
path = filePath
Expand All @@ -106,8 +106,8 @@ class ResourceMapper {
path += this._indexFilename
}
// If the extension is not correct for the content type, append the correct extension
if (!isFolder && this._getContentTypeByExtension(path) !== contentType) {
path += `$${contentType in extensions ? `.${extensions[contentType][0]}` : '.unknown'}`
if (!isFolder) {
path = this._addContentTypeExtension(path, contentType)
}
// Determine the path of an existing file
} else {
Expand Down Expand Up @@ -136,7 +136,7 @@ class ResourceMapper {
}
}
path = `${folder}${match}`
contentType = this._getContentTypeByExtension(match)
contentType = this._getContentTypeFromExtension(match)
}
return { path, contentType: contentType || this._defaultContentType }
}
Expand All @@ -157,11 +157,25 @@ class ResourceMapper {
}

// Gets the expected content type based on the extension of the path
_getContentTypeByExtension (path) {
_getContentTypeFromExtension (path) {
const extension = /\.([^/.]+)$/.exec(path)
return extension && this._types[extension[1].toLowerCase()] || this._defaultContentType
}

// Appends an extension for the specific content type, if needed
_addContentTypeExtension (path, contentType) {
// If we would guess the wrong content type from the extension, try appending a better one
const contentTypeFromExtension = this._getContentTypeFromExtension(path)
if (contentTypeFromExtension !== contentType) {
// Some extensions fit multiple content types, so only switch if there's an improvement
const newExtension = contentType in extensions ? extensions[contentType][0] : 'unknown'
if (this._types[newExtension] !== contentTypeFromExtension) {
path += `$.${newExtension}`
}
}
return path
}

// Removes possible trailing slashes from a path
_removeTrailingSlash (path) {
return path.replace(/\/+$/, '')
Expand Down
11 changes: 11 additions & 0 deletions test/unit/resource-mapper-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,17 @@ describe('ResourceMapper', () => {
contentType: 'text/n3'
})

itMapsUrl(mapper, 'a URL with a file extension having more than one possible content type',
{
url: 'http://localhost/space/foo.mp3',
contentType: 'audio/mp3',
createIfNotExists: true
},
{
path: `${rootPath}space/foo.mp3`,
contentType: 'audio/mp3'
})

// GET/HEAD/POST/DELETE/PATCH base cases

itMapsUrl(mapper, 'a URL of a non-existing file',
Expand Down