Skip to content

Commit 45e3d09

Browse files
author
nicola
committed
simplifying handlers/put writeFile function
1 parent 868ddcf commit 45e3d09

2 files changed

Lines changed: 37 additions & 45 deletions

File tree

‎examples/simple-ldp-server.js‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,27 @@ var app = express()
66

77
// My routes
88
app.get('/', function (req, res) {
9+
console.log(req)
910
res.send('Welcome to my server!')
1011
})
1112

1213
// Mounting ldnode on /ldp
13-
app.use('/ldp', ldnode({
14+
var ldp = ldnode({
1415
uri: 'http://localhost:3000/ldp'
15-
}))
16+
})
17+
var ldp1 = ldnode({
18+
uri: 'http://localhost:3000/ldp/asd'
19+
})
20+
ldp.get('/jj', function (req, res) {
21+
res.send(req.hostname + '\n' + req.baseUrl)
22+
console.log(req.ip)
23+
})
24+
ldp1.get('/jj', function (req, res) {
25+
res.send(req.hostname + '\n' + req.baseUrl)
26+
console.log(req.ip)
27+
})
28+
ldp.use('/asd', ldp1)
29+
app.use('/ldp', ldp)
1630

1731
// Starting server
1832
app.listen(3000, function () {

‎handlers/put.js‎

Lines changed: 21 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33

44
var mime = require('mime');
55
var fs = require('fs');
6-
var fse = require('fs-extra');
6+
var mkdirp = require('fs-extra').mkdirp;
77
var path = require('path');
88
var $rdf = require('rdflib');
9-
var S = require('string');
109

1110
var debug = require('../logging').handlers;
1211
var file = require('../fileStore.js');
@@ -19,53 +18,32 @@ function handler(req, res) {
1918
debug("PUT -- Text length: " + (req.text ? req.text.length : 'undefined'));
2019
res.header('MS-Author-Via' , 'SPARQL' );
2120

22-
var filename = file.uriToFilename(req.path, options.base);
21+
var filePath = file.uriToFilename(req.path, options.base);
2322

2423
// PUT requests not supported on containers. Use POST instead
25-
if (S(filename).endsWith('/')) {
26-
return res.status(409).send("PUT to containers not supported. Use POST method instead");
24+
if (filePath[filePath.length - 1] === '/') {
25+
return res.status(409)
26+
.send("PUT to containers not supported. Use POST method instead");
2727
}
2828

29-
// var ct1 = req.get('content-type');
30-
// var ct2 = mime.lookup(filename);
31-
32-
// if (ct1 && ct2 && (ct1 !== ct2)) {
33-
// debug("PUT -- MIME mismatch. Content-type: " + ct1 +
34-
// ". MIME: " + ct2);
35-
// return res.status(415).send("Content type mismatch with path file.extenstion");
36-
// }
37-
// if (!ct2) {
38-
// return res.status(415).send("Sorry, Filename must have extension for content type");
39-
// }
40-
41-
createDir();
42-
43-
function createDir() {
44-
var directory = path.dirname(filename);
45-
fs.exists(directory, function(exists) {
46-
if (exists) {
47-
writeFile(null);
48-
} else {
49-
fse.mkdirp(directory, writeFile);
50-
}
51-
});
52-
}
29+
writeFile(filePath, req.text, function(err) {
30+
if (err) {
31+
debug("PUT -- Write error: " + err);
32+
return res.status(500).send("Can't write file: "+ err);
33+
}
34+
debug("PUT -- Write Ok. Bytes written: " + req.text.length);
35+
return res.sendStatus(201);
36+
});
37+
}
5338

54-
function writeFile(mkdirErr) {
55-
if (mkdirErr) {
56-
debug("PUT -- Error creating directory: " + mkdirErr);
57-
return res.status(500).send("Can't create directory");
39+
function writeFile (filePath, contents, cb) {
40+
mkdirp(path.dirname(filePath), function (err) {
41+
if (err) {
42+
debug("PUT -- Error creating directory: " + err);
43+
return cb(err);
5844
}
59-
fs.writeFile(filename, req.text, function(err) {
60-
if (err) {
61-
debug("PUT -- Write error: " + err);
62-
return res.status(500).send("Can't write file: "+ err);
63-
} else {
64-
debug("PUT -- Write Ok. Bytes written: " + req.text.length);
65-
return res.sendStatus(201);
66-
}
67-
}); // file write
68-
}
45+
fs.writeFile(filePath, contents, cb);
46+
});
6947
}
7048

7149
exports.handler = handler;

0 commit comments

Comments
 (0)