@@ -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 ;
@@ -108,7 +110,7 @@ function get(req, res, includeBody) {
108110 res . status ( 200 ) . send ( data ) ;
109111
110112 }
111-
113+
112114 function containerHandler ( err , rawContainer ) {
113115 if ( err ) {
114116 rawContainer = "" ;
@@ -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,24 +231,90 @@ function get(req, res, includeBody) {
230231 return res . status ( 500 ) . send ( err ) ;
231232 }
232233
233- debug ( "GET/HEAD -- Reading directory" ) ;
234- fs . readdir ( filename , readdirCallback ) ;
234+ fs . stat ( filename , function ( err , containerStats ) {
235+ if ( ! err ) {
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+ }
243+
244+ debug ( "GET/HEAD -- Reading directory" ) ;
245+ fs . readdir ( filename , readdirCallback ) ;
246+ } ) ;
235247
236248 function readdirCallback ( err , files ) {
237249 if ( err ) {
238250 debug ( "GET/HEAD -- Error reading files: " + err ) ;
239251 return res . sendStatus ( 404 ) ;
240252 } else {
253+ debug ( "Files in directory: " + files ) ;
241254 for ( var i = 0 ; i < files . length ; i ++ ) {
242- if ( ! S ( files [ i ] ) . startsWith ( '.' ) ) {
255+ if ( ! S ( files [ i ] ) . endsWith ( metaExtension ) &&
256+ ! S ( files [ i ] ) . endsWith ( options . suffixAcl ) ) {
243257 try {
244258 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 ] ) ) ;
259+
260+ resourceGraph . add ( resourceGraph . sym ( baseUri ) ,
261+ ns . ldp ( 'contains' ) ,
262+ resourceGraph . sym ( files [ i ] ) ) ;
263+
264+ var metaFile ;
265+ var fileBaseUri ;
266+ var fileSubject = files [ i ] ;
267+
268+ if ( stats . isDirectory ( ) ) {
269+ metaFile = filename + files [ i ] + '/' + metaExtension ;
270+ fileSubject += '/' ;
271+ } else if ( stats . isFile ( ) && S ( files [ i ] ) . endsWith ( turtleExtension ) ) {
272+ metaFile = filename + files [ i ] ;
273+ } else {
274+ metaFile = filename + files [ i ] + metaExtension ;
249275 }
250- } catch ( statErr ) {
276+ fileBaseUri = file . filenameToBaseUri ( files [ i ] , uri , options . root ) ;
277+
278+ var metadataGraph = $rdf . graph ( ) ;
279+ var rawMetadata ;
280+
281+ var metaStats ;
282+ try {
283+ metaStats = fs . statSync ( metaFile ) ;
284+ } catch ( statErr ) { }
285+
286+ if ( metaStats && metaStats . isFile ( ) ) {
287+ try {
288+ rawMetadata = fs . readFileSync ( metaFile , { encoding : 'utf8' } ) ;
289+ $rdf . parse ( rawMetadata , metadataGraph , fileBaseUri ,
290+ 'text/turtle' ) ;
291+ } catch ( dirErr ) {
292+ metadataGraph = $rdf . graph ( ) ;
293+ }
294+ }
295+
296+ var typeStatements = metadataGraph
297+ . statementsMatching ( metadataGraph . sym ( fileBaseUri ) ,
298+ ns . rdf ( 'type' ) , undefined ) ;
299+ for ( var typeIndex in typeStatements ) {
300+ var typeStatement = typeStatements [ typeIndex ] ;
301+ resourceGraph . add ( resourceGraph . sym ( fileSubject ) ,
302+ typeStatement . predicate ,
303+ typeStatement . object ) ;
304+
305+ }
306+
307+ try {
308+ var fileStats = fs . statSync ( filename + files [ i ] ) ;
309+ resourceGraph . add ( metadataGraph . sym ( fileSubject ) ,
310+ ns . stat ( 'mtime' ) ,
311+ fileStats . mtime . getTime ( ) ) ;
312+ resourceGraph . add ( metadataGraph . sym ( fileSubject ) ,
313+ ns . stat ( 'size' ) ,
314+ fileStats . size ) ;
315+ } catch ( statErr ) { }
316+ } catch ( getErr ) {
317+ debug ( "Error getting container: " + getErr ) ;
251318 continue ;
252319 }
253320 }
0 commit comments