Switch stat to promises.

Author: RubenVerborgh

lib/handlers/index.js

@@ -12,9 +12,7 @@ function handler (req, res, next) {
   const requestedType = negotiator.mediaType()
   const filename = utils.reqToPath(req)
 
-  ldp.stat(filename, function (err, stats) {
-    if (err) return next()
-
+  ldp.stat(filename).then(stats => {
     if (!stats.isDirectory()) {
       return next()
     }
@@ -37,5 +35,5 @@ function handler (req, res, next) {
       debug('Found an index for current path')
       return next()
     })
-  })
+  }, () => next())
 }

lib/ldp-container.js

@@ -12,21 +12,19 @@ const mime = require('mime-types')
 const path = require('path')
 
 function addContainerStats (ldp, reqUri, filename, resourceGraph, next) {
-  ldp.stat(filename, function (err, containerStats) {
-    if (!err) {
-      addStats(resourceGraph, reqUri, containerStats)
-      resourceGraph.add(
-        resourceGraph.sym(reqUri),
-        ns.rdf('type'),
-        ns.ldp('BasicContainer'))
+  ldp.stat(filename).then(containerStats => {
+    addStats(resourceGraph, reqUri, containerStats)
+    resourceGraph.add(
+      resourceGraph.sym(reqUri),
+      ns.rdf('type'),
+      ns.ldp('BasicContainer'))
 
-      resourceGraph.add(
-        resourceGraph.sym(reqUri),
-        ns.rdf('type'),
-        ns.ldp('Container'))
-    }
+    resourceGraph.add(
+      resourceGraph.sym(reqUri),
+      ns.rdf('type'),
+      ns.ldp('Container'))
     next()
-  })
+  }, () => next())
 }
 
 function addFile (ldp, resourceGraph, containerUri, reqUri, uri, container, file, callback) {
@@ -38,12 +36,7 @@ function addFile (ldp, resourceGraph, containerUri, reqUri, uri, container, file
   const filePath = path.join(container, file)
 
   // Get file stats
-  ldp.stat(filePath, function (err, stats) {
-    if (err) {
-      // File does not exist, skip
-      return callback(null)
-    }
-
+  ldp.stat(filePath).then(stats => {
     let memberUri = reqUri + (stats.isDirectory() ? '/' : '')
     // var fileSubject = file + (stats.isDirectory() ? '/' : '')
     // var fileBaseUri = utils.filenameToBaseUri(fileSubject, uri, root)
@@ -110,7 +103,7 @@ function addFile (ldp, resourceGraph, containerUri, reqUri, uri, container, file
 
       return callback(null)
     })
-  })
+  }, () => callback(null))
 }
 
 function addStats (resourceGraph, reqUri, stats) {
@@ -153,17 +146,13 @@ function readdir (filename, callback) {
 }
 
 function getMetadataGraph (ldp, metaFile, fileBaseUri, callback) {
-  ldp.stat(metaFile, function (err, metaStats) {
-    if (err) {
-      return callback(err)
-    }
-
+  ldp.stat(metaFile).then(metaStats => {
     if (metaStats && metaStats.isFile()) {
       ldp.getGraph(metaFile)
          .then(graph => callback(null, graph),
            err => callback(error(err, 'Can\'t parse container metadata')))
     } else {
       callback(null, $rdf.graph())
     }
-  })
+  }, callback)
 }

lib/ldp.js

@@ -92,12 +92,12 @@ class LDP {
     return this
   }
 
-  stat (file, callback) {
-    fs.stat(file, function (err, stats) {
-      if (err) {
-        return callback(error(err, "Can't read metadata"))
-      }
-      return callback(null, stats)
+  async stat (file, callback) {
+    return new Promise((resolve, reject) => {
+      fs.stat(file, (err, stats) => {
+        if (err) return reject(error(err, "Can't read metadata"))
+        resolve(stats)
+      })
     })
   }
 
@@ -384,12 +384,7 @@ class LDP {
     const root = !ldp.multiuser ? ldp.root : ldp.root + host + '/'
     const filename = utils.uriToFilename(reqPath, root)
 
-    ldp.stat(filename, function (err, stats) {
-      // File does not exist
-      if (err) {
-        return callback(error(err, 'Can\'t find file requested: ' + filename))
-      }
-
+    ldp.stat(filename).then(stats => {
       // Just return, since resource exists
       if (!includeBody) {
         return callback(null, {'stream': stats, 'contentType': contentType, 'container': stats.isDirectory()})
@@ -444,24 +439,24 @@ class LDP {
             return callback(null, {'stream': stream, 'contentType': contentType, 'container': false, 'contentRange': contentRange, 'chunksize': chunksize})
           })
       }
-    })
+    },
+      err => callback(error(err, 'Can\'t find file requested: ' + filename))
+    )
   }
 
   delete (host, resourcePath, callback) {
     const ldp = this
     const root = !ldp.multiuser ? ldp.root : ldp.root + host + '/'
     const filename = utils.uriToFilename(resourcePath, root)
-    ldp.stat(filename, function (err, stats) {
-      if (err) {
-        return callback(error(404, "Can't find " + err))
-      }
-
+    ldp.stat(filename).then(stats => {
       if (stats.isDirectory()) {
         return ldp.deleteContainer(filename, callback)
       } else {
         return ldp.deleteResource(filename, callback)
       }
-    })
+    },
+      err => callback(error(404, "Can't find " + err))
+    )
   }
 
   deleteContainer (directory, callback) {