light9: bin/rdfdb comparison

comparison bin/rdfdb @ 1581:30c79f1dc4f8

fix suggestPrefixes to send suggestions to rdfdb Ignore-this: 637142dcc1de97c9046d75d1396a9446

author	Drew Perttula <drewp@bigasterisk.com>
date	Tue, 30 May 2017 07:36:42 +0000
parents	1ba1d46a70a2
children	2fc0e726a3c3

comparison

equal deleted inserted replaced

-:1db548d395fb
+:30c79f1dc4f8
 """
 find files, notice new files.
 This object watches directories. Each GraphFile watches its own file.
 """
-def __init__(self, dirUriMap, patch, getSubgraph, addlPrefixes=None):
+def __init__(self, dirUriMap, patch, getSubgraph, addlPrefixes):
 self.dirUriMap = dirUriMap # {abspath : uri prefix}
 self.patch, self.getSubgraph = patch, getSubgraph
 self.addlPrefixes = addlPrefixes
 self.graphFiles = {} # context uri : GraphFile
 # it.
 if inFile.endswith("config.n3"):
 return
 ctx = uriFromFile(self.dirUriMap, inFile)
-gf = GraphFile(self.notifier, inFile, ctx,
+gf = self._addGraphFile(ctx, inFile)
-self.patch, self.getSubgraph,
-addlPrefixes=self.addlPrefixes)
-self.graphFiles[ctx] = gf
 log.info("%s do initial read", inFile)
 gf.reread()
 def aboutToPatch(self, ctx):
 """
 if ctx not in self.graphFiles:
 outFile = fileForUri(self.dirUriMap, ctx)
 assert '//' not in outFile, (outFile, self.dirUriMap, ctx)
 log.info("starting new file %r", outFile)
-self.graphFiles[ctx] = GraphFile(self.notifier, outFile, ctx,
+self._addGraphFile(ctx, outFile)
-self.patch, self.getSubgraph,
-addlPrefixes=self.addlPrefixes)
+def _addGraphFile(self, ctx, path):
+self.addlPrefixes.setdefault(ctx, {})
+self.addlPrefixes.setdefault(None, {})
+gf = GraphFile(self.notifier, path, ctx,
+self.patch, self.getSubgraph,
+globalPrefixes=self.addlPrefixes[None],
+ctxPrefixes=self.addlPrefixes[ctx])
+self.graphFiles[ctx] = gf
+return gf
 def dirtyFiles(self, ctxs):
 """mark dirty the files that we watch in these contexts.
 the ctx might not be a file that we already read; it might be
 for a new file we have to create, or it might be for a
 class Db(object):
 """
 the master graph, all the connected clients, all the files we're watching
 """
-def __init__(self, dirUriMap, addlPrefixes=None):
+def __init__(self, dirUriMap, addlPrefixes):
 self.clients = []
 self.graph = ConjunctiveGraph()
 self.watchedFiles = WatchedFiles(dirUriMap,
-self.patch, self.getSubgraph, addlPrefixes)
+self.patch, self.getSubgraph,
+addlPrefixes)
 self.summarizeToLog()
 def patch(self, p, dueToFileChange=False):
 """
 except:
 import traceback
 traceback.print_exc()
 raise
+class Prefixes(PrettyErrorHandler, cyclone.web.RequestHandler):
+def post(self):
+suggestion = json.loads(self.request.body)
+addlPrefixes = self.settings.db.watchedFiles.addlPrefixes
+addlPrefixes.setdefault(URIRef(suggestion['ctx']), {}).update(suggestion['prefixes'])
 _wsClientSerial = 0
 class WebsocketClient(cyclone.websocket.WebSocketHandler):
 def connectionMade(self, *args, **kwargs):
 global _wsClientSerial
 def get(self, path, *args, **kw):
 if path and '.' not in path:
 path = path + ".html"
 cyclone.web.StaticFileHandler.get(self, path, *args, **kw)
 if __name__ == "__main__":
 logging.basicConfig()
 log = logging.getLogger()
 parser = optparse.OptionParser()
 log.setLevel(logging.DEBUG if options.verbose else logging.INFO)
 db = Db(dirUriMap={os.environ['LIGHT9_SHOW'].rstrip('/') + '/':
 showconfig.showUri() + '/'},
-addlPrefixes={'show': URIRef(showconfig.showUri() + '/')})
+addlPrefixes={None: {
+'show': showconfig.showUri() + '/',
+'': 'http://light9.bigasterisk.com/',
+'rdf': 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+'rdfs': 'http://www.w3.org/2000/01/rdf-schema#',
+'xsd': 'http://www.w3.org/2001/XMLSchema#',
+'effect': 'http://light9.bigasterisk.com/effect/',
+'dev': 'http://light9.bigasterisk.com/device/',
+}})
 from twisted.python import log as twlog
 twlog.startLogging(sys.stdout)
 reactor.listenTCP(networking.rdfdb.port, cyclone.web.Application(handlers=[
 (r'/live', Live),
 (r'/graph', GraphResource),
 (r'/patches', Patches),
 (r'/graphClients', GraphClients),
 (r'/syncedGraph', WebsocketClient),
+(r'/prefixes', Prefixes),
 (r'/(.*)', NoExts,
 {"path" : "light9/rdfdb/web",
 "default_filename" : "index.html"}),

Mercurial > code > home > repos > light9

comparison bin/rdfdb @ 1581:30c79f1dc4f8