@@ -13,7 +13,6 @@ var acl = require('../acl.js');
1313var header = require ( '../header.js' ) ;
1414var metadata = require ( '../metadata.js' ) ;
1515var ns = require ( '../vocab/ns.js' ) . ns ;
16- var options = require ( '../options.js' ) ;
1716var file = require ( '../fileStore.js' ) ;
1817var subscription = require ( '../subscription.js' ) ;
1918
@@ -22,12 +21,12 @@ var metaExtension = '.meta';
2221var turtleExtension = '.ttl' ;
2322
2423function get ( req , res , includeBody ) {
25- var options = req . app . locals . ldp ;
24+ var ldp = req . app . locals . ldp ;
2625 var uri = file . uriBase ( req ) ;
2726
2827 // Add request to subscription service
29- if ( req . path . slice ( - options . suffixChanges . length ) ===
30- options . suffixChanges ) {
28+ if ( req . path . slice ( - ldp . suffixChanges . length ) ===
29+ ldp . suffixChanges ) {
3130 debug ( "GET -- Subscribed to " , req . originalUrl ) ;
3231 return subscription . subscribeToChanges ( req , res ) ;
3332 }
@@ -36,13 +35,13 @@ function get(req, res, includeBody) {
3635 res . header ( 'MS-Author-Via' , 'SPARQL' ) ;
3736
3837 // Set live updates
39- if ( options . live ) {
38+ if ( ldp . live ) {
4039 // Note not yet in
4140 // http://www.iana.org/assignments/link-relations/link-relations.xhtml
42- header . addLink ( res , req . originalUrl + options . suffixChanges , 'changes' ) ;
43- // res.header('Link' , '' + req.path + options .suffixSSE + ' ; rel=events' );
41+ header . addLink ( res , req . originalUrl + ldp . suffixChanges , 'changes' ) ;
42+ // res.header('Link' , '' + req.path + ldp .suffixSSE + ' ; rel=events' );
4443 // overwrites the pevious
45- res . header ( 'Updates-Via' , req . originalUrl + options . suffixChanges ) ;
44+ res . header ( 'Updates-Via' , req . originalUrl + ldp . suffixChanges ) ;
4645 }
4746
4847 if ( includeBody ) {
@@ -51,74 +50,80 @@ function get(req, res, includeBody) {
5150 debug ( 'HEAD -- ' + req . originalUrl ) ;
5251 }
5352
54- var filename = file . uriToFilename ( req . path , options . root ) ;
53+ var filename = file . uriToFilename ( req . path , ldp . root ) ;
5554
56- // Check if file exists
57- fs . stat ( filename , function ( err , stats ) {
55+ ldp . stat ( filename , function ( err , stats ) {
5856 if ( err ) {
5957 // File does not exist
6058 if ( glob . hasMagic ( filename ) ) {
6159 debug ( "GET/HEAD -- Glob request" ) ;
6260 return globHandler ( ) ;
6361 }
6462 debug ( 'GET/HEAD -- Read error: ' + err ) ;
65- return res . status ( 404 ) . send ( "Can't read file: " + err ) ;
63+ return res
64+ . status ( 404 )
65+ . send ( "Can't read file: " + err ) ;
6666 }
6767
68- if ( stats . isDirectory ( ) ) {
69- // Found a container
70- if ( includeBody ) {
71- return metadata . readContainerMetadata ( filename , containerHandler ) ;
72- }
73- res . status ( 200 ) . send ( ) ;
74- res . end ( ) ;
75- } else {
76- // Found a resource
77- if ( includeBody ) {
78- return fs . readFile ( filename , { encoding : "utf8" } , fileHandler ) ;
79- }
80- res . status ( 200 ) . send ( ) ;
81- res . end ( ) ;
68+ // Just return resource exists
69+ if ( ! includeBody ) {
70+ return res . sendStatus ( 200 ) ;
8271 }
83- } ) ;
8472
85- function fileHandler ( err , data ) {
86- if ( err ) {
87- debug ( 'GET/HEAD -- Read error:' + err ) ;
88- return res . status ( 404 )
89- . send ( "Can't read file: " + err ) ;
73+ // Found a container
74+ if ( stats . isDirectory ( ) ) {
75+ return ldp . readContainerMeta ( filename , function ( err , data ) {
76+ if ( err ) {
77+ debug ( 'GET/HEAD -- Read error:' + err ) ;
78+ return res
79+ . status ( err . status )
80+ . send ( err . message ) ;
81+ }
82+ ldp . listContainer ( filename , uri , data , function ( err , data ) {
83+ if ( err ) {
84+ return res
85+ . status ( err . status )
86+ . send ( err . message ) ;
87+ }
88+
89+ return parseLinkedData ( data ) ;
90+ } ) ;
91+ } ) ;
9092 }
93+ else {
94+ return ldp . readFile ( filename , function ( err , data ) {
95+ // Error when reading
96+ if ( err ) {
97+ debug ( 'GET/HEAD -- Read error:' + err ) ;
98+ return res
99+ . status ( err . status )
100+ . send ( err . message ) ;
101+ }
91102
92- debug ( 'GET/HEAD -- Read Ok. Bytes read: ' + data . length ) ;
93- var contentType = mime . lookup ( filename ) ;
94- res . set ( 'content-type' , contentType ) ;
95- debug ( 'GET/HEAD -- content-type: ' + contentType ) ;
103+ // File retrieved
104+ debug ( 'GET/HEAD -- Read Ok. Bytes read: ' + data . length ) ;
96105
97- // Consider acl and meta files text/turtle
98- if ( path . extname ( filename ) === options . suffixAcl ||
99- path . basename ( filename ) === turtleExtension ||
100- path . basename ( filename ) === metaExtension ) {
101- contentType = 'text/turtle' ;
102- }
106+ var contentType = mime . lookup ( filename ) ;
107+ res . set ( 'content-type' , contentType ) ;
108+ debug ( 'GET/HEAD -- content-type: ' + contentType ) ;
103109
104- // if data is text/turtle, parse it
105- if ( contentType === 'text/turtle' ) {
106- return parseLinkedData ( data ) ;
107- }
110+ // Consider acl and meta files text/turtle
111+ if ( path . extname ( filename ) === ldp . suffixAcl ||
112+ path . basename ( filename ) === turtleExtension ||
113+ path . basename ( filename ) === metaExtension ) {
114+ contentType = 'text/turtle' ;
115+ }
108116
109- // Otherwise, just send the data
110- res . status ( 200 ) . send ( data ) ;
117+ // if data is text/turtle, parse it
118+ if ( contentType === 'text/turtle' ) {
119+ return parseLinkedData ( data ) ;
120+ }
111121
112- }
113-
114- function containerHandler ( err , rawContainer ) {
115- if ( err ) {
116- rawContainer = "" ;
122+ // Otherwise, just send the data
123+ res . status ( 200 ) . send ( data ) ;
124+ } ) ;
117125 }
118-
119- // Parse the container
120- parseContainer ( rawContainer ) ;
121- }
126+ } ) ;
122127
123128 function globHandler ( ) {
124129 glob ( filename , globOptions , function ( err , matches ) {
@@ -131,7 +136,7 @@ function get(req, res, includeBody) {
131136 var globGraph = $rdf . graph ( ) ;
132137 matches . forEach ( function ( match ) {
133138 try {
134- var baseUri = file . filenameToBaseUri ( match , uri , options . root ) ;
139+ var baseUri = file . filenameToBaseUri ( match , uri , ldp . root ) ;
135140 var fileData = fs . readFileSync (
136141 match ,
137142 { encoding : "utf8" } ) ;
@@ -159,12 +164,12 @@ function get(req, res, includeBody) {
159164 }
160165
161166 function aclAllow ( match ) {
162- if ( ! options . webid ) {
167+ if ( ! ldp . webid ) {
163168 return true ;
164169 }
165170
166171 var relativePath = '/' +
167- path . relative ( options . root , match ) ;
172+ path . relative ( ldp . root , match ) ;
168173
169174 req . path = relativePath ;
170175 var allow = acl . allow ( "Read" , req , res ) ;
@@ -178,7 +183,7 @@ function get(req, res, includeBody) {
178183
179184 function parseLinkedData ( turtleData ) {
180185 var accept = header . parseAcceptHeader ( req ) ;
181- var baseUri = file . filenameToBaseUri ( filename , uri , options . root ) ;
186+ var baseUri = file . filenameToBaseUri ( filename , uri , ldp . root ) ;
182187
183188 // Handle Turtle Accept header
184189 if ( accept === undefined || accept === null ) {
@@ -217,120 +222,6 @@ function get(req, res, includeBody) {
217222 }
218223 } ) ;
219224 }
220-
221- function parseContainer ( containerData ) {
222- //Handle other file types
223- var baseUri = file . filenameToBaseUri ( filename , uri , options . root ) ;
224- var resourceGraph = $rdf . graph ( ) ;
225- try {
226- $rdf . parse ( containerData , resourceGraph , baseUri , 'text/turtle' ) ;
227- } catch ( err ) {
228- debug ( "GET/HEAD -- Error parsing data: " + err ) ;
229- return res . status ( 500 ) . send ( err ) ;
230- }
231-
232- fs . stat ( filename , function ( err , containerStats ) {
233- if ( ! err ) {
234- resourceGraph . add ( resourceGraph . sym ( baseUri ) ,
235- ns . stat ( 'mtime' ) ,
236- containerStats . mtime . getTime ( ) ) ;
237- resourceGraph . add ( resourceGraph . sym ( baseUri ) ,
238- ns . stat ( 'size' ) ,
239- containerStats . size ) ;
240- }
241-
242- debug ( "GET/HEAD -- Reading directory" ) ;
243- fs . readdir ( filename , readdirCallback ) ;
244- } ) ;
245-
246- function readdirCallback ( err , files ) {
247- if ( err ) {
248- debug ( "GET/HEAD -- Error reading files: " + err ) ;
249- return res . sendStatus ( 404 ) ;
250- } else {
251- debug ( "Files in directory: " + files ) ;
252- for ( var i = 0 ; i < files . length ; i ++ ) {
253- if ( ! S ( files [ i ] ) . endsWith ( metaExtension ) &&
254- ! S ( files [ i ] ) . endsWith ( options . suffixAcl ) ) {
255- try {
256- var stats = fs . statSync ( filename + files [ i ] ) ;
257-
258- resourceGraph . add ( resourceGraph . sym ( baseUri ) ,
259- ns . ldp ( 'contains' ) ,
260- resourceGraph . sym ( files [ i ] ) ) ;
261-
262- var metaFile ;
263- var fileBaseUri ;
264- var fileSubject = files [ i ] ;
265-
266- if ( stats . isDirectory ( ) ) {
267- metaFile = filename + files [ i ] + '/' + metaExtension ;
268- fileSubject += '/' ;
269- } else if ( stats . isFile ( ) && S ( files [ i ] ) . endsWith ( turtleExtension ) ) {
270- metaFile = filename + files [ i ] ;
271- } else {
272- metaFile = filename + files [ i ] + metaExtension ;
273- }
274- fileBaseUri = file . filenameToBaseUri ( files [ i ] , uri , options . root ) ;
275-
276- var metadataGraph = $rdf . graph ( ) ;
277- var rawMetadata ;
278-
279- var metaStats ;
280- try {
281- metaStats = fs . statSync ( metaFile ) ;
282- } catch ( statErr ) { }
283-
284- if ( metaStats && metaStats . isFile ( ) ) {
285- try {
286- rawMetadata = fs . readFileSync ( metaFile , { encoding : 'utf8' } ) ;
287- $rdf . parse ( rawMetadata , metadataGraph , fileBaseUri ,
288- 'text/turtle' ) ;
289- } catch ( dirErr ) {
290- metadataGraph = $rdf . graph ( ) ;
291- }
292- }
293-
294- var typeStatements = metadataGraph
295- . statementsMatching ( metadataGraph . sym ( fileBaseUri ) ,
296- ns . rdf ( 'type' ) , undefined ) ;
297- for ( var typeIndex in typeStatements ) {
298- var typeStatement = typeStatements [ typeIndex ] ;
299- resourceGraph . add ( resourceGraph . sym ( fileSubject ) ,
300- typeStatement . predicate ,
301- typeStatement . object ) ;
302-
303- }
304-
305- try {
306- var fileStats = fs . statSync ( filename + files [ i ] ) ;
307- resourceGraph . add ( metadataGraph . sym ( fileSubject ) ,
308- ns . stat ( 'mtime' ) ,
309- fileStats . mtime . getTime ( ) ) ;
310- resourceGraph . add ( metadataGraph . sym ( fileSubject ) ,
311- ns . stat ( 'size' ) ,
312- fileStats . size ) ;
313- } catch ( statErr ) { }
314- } catch ( getErr ) {
315- debug ( "Error getting container: " + getErr ) ;
316- continue ;
317- }
318- }
319- }
320- try {
321- var turtleData = $rdf . serialize (
322- undefined ,
323- resourceGraph ,
324- null ,
325- 'text/turtle' ) ;
326- parseLinkedData ( turtleData ) ;
327- } catch ( parseErr ) {
328- debug ( "GET/HEAD -- Error serializing container: " + parseErr ) ;
329- return res . sendStatus ( 500 ) ;
330- }
331- }
332- }
333- }
334225}
335226
336227var globOptions = {
0 commit comments