Merging graphs

Author: megoth

lib/acl-checker.js

@@ -149,40 +149,40 @@ class ACLChecker {
         debug(err)
         throw err
       }
-
-      // const subject = rdf.sym(acl)
-      console.log('>>>> GRAPH WITHOUT GROUPS', graph.length)
-      const fetcher = new rdf.Fetcher(graph)
-      // console.log(graph.statementsMatching(null, ACL('agentGroup'), null))
-      const groupUrls = graph.statementsMatching(null, ACL('agentGroup'), null).map(node => node.object.value.split('#')[0])
-      console.log('>>>>>>>>>> GROUPS', groupUrls)
-      await groupUrls.map(groupUrl => fetcher.load(groupUrl))
-      // const loadingGroups = groupUrls.map(async groupUrl => {
-      //   console.log('STARTING')
-      //   const response = await fetch(groupUrl)
-      //   console.log(response)
-      //   // console.log('>>>>>>>> RESPONSE', response)
-      //   // console.log('AFTER TRY CATCH')
-      //   // const body = await response.text()
-      //   // return new Promise((resolve, reject) => {
-      //   //   console.log('WWWAAAAAAAT!!')
-      //   //   rdf.parse(body, graph, group, 'text/turtle', err => {
-      //   //     if (err) {
-      //   //       return reject(err)
-      //   //     }
-      //   //     resolve()
-      //   //   })
-      //   // })
-      // })
-      // await Promise.all(loadingGroups)
-      console.log('>>>> GRAPH WITH GROUPS', graph.length)
       const relative = resource.replace(acl.replace(/[^/]+$/, ''), './')
       debug(`Using ACL ${acl} for ${relative}`)
       returnAcl = { acl, graph, isContainer }
     }
     if (!returnAcl) {
       throw new HTTPError(500, `No ACL found for ${resource}, searched in \n- ${acls.join('\n- ')}`)
     }
+    // const subject = rdf.sym(acl)
+    console.log('>>>> GRAPH WITHOUT GROUPS', returnAcl.graph.length)
+    // const fetcher = new rdf.Fetcher(returnAcl.graph)
+    // console.log(graph.statementsMatching(null, ACL('agentGroup'), null))
+    const groupUrls = returnAcl.graph.statementsMatching(null, ACL('agentGroup'), null).map(node => node.object.value.split('#')[0])
+    // console.log('>>>>>>>>>> GROUPS', groupUrls)
+    await groupUrls.map(groupUrl => this.fetch(groupUrl, returnAcl.graph))
+    // const loadingGroups = groupUrls.map(async groupUrl => {
+    //   console.log('STARTING')
+    //   const response = await fetch(groupUrl)
+    //   console.log(response)
+    //   // console.log('>>>>>>>> RESPONSE', response)
+    //   // console.log('AFTER TRY CATCH')
+    //   // const body = await response.text()
+    //   // return new Promise((resolve, reject) => {
+    //   //   console.log('WWWAAAAAAAT!!')
+    //   //   rdf.parse(body, graph, group, 'text/turtle', err => {
+    //   //     if (err) {
+    //   //       return reject(err)
+    //   //     }
+    //   //     resolve()
+    //   //   })
+    //   // })
+    // })
+    // await Promise.all(loadingGroups)
+    console.log('>>>> GRAPH WITH GROUPS', returnAcl.graph.length)
+
     return returnAcl
     // const nearestACL = possibleACLs.reduce((prevACL, acl) => {
     //   return prevACL.catch(() => new Promise((resolve, reject) => {

lib/handlers/allow.js

@@ -71,7 +71,17 @@ function allow (mode) {
  * @return {Function} Returns a `fetch(uri, callback)` handler
  */
 function fetchFromLdp (mapper, ldp) {
-  return async function fetch (url) {
-    return ldp.getGraph(url)
+  return async function fetch (url, graph = $rdf.graph()) {
+    // Convert the URL into a filename
+    const { path, contentType } = await mapper.mapUrlToFile({ url })
+    // Read the file from disk
+    const body = await new Promise((resolve, reject) => {
+      ldp.readFile(path, (e, c) => e ? reject(e) : resolve(c))
+    })
+    // Parse the file as Turtle
+    console.log('OLD GRAPH - merge', graph.length)
+    $rdf.parse(body, graph, url, contentType)
+    console.log('NEW GRAPH - merge', graph.length)
+    return graph
   }
 }