@@ -12,12 +12,14 @@ var debug = require('../logging').handlers;
1212var acl = require ( '../acl.js' ) ;
1313var header = require ( '../header.js' ) ;
1414var metadata = require ( '../metadata.js' ) ;
15+ var ns = require ( '../vocab/ns.js' ) . ns ;
1516var options = require ( '../options.js' ) ;
1617var file = require ( '../fileStore.js' ) ;
1718var subscription = require ( '../subscription.js' ) ;
1819
1920var ldpVocab = require ( '../vocab/ldp.js' ) ;
2021var metaExtension = '.meta' ;
22+ var turtleExtension = '.ttl' ;
2123
2224function get ( req , res , includeBody ) {
2325 var options = req . app . locals . ldp ;
@@ -126,7 +128,6 @@ function get(req, res, includeBody) {
126128 }
127129
128130 // Matches found
129- debug ( "matches " + matches ) ;
130131 var globGraph = $rdf . graph ( ) ;
131132 matches . forEach ( function ( match ) {
132133 try {
@@ -230,6 +231,16 @@ function get(req, res, includeBody) {
230231 return res . status ( 500 ) . send ( err ) ;
231232 }
232233
234+ try {
235+ var containerStats = fs . statSync ( filename ) ;
236+ resourceGraph . add ( resourceGraph . sym ( baseUri ) ,
237+ ns . stat ( 'mtime' ) ,
238+ containerStats . mtime . getTime ( ) ) ;
239+ resourceGraph . add ( resourceGraph . sym ( baseUri ) ,
240+ ns . stat ( 'size' ) ,
241+ containerStats . size ) ;
242+ } catch ( statErr ) { }
243+
233244 debug ( "GET/HEAD -- Reading directory" ) ;
234245 fs . readdir ( filename , readdirCallback ) ;
235246
@@ -238,16 +249,66 @@ function get(req, res, includeBody) {
238249 debug ( "GET/HEAD -- Error reading files: " + err ) ;
239250 return res . sendStatus ( 404 ) ;
240251 } else {
252+ debug ( "Files in directory: " + files ) ;
241253 for ( var i = 0 ; i < files . length ; i ++ ) {
242- if ( ! S ( files [ i ] ) . startsWith ( '.' ) ) {
254+ if ( ! S ( files [ i ] ) . endsWith ( metaExtension ) &&
255+ ! S ( files [ i ] ) . endsWith ( options . suffixAcl ) ) {
243256 try {
244257 var stats = fs . statSync ( filename + files [ i ] ) ;
245- if ( stats . isFile ( ) ) {
246- resourceGraph . add ( resourceGraph . sym ( baseUri ) ,
247- resourceGraph . sym ( ldpVocab . contains ) ,
248- resourceGraph . sym ( files [ i ] ) ) ;
258+
259+ resourceGraph . add ( resourceGraph . sym ( baseUri ) ,
260+ ns . ldp ( 'contains' ) ,
261+ resourceGraph . sym ( files [ i ] ) ) ;
262+
263+ var metaFile ;
264+ var fileBaseUri ;
265+ var fileSubject = files [ i ] ;
266+
267+ if ( stats . isDirectory ( ) ) {
268+ metaFile = filename + files [ i ] + '/' + metaExtension ;
269+ fileSubject += '/' ;
270+ } else if ( stats . isFile ( ) && S ( files [ i ] ) . endsWith ( turtleExtension ) ) {
271+ metaFile = filename + files [ i ] ;
272+ } else {
273+ metaFile = filename + files [ i ] + metaExtension ;
274+ }
275+ fileBaseUri = file . filenameToBaseUri ( files [ i ] , uri , options . root ) ;
276+
277+ var metadataGraph = $rdf . graph ( ) ;
278+ var rawMetadata ;
279+
280+ if ( fs . existsSync ( metaFile ) ) {
281+ try {
282+ rawMetadata = fs . readFileSync ( metaFile , { encoding : 'utf8' } ) ;
283+ $rdf . parse ( rawMetadata , metadataGraph , fileBaseUri ,
284+ 'text/turtle' ) ;
285+ } catch ( dirErr ) {
286+ metadataGraph = $rdf . graph ( ) ;
287+ }
249288 }
250- } catch ( statErr ) {
289+
290+ var typeStatements = metadataGraph
291+ . statementsMatching ( metadataGraph . sym ( fileBaseUri ) ,
292+ ns . rdf ( 'type' ) , undefined ) ;
293+ for ( var typeIndex in typeStatements ) {
294+ var typeStatement = typeStatements [ typeIndex ] ;
295+ resourceGraph . add ( resourceGraph . sym ( fileSubject ) ,
296+ typeStatement . predicate ,
297+ typeStatement . object ) ;
298+
299+ }
300+
301+ try {
302+ var fileStats = fs . statSync ( filename + files [ i ] ) ;
303+ resourceGraph . add ( metadataGraph . sym ( fileSubject ) ,
304+ ns . stat ( 'mtime' ) ,
305+ fileStats . mtime . getTime ( ) ) ;
306+ resourceGraph . add ( metadataGraph . sym ( fileSubject ) ,
307+ ns . stat ( 'size' ) ,
308+ fileStats . size ) ;
309+ } catch ( statErr ) { }
310+ } catch ( getErr ) {
311+ debug ( "Error getting container: " + getErr ) ;
251312 continue ;
252313 }
253314 }
0 commit comments