Merge pull request #1010 from rubensworks/fix/profile-broken

Fix listings showing extensionless files incorrectly, Closes #1009

Author: kjetilk

lib/ldp-container.js

@@ -13,7 +13,7 @@ const path = require('path')
 
 async function addContainerStats (ldp, reqUri, filename, resourceGraph) {
   const containerStats = await ldp.stat(filename)
-  addStats(resourceGraph, reqUri, containerStats)
+  addStats(resourceGraph, reqUri, containerStats, filename)
   resourceGraph.add(
     resourceGraph.sym(reqUri),
     ns.rdf('type'),
@@ -24,7 +24,7 @@ async function addContainerStats (ldp, reqUri, filename, resourceGraph) {
     ns.ldp('Container'))
 }
 
-async function addFile (ldp, resourceGraph, containerUri, reqUri, uri, container, file) {
+async function addFile (ldp, resourceGraph, containerUri, reqUri, container, file) {
   // Skip .meta and .acl
   if (file.endsWith(ldp.suffixMeta) || file.endsWith(ldp.suffixAcl)) {
     return null
@@ -42,7 +42,7 @@ async function addFile (ldp, resourceGraph, containerUri, reqUri, uri, container
   let memberUri = reqUri + (stats.isDirectory() ? '/' : '')
 
   // Add fileStats to resource Graph
-  addStats(resourceGraph, memberUri, stats)
+  addStats(resourceGraph, memberUri, stats, file)
 
   // Add to `contains` list
   resourceGraph.add(
@@ -106,7 +106,7 @@ async function addFile (ldp, resourceGraph, containerUri, reqUri, uri, container
   return null
 }
 
-function addStats (resourceGraph, reqUri, stats) {
+function addStats (resourceGraph, reqUri, stats, filename) {
   resourceGraph.add(
     resourceGraph.sym(reqUri),
     ns.stat('mtime'),  // Deprecate?
@@ -122,8 +122,8 @@ function addStats (resourceGraph, reqUri, stats) {
     ns.stat('size'),
     stats.size)
 
-  if (mime.lookup(reqUri)) { // Is the file has a well-known type,
-    let type = 'http://www.w3.org/ns/iana/media-types/' + mime.lookup(reqUri) + '#Resource'
+  if (mime.lookup(filename)) { // Is the file has a well-known type,
+    let type = 'http://www.w3.org/ns/iana/media-types/' + mime.lookup(filename) + '#Resource'
     resourceGraph.add(
       resourceGraph.sym(reqUri),
       ns.rdf('type'), // convert MIME type to RDF

lib/ldp.js

@@ -113,7 +113,7 @@ class LDP {
     return this.readResource(url + this.suffixMeta)
   }
 
-  async listContainer (filename, reqUri, uri, containerData, contentType) {
+  async listContainer (filename, reqUri, containerData, hostname) {
     const resourceGraph = $rdf.graph()
 
     try {
@@ -129,9 +129,10 @@ class LDP {
       // read directory
       const files = await ldpContainer.readdir(filename)
       // iterate through all the files
-      await Promise.all(files.map(file => {
-        const fileUri = url.resolve(reqUri, encodeURIComponent(file))
-        return ldpContainer.addFile(this, resourceGraph, reqUri, fileUri, uri, filename, file)
+      await Promise.all(files.map(async file => {
+        const { url: fileUri } = await this.resourceMapper.mapFileToUrl(
+          { path: path.join(filename, file), hostname })
+        return await ldpContainer.addFile(this, resourceGraph, reqUri, fileUri, filename, file)
       }))
     } catch (err) {
       throw error(500, "Can't list container")
@@ -340,7 +341,6 @@ class LDP {
     } catch (err) {
       throw error(404, 'Can\'t find file requested: ' + options)
     }
-    const baseUri = this.resourceMapper.resolveUrl(options.hostname)
 
     // Just return, since resource exists
     if (!options.includeBody) {
@@ -355,7 +355,7 @@ class LDP {
         .catch(() => '') // Default to an empty meta file if it is missing
       let data
       try {
-        data = await this.listContainer(filename, absContainerUri, baseUri, metaFile, contentType)
+        data = await this.listContainer(filename, absContainerUri, metaFile, options.hostname)
       } catch (err) {
         debug.handlers('GET container -- Read error:' + err.message)
         throw err

test/integration/ldp-test.js

@@ -285,18 +285,18 @@ describe('LDP', function () {
         '   dcterms:title "This is a container" ;' +
         '   o:limit 500000.00 .', 'sampleContainer/basicContainerFile.ttl')
 
-      return ldp.listContainer(path.join(__dirname, '../resources/sampleContainer/'), 'https://server.tld/resources/sampleContainer/', 'https://server.tld', '', 'text/turtle')
+      return ldp.listContainer(path.join(__dirname, '../resources/sampleContainer/'), 'https://server.tld/resources/sampleContainer/', '', 'server.tld')
         .then(data => {
           var graph = $rdf.graph()
           $rdf.parse(
             data,
             graph,
-            'https://server.tld/sampleContainer',
+            'https://localhost:8443/resources/sampleContainer',
             'text/turtle')
 
           var basicContainerStatements = graph
             .each(
-              $rdf.sym('https://server.tld/basicContainerFile.ttl'),
+              $rdf.sym('https://localhost:8443/resources/sampleContainer/basicContainerFile.ttl'),
               ns.rdf('type'),
               undefined
             )
@@ -310,7 +310,7 @@ describe('LDP', function () {
 
           var containerStatements = graph
             .each(
-              $rdf.sym('https://server.tld/containerFile.ttl'),
+              $rdf.sym('https://localhost:8443/resources/sampleContainer/containerFile.ttl'),
               ns.rdf('type'),
               undefined
             )
@@ -324,15 +324,18 @@ describe('LDP', function () {
     })
 
     it('should ldp:contains the same files in dir', () => {
-      ldp.listContainer(path.join(__dirname, '../resources/sampleContainer/'), 'https://server.tld/resources/sampleContainer/', 'https://server.tld', '', 'text/turtle')
+      ldp.listContainer(path.join(__dirname, '../resources/sampleContainer/'), 'https://server.tld/resources/sampleContainer/', '', 'server.tld')
         .then(data => {
           fs.readdir(path.join(__dirname, '../resources/sampleContainer/'), function (err, expectedFiles) {
+            // Strip dollar extension
+            expectedFiles = expectedFiles.map(ldp.resourceMapper._removeDollarExtension)
+
             if (err) {
               return Promise.reject(err)
             }
 
             const graph = $rdf.graph()
-            $rdf.parse(data, graph, 'https://server.tld/sampleContainer/', 'text/turtle')
+            $rdf.parse(data, graph, 'https://localhost:8443/resources/sampleContainer/', 'text/turtle')
             const statements = graph.match(null, ns.ldp('contains'), null)
             const files = statements
               .map(s => s.object.value.replace(/.*\//, ''))