Skip to content

Commit fdb3690

Browse files
author
nicola
committed
Improved directory listing and add its test
1 parent 4a14ef1 commit fdb3690

3 files changed

Lines changed: 205 additions & 149 deletions

File tree

‎lib/handlers/get.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function get(req, res, includeBody) {
7676

7777

7878
if (err) {
79-
debug('GET/HEAD -- Read error: ' + err);
79+
debug('GET/HEAD -- Read error: ' + err.status + ' ' + err.message);
8080
return res
8181
.status(err.status)
8282
.send(err.message);

‎lib/ldp.js‎

Lines changed: 174 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -101,153 +101,181 @@ LDP.prototype.readContainerMeta = function (directory, callback) {
101101
};
102102

103103
LDP.prototype.listContainer = function (filename, uri, containerData, callback) {
104-
var ldp = this;
105-
var baseUri = utils.filenameToBaseUri(filename, uri, ldp.root);
106-
var resourceGraph = $rdf.graph();
104+
function addStats (resourceGraph, baseUri, stats) {
105+
resourceGraph.add(
106+
resourceGraph.sym(baseUri),
107+
ns.stat('mtime'),
108+
stats.mtime.getTime());
109+
110+
resourceGraph.add(
111+
resourceGraph.sym(baseUri),
112+
ns.stat('size'),
113+
stats.size);
114+
}
107115

108-
try {
109-
$rdf.parse(containerData, resourceGraph, baseUri, 'text/turtle');
110-
} catch (err) {
111-
debug.handlers("GET/HEAD -- Error parsing data: " + err);
112-
return callback({status:500, message: err});
116+
function readdir(filename, callback) {
117+
debug.handlers("GET/HEAD -- Reading directory");
118+
fs.readdir(filename, function (err, files) {
119+
if (err) {
120+
debug.handlers("GET/HEAD -- Error reading files: " + err);
121+
return callback({ status:404, message: err });
122+
}
123+
124+
debug.handlers("Files in directory: " + files);
125+
return callback(null, files);
126+
});
113127
}
114128

115-
async.waterfall([
116-
// Adding current folder stats
117-
function(next) {
118-
ldp.stat(filename, function(err, containerStats) {
119-
if (!err) {
120-
resourceGraph.add(
121-
resourceGraph.sym(baseUri),
122-
ns.stat('mtime'),
123-
containerStats.mtime.getTime());
124-
125-
resourceGraph.add(
126-
resourceGraph.sym(baseUri),
127-
ns.stat('size'),
128-
containerStats.size);
129-
}
130-
return next(null, filename);
131-
});
132-
},
133-
// reading directory
134-
function (filename, next) {
135-
debug.handlers("GET/HEAD -- Reading directory");
136-
fs.readdir(filename, function (err, files) {
129+
function getMetadataGraph(metaFile, fileBaseUri, callback) {
130+
fs.stat(metaFile, function(err, metaStats) {
131+
if (err) {
132+
return callback({ status: 404, message: err });
133+
}
134+
135+
if (metaStats && metaStats.isFile()) {
136+
fs.readFile(metaFile, {encoding: 'utf8'}, function(err, rawMetadata) {
137+
if (err) {
138+
return callback({ status: 404, message: err });
139+
}
140+
141+
var metadataGraph = $rdf.graph();
142+
try {
143+
$rdf.parse(
144+
rawMetadata,
145+
metadataGraph,
146+
fileBaseUri,
147+
'text/turtle');
148+
} catch (dirErr) {
149+
return callback({ status: 500, message: dirErr });
150+
}
151+
return callback(null, metadataGraph);
152+
});
153+
} else {
154+
return callback(null, $rdf.graph());
155+
}
156+
});
157+
}
158+
159+
function addFile(ldp, resourceGraph, baseUri, uri, container, file, callback) {
160+
// Skip .meta and .acl
161+
if (S(file).endsWith(ldp.suffixMeta) || S(file).endsWith(ldp.suffixAcl)) {
162+
return callback();
163+
}
164+
165+
// Get file stats
166+
fs.stat(container + file, function (err, stats) {
137167
if (err) {
138-
debug.handlers("GET/HEAD -- Error reading files: " + err);
139-
return next({status:404, message:err});
168+
// File does not exist, skip
169+
return callback();
140170
}
141171

142-
debug.handlers("Files in directory: " + files);
143-
return next(null, files);
144-
});
145-
},
146-
// Iterate through all the files
147-
function (files, next) {
172+
var fileSubject = file + (stats.isDirectory() ? '/' : '');
173+
var fileBaseUri = utils.filenameToBaseUri(file, uri, ldp.root);
148174

149-
async.each(files, function(file, cb) {
150-
if (S(file).endsWith(ldp.suffixMeta) || S(file).endsWith(ldp.suffixAcl)) {
151-
return cb(null);
152-
}
153-
154-
fs.stat(filename + file, function (err, stats) {
175+
// Add fileStats to resource Graph
176+
addStats(resourceGraph, fileSubject, stats);
155177

156-
if (err) {
157-
debug.handlers("Error getting container: " + err);
158-
return cb(null);
159-
}
178+
// Add to `contains` list
179+
resourceGraph.add(
180+
resourceGraph.sym(baseUri),
181+
ns.ldp('contains'),
182+
resourceGraph.sym(file));
160183

161-
resourceGraph.add(
162-
resourceGraph.sym(baseUri),
163-
ns.ldp('contains'),
164-
resourceGraph.sym(file));
184+
// Set up a metaFile path
185+
var metaFile = container + file +
186+
(stats.isDirectory() ? '/' : '') +
187+
(S(file).endsWith(turtleExtension) ? '' : ldp.suffixMeta);
165188

166-
var metaFile;
167-
var fileBaseUri;
168-
var fileSubject = file;
189+
getMetadataGraph(metaFile, fileBaseUri, function(err, metadataGraph) {
190+
if (err) {
191+
metadataGraph = $rdf.graph();
192+
}
169193

194+
// Add File, Container or BasicContainer
170195
if (stats.isDirectory()) {
171-
metaFile = filename + file + '/' + ldp.suffixMeta;
172-
fileSubject += '/';
173-
} else if (stats.isFile() && S(file).endsWith(turtleExtension)) {
174-
metaFile = filename + file;
196+
resourceGraph.add(
197+
metadataGraph.sym(fileSubject),
198+
ns.rdf('type'),
199+
ns.ldp('BasicContainer'));
200+
201+
resourceGraph.add(
202+
metadataGraph.sym(fileSubject),
203+
ns.rdf('type'),
204+
ns.ldp('Container'));
205+
206+
resourceGraph.add(
207+
metadataGraph.sym(fileSubject),
208+
ns.rdf('type'),
209+
ns.stat('Directory'));
175210
} else {
176-
metaFile = filename + file + ldp.suffixMeta;
211+
resourceGraph.add(
212+
metadataGraph.sym(fileSubject),
213+
ns.rdf('type'),
214+
ns.stat('File'));
177215
}
178-
fileBaseUri = utils.filenameToBaseUri(file, uri, ldp.root);
179216

180-
var metadataGraph = $rdf.graph();
181-
182-
fs.stat(metaFile, function (err, metaStats) {
183-
184-
if (err || (metaStats && metaStats.isDirectory())) {}
185-
186-
fs.readFile(metaFile, {encoding: 'utf8'}, function(err, rawMetadata) {
187-
try {
188-
$rdf.parse(
189-
rawMetadata,
190-
metadataGraph,
191-
fileBaseUri,
192-
'text/turtle');
193-
} catch (dirErr) {
194-
metadataGraph = $rdf.graph();
217+
// Add type from metadataGraph
218+
var typeStatements = metadataGraph
219+
.statementsMatching(
220+
metadataGraph.sym(fileBaseUri),
221+
ns.rdf('type'),
222+
undefined)
223+
.forEach(function (typeStatement) {
224+
// If the current is a file and its type is BasicContainer,
225+
// This is not possible, so do not infer its type!
226+
if (
227+
(
228+
typeStatement.object.uri !== ns.ldp('BasicContainer').uri &&
229+
typeStatement.object.uri !== ns.ldp('Container').uri
230+
) ||
231+
!stats.isFile()
232+
) {
233+
resourceGraph.add(
234+
resourceGraph.sym(fileSubject),
235+
typeStatement.predicate,
236+
typeStatement.object);
195237
}
238+
});
196239

197-
var typeStatements = metadataGraph
198-
.statementsMatching(
199-
metadataGraph.sym(fileBaseUri),
200-
ns.rdf('type'),
201-
undefined)
202-
.forEach(function (typeStatement) {
203-
resourceGraph.add(
204-
resourceGraph.sym(fileSubject),
205-
typeStatement.predicate,
206-
typeStatement.object);
207-
});
208240

209-
// TODO is this a repetition?
210-
fs.stat(filename + file, function(err, fileStats) {
211-
if (err) {}
212-
213-
if (fileStats.isDirectory()) {
214-
resourceGraph.add(
215-
metadataGraph.sym(fileSubject),
216-
ns.rdf('type'),
217-
ns.ldp('BasicContainer'));
218-
219-
resourceGraph.add(
220-
metadataGraph.sym(fileSubject),
221-
ns.rdf('type'),
222-
ns.ldp('Container'));
223-
224-
resourceGraph.add(
225-
metadataGraph.sym(fileSubject),
226-
ns.rdf('type'),
227-
ns.stat('Directory'));
228-
} else {
229-
resourceGraph.add(
230-
metadataGraph.sym(fileSubject),
231-
ns.rdf('type'),
232-
ns.stat('File'));
233-
}
241+
return callback();
242+
});
243+
});
244+
}
234245

235-
resourceGraph.add(
236-
metadataGraph.sym(fileSubject),
237-
ns.stat('mtime'),
238-
fileStats.mtime.getTime());
246+
var ldp = this;
247+
var baseUri = utils.filenameToBaseUri(filename, uri, ldp.root);
248+
var resourceGraph = $rdf.graph();
239249

240-
resourceGraph.add(
241-
metadataGraph.sym(fileSubject),
242-
ns.stat('size'),
243-
fileStats.size);
244-
return cb(null);
245-
});
246-
});
247-
});
248-
});
249-
}, next);
250+
try {
251+
$rdf.parse(containerData, resourceGraph, baseUri, 'text/turtle');
252+
} catch (err) {
253+
debug.handlers("GET/HEAD -- Error parsing data: " + err);
254+
return callback({status:500, message: err});
255+
}
250256

257+
async.waterfall([
258+
// add container stats
259+
function (next) {
260+
fs.stat(filename, function(err, containerStats) {
261+
if (!err) {
262+
addStats(resourceGraph, baseUri, containerStats);
263+
}
264+
next();
265+
});
266+
},
267+
// reading directory
268+
function (next) {
269+
readdir(filename, next);
270+
},
271+
// Iterate through all the files
272+
function (files, next) {
273+
async.each(
274+
files,
275+
function(file, cb) {
276+
addFile(ldp, resourceGraph, baseUri, uri, filename, file, cb);
277+
},
278+
next);
251279
}
252280
],
253281
function (err, data) {
@@ -267,28 +295,27 @@ LDP.prototype.listContainer = function (filename, uri, containerData, callback)
267295
};
268296

269297
LDP.prototype.put = function (filePath, contents, callback) {
298+
// PUT requests not supported on containers. Use POST instead
299+
if (filePath[filePath.length - 1] === '/') {
300+
return callback({
301+
status: 409,
302+
message: "PUT to containers not supported. Use POST method instead"
303+
});
304+
}
270305

271-
// PUT requests not supported on containers. Use POST instead
272-
if (filePath[filePath.length - 1] === '/') {
273-
return callback({
274-
status: 409,
275-
message: "PUT to containers not supported. Use POST method instead"
276-
});
277-
}
278-
279-
mkdirp(path.dirname(filePath), function (err) {
306+
mkdirp(path.dirname(filePath), function (err) {
307+
if (err) {
308+
debug.handlers("PUT -- Error creating directory: " + err);
309+
return callback({ status: 500, message: err });
310+
}
311+
return fs.writeFile(filePath, contents, function() {
280312
if (err) {
281-
debug.handlers("PUT -- Error creating directory: " + err);
282-
return callback({ status: 500, message: err });
313+
debug.handlers("PUT -- Error writing file: " + err);
314+
return callback({ status: 500, message: err});
283315
}
284-
return fs.writeFile(filePath, contents, function() {
285-
if (err) {
286-
debug.handlers("PUT -- Error writing file: " + err);
287-
return callback({ status: 500, message: err});
288-
}
289-
// Success!
290-
return callback();
291-
});
316+
// Success!
317+
return callback();
318+
});
292319
});
293320
};
294321

@@ -316,7 +343,7 @@ LDP.prototype.get = function(filename, uri, includeBody, callback) {
316343
}
317344
ldp.listContainer(filename, uri, metaFile, function (err, data) {
318345
if (err) {
319-
debug.handlers('GET/HEAD -- Read error:' + err);
346+
debug.handlers('GET/HEAD -- Read error:' + err.message);
320347
return callback({
321348
status: err.status,
322349
message: err.message
@@ -331,7 +358,7 @@ LDP.prototype.get = function(filename, uri, includeBody, callback) {
331358
return ldp.readFile(filename, function (err, data) {
332359
// Error when reading
333360
if (err) {
334-
debug.handlers('GET/HEAD -- Read error:' + err);
361+
debug.handlers('GET/HEAD -- Read error:' + err.message);
335362
return callback({
336363
status: err.status,
337364
message: err.message

0 commit comments

Comments
 (0)