Remove utils#uriToFilename

All usages have been refactored to use the ResourceMapper instead.

This also removes the related reqToPath and uriToRelativeFilename
functions.

Author: rubensworks

lib/utils.js

@@ -1,21 +1,17 @@
-module.exports.uriToFilename = uriToFilename
-module.exports.uriToRelativeFilename = uriToRelativeFilename
 module.exports.getBaseUri = getBaseUri
 module.exports.pathBasename = pathBasename
 module.exports.getFullUri = getFullUri
 module.exports.hasSuffix = hasSuffix
 module.exports.serialize = serialize
 module.exports.translate = translate
 module.exports.stringToStream = stringToStream
-module.exports.reqToPath = reqToPath
 module.exports.debrack = debrack
 module.exports.stripLineEndings = stripLineEndings
 module.exports.fullUrlForReq = fullUrlForReq
 module.exports.routeResolvedFile = routeResolvedFile
 module.exports.getQuota = getQuota
 module.exports.overQuota = overQuota
 
-const fs = require('fs-extra')
 const path = require('path')
 const util = require('util')
 const $rdf = require('rdflib')
@@ -73,29 +69,6 @@ function debrack (s) {
   return s.substring(1, s.length - 1)
 }
 
-function uriToFilename (uri, base) {
-  const decoded = uri.split('/').map(decodeURIComponent).join('/')
-  let filename = path.join(base, decoded)
-  // Make sure filename ends with '/'  if filename exists and is a directory.
-  // TODO this sync operation can be avoided and can be left
-  // to do, to other components, see `ldp.get`
-  try {
-    const fileStats = fs.statSync(filename)
-    if (fileStats.isDirectory() && !filename.endsWith('/')) {
-      filename += '/'
-    } else if (fileStats.isFile() && filename.endsWith('/')) {
-      filename = filename.substr(0, filename.length - 1)
-    }
-  } catch (err) {}
-  return filename
-}
-
-function uriToRelativeFilename (uri, base) {
-  const filename = uriToFilename(uri, base)
-  const relative = path.relative(base, filename)
-  return relative
-}
-
 function getBaseUri (req) {
   // Obtain the protocol from the configured server URI
   // (in case the server is running behind a reverse proxy)
@@ -221,12 +194,6 @@ function stripLineEndings (obj) {
   return obj.replace(/(\r\n|\n|\r)/gm, '')
 }
 
-function reqToPath (req) {
-  const ldp = req.app.locals.ldp
-  const root = ldp.multiuser ? ldp.root + req.hostname + '/' : ldp.root
-  return uriToFilename(req.path, root)
-}
-
 /**
  * Adds a route that serves a static file from another Node module
  */

test/unit/utils-test.js

@@ -21,18 +21,6 @@ describe('Utility functions', function () {
     })
   })
 
-  describe('uriToFilename', function () {
-    it('should decode hex-encoded space', function () {
-      assert.equal(utils.uriToFilename('uri%20', 'base/'), 'base/uri ')
-    })
-    it('should decode hex-encoded at sign', function () {
-      assert.equal(utils.uriToFilename('film%4011', 'base/'), 'base/film@11')
-    })
-    it('should decode hex-encoded single quote', function () {
-      assert.equal(utils.uriToFilename('quote%27', 'base/'), 'base/quote\'')
-    })
-  })
-
   describe('stripLineEndings()', () => {
     it('should pass through falsy string arguments', () => {
       assert.equal(utils.stripLineEndings(''), '')