light9 Changeset - 4fe5612db2ed

Changeset - 4fe5612db2ed

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Drew Perttula - 12 years ago 2013-06-08 08:20:48
drewp@bigasterisk.com

curvecalc don't start doing graph work until our first sync
Ignore-this: a4cf7b3493bdc945c14742542b5c1a17

1 file changed with 31 insertions and 27 deletions:

bin/curvecalc

0 comments (0 inline, 0 general)

bin/curvecalc

➞

Show inline comments

@@ @@ -313,51 +313,25 @@ class MaxTime(object): @@
         song = self.graph.value(self.session, L9['currentSong'])
         if song is None:
             self.maxtime = 0
             return
         musicfilename = showconfig.songOnDisk(song)
         self.maxtime = wavelength(musicfilename)
         log.info("new max time %r", self.maxtime)
         dispatcher.send("max time", maxtime=self.maxtime)
     def get(self):
         return self.maxtime
 def main():
     startTime = time.time()
     parser = optparse.OptionParser()
     parser.set_usage("%prog [opts] [songURI]")
     parser.add_option("--sliders", action='store_true',
                       help='use hardware sliders')
     parser.add_option("--skip-music", action='store_true',
                       help="ignore music and smooth_music curve files")
     parser.add_option("--debug", action="store_true",
                       help="log at DEBUG")
     parser.add_option("--reload", action="store_true",
                       help="live reload of themes and code")
     parser.add_option("--startup-only", action='store_true',
                       help="quit after loading everything (for timing tests)")
     clientsession.add_option(parser)
     opts, args = parser.parse_args()
     logging.basicConfig(format="%(asctime)s %(levelname)-5s %(name)s %(filename)s:%(lineno)d: %(message)s")
     log.setLevel(logging.DEBUG if opts.debug else logging.INFO)
     log.debug("startup: music %s", time.time() - startTime)
     session = clientsession.getUri('curvecalc', opts)
     music = Music()
     graph = SyncedGraph("curvecalc")
 def launch(args, graph, session, opts, startTime, music):
     try:
         song = URIRef(args[0])
         graph.patchObject(context=session,
                           subject=session,
                           predicate=L9['currentSong'],
                           newObject=song)
     except IndexError:
         pass
     curveset = Curveset(sliders=opts.sliders)
     subterms = []
@@ @@ -396,17 +370,47 @@ def main(): @@
                 times = [t for listener, t in results if t is not None]
                 if not times:
                     request.setResponseCode(404)
                     return "not hovering over any time"
                 with graph.currentState() as g:
                     song = g.value(session, L9['currentSong'])
                     return json.dumps({"song": song, "hoverTime" : times[0]})
             raise NotImplementedError()
     reactor.listenTCP(networking.curveCalc.port,
                       server.Site(Hover()))
 def main():
     startTime = time.time()
     parser = optparse.OptionParser()
     parser.set_usage("%prog [opts] [songURI]")
     parser.add_option("--sliders", action='store_true',
                       help='use hardware sliders')
     parser.add_option("--skip-music", action='store_true',
                       help="ignore music and smooth_music curve files")
     parser.add_option("--debug", action="store_true",
                       help="log at DEBUG")
     parser.add_option("--reload", action="store_true",
                       help="live reload of themes and code")
     parser.add_option("--startup-only", action='store_true',
                       help="quit after loading everything (for timing tests)")
     clientsession.add_option(parser)
     opts, args = parser.parse_args()
     logging.basicConfig(format="%(asctime)s %(levelname)-5s %(name)s %(filename)s:%(lineno)d: %(message)s")
     log.setLevel(logging.DEBUG if opts.debug else logging.INFO)
     log.debug("startup: music %s", time.time() - startTime)
     session = clientsession.getUri('curvecalc', opts)
     music = Music()
     graph = SyncedGraph("curvecalc")
     graph.initiallySynced.addCallback(
         lambda _: launch(args, graph, session, opts, startTime, music))
     prof.run(reactor.run, profile=False)
 prof.run(main, profile=False)

0 comments (0 inline, 0 general)