light9: bin/rdfdb comparison

comparison bin/rdfdb @ 1045:c1face79c0e1

fix rdfdb's filename<->uri mapping system Ignore-this: 2236b295035273370138943857894699

author	Drew Perttula <drewp@bigasterisk.com>
date	Thu, 29 May 2014 06:46:18 +0000
parents	a4632a7b2e17
children	473db8bebb8f

comparison

equal deleted inserted replaced

-:a2081b9adfe4
+:c1face79c0e1
 from light9 import networking, showconfig, prof
 from rdflib import ConjunctiveGraph, URIRef, Graph
 from light9.rdfdb.graphfile import GraphFile
 from light9.rdfdb.patch import Patch, ALLSTMTS
 from light9.rdfdb.rdflibpatch import patchQuads
+from light9.rdfdb.file_vs_uri import correctToTopdirPrefix, fileForUri, uriFromFile
 from light9.rdfdb.patchsender import sendPatch
 from light9.rdfdb.patchreceiver import makePatchEndpointPutMethod
 from twisted.internet.inotify import INotify
 from run_local import log
 """
 find files, notice new files.
 This object watches directories. Each GraphFile watches its own file.
 """
-def __init__(self, topDirsToWatch, patch, getSubgraph):
+def __init__(self, dirUriMap, patch, getSubgraph):
-self.topDirsToWatch = topDirsToWatch
+self.dirUriMap = dirUriMap # {abspath : uri prefix}
 self.patch, self.getSubgraph = patch, getSubgraph
-# files from cwd become uris starting with this. *should* be
-# building uris from the show uri in $LIGHT9_SHOW/URI
-# instead. Who wants to keep their data in the same dir tree
-# as the source code?!
-self.topUri = URIRef("http://light9.bigasterisk.com/")
 self.graphFiles = {} # context uri : GraphFile
 self.notifier = INotify()
 self.notifier.startReading()
 self.findAndLoadFiles()
 def findAndLoadFiles(self):
 self.initialLoad = True
 try:
-for topdir in self.topDirsToWatch:
+for topdir in self.dirUriMap:
 for dirpath, dirnames, filenames in os.walk(topdir):
 for base in filenames:
 self.watchFile(os.path.join(dirpath, base))
 self.notifier.watch(FilePath(dirpath), autoAdd=True,
 callbacks=[self.dirChange])
 FilePath) because we use its exact relative form in the
 context URI
 """
 if not os.path.isfile(inFile):
 return
-if not any(inFile.startswith(prefix) for prefix in self.topDirsToWatch):
-for prefix in self.topDirsToWatch:
+inFile = correctToTopdirPrefix(self.dirUriMap, inFile)
-prefixAbs = os.path.abspath(prefix)
-if inFile.startswith(prefixAbs):
-inFile = prefix + inFile[len(prefixAbs):]
-break
-else:
-raise ValueError("can't correct %s to start with one of %s" %
-(inFile, self.topDirsToWatch))
 if os.path.splitext(inFile)[1] not in ['.n3']:
 return
 # an n3 file with rules makes it all the way past this reading
 # and the serialization. Then, on the receiving side, a
 # read into one file called config.n3. New versions won't read
 # it.
 if inFile.endswith("config.n3"):
 return
-ctx = self.uriFromFile(inFile)
+ctx = uriFromFile(self.dirUriMap, inFile)
 gf = GraphFile(self.notifier, inFile, ctx,
 self.patch, self.getSubgraph)
 self.graphFiles[ctx] = gf
 log.info("%s do initial read", inFile)
 gf.reread()
 graph is still a reasonable thing to do, though.
 """
 g = self.getSubgraph(ctx)
 if ctx not in self.graphFiles:
-outFile = self.fileForUri(ctx)
+outFile = fileForUri(self.dirUriMap, ctx)
 log.info("starting new file %r", outFile)
 self.graphFiles[ctx] = GraphFile(self.notifier, outFile, ctx,
 self.patch, self.getSubgraph)
 def dirtyFiles(self, ctxs):
 """
 for ctx in ctxs:
 g = self.getSubgraph(ctx)
 self.graphFiles[ctx].dirty(g)
-def uriFromFile(self, filename):
-assert filename.endswith('.n3'), filename
-if not any(filename.startswith(t) for t in self.topDirsToWatch):
-raise ValueError("filename %s doesn't start with any of %s" %
-(filename, self.topDirsToWatch))
-return URIRef(self.topUri + filename[:-len('.n3')])
-def fileForUri(self, ctx):
-assert isinstance(ctx, URIRef), ctx
-if not ctx.startswith(self.topUri):
-raise ValueError("don't know what filename to use for %s" % ctx)
-return ctx[len(self.topUri):] + ".n3"
 class Db(object):
 """
 the master graph, all the connected clients, all the files we're watching
 """
-def __init__(self, topDirsToWatch):
+def __init__(self, dirUriMap):
 self.clients = []
 self.graph = ConjunctiveGraph()
-self.watchedFiles = WatchedFiles(topDirsToWatch,
+self.watchedFiles = WatchedFiles(dirUriMap,
 self.patch, self.getSubgraph)
 self.summarizeToLog()
 def patch(self, p, dueToFileChange=False):
 help="logging.DEBUG")
 (options, args) = parser.parse_args()
 log.setLevel(logging.DEBUG if options.verbose else logging.INFO)
-db = Db(topDirsToWatch=[os.environ['LIGHT9_SHOW']])
+db = Db(dirUriMap={os.environ['LIGHT9_SHOW'].rstrip('/') + '/':
+URIRef('http://light9.bigasterisk.com/show/dance2014/')})
 from twisted.python import log as twlog
 twlog.startLogging(sys.stdout)
 port = 8051

Mercurial > code > home > repos > light9

comparison bin/rdfdb @ 1045:c1face79c0e1