light9 Changeset - a301a0039c66

Changeset - a301a0039c66

Parent rev.

Child rev.

[Not reviewed]

default

0 7 1

Drew Perttula - 13 years ago 2012-06-05 20:40:35
drewp@bigasterisk.com

buildout and rdflib updates
Ignore-this: 912b5b138f73771434f6cc1b077841c0

8 files changed with 31 insertions and 10 deletions:

bin/ascoltami

bin/ascoltami2

bin/curvecalc

bin/dmxserver

buildout.cfg

light9/Submaster.py

light9/showconfig.py

show/dance2011/config.n3

0 comments (0 inline, 0 general)

bin/ascoltami

➞

Show inline comments

-#!/usr/bin/env python
 #!bin/python
 # this is a fork from semprini/ascotalmi to use mpd
 """ a separate player program from Semprini.py. name means 'listen to
 me' in italian.

bin/ascoltami2

➞

Show inline comments

-#!/usr/bin/python
 #!bin/python
 import web, thread, gobject, sys, optparse, logging
 from rdflib import URIRef
 sys.path.append(".")
 from light9.ascoltami.player import Player
 from light9.ascoltami.playlist import Playlist, NoSuchSong
 from light9.ascoltami.webapp import makeWebApp

bin/curvecalc

➞

Show inline comments

-#!/usr/bin/python
 #!bin/python
 """
 now launches like this:
 % bin/curvecalc http://light9.bigasterisk.com/show/dance2007/song1
@@ @@ -23,13 +23,13 @@ from twisted.web.client import Agent @@
 from twisted.internet.protocol import Protocol
 from twisted.internet.defer import Deferred
 from zope.interface import implements
 from twisted.internet.defer import succeed
 from twisted.web.iweb import IBodyProducer
 from rdflib import Literal, URIRef, RDF, RDFS
-from rdflib.Graph import Graph
 from rdflib import Graph
 import rdflib
 import logging
 log = logging.getLogger()
 import run_local
 from light9 import Submaster, dmxclient, networking, showconfig, prof, Patch
@@ @@ -497,13 +497,13 @@ def createHelpLines(root): @@
         line = tk.Label(root, text=helpline, font="Helvetica -12 italic",
                         anchor='w')
         line.pack(side='top',fill='x')
 def currentlyPlayingSong():
     """ask the music player what song it's on"""
-    t = jsonlib.read(restkit.Resource(networking.musicUrl()).get("time").body)
+    t = jsonlib.read(restkit.Resource(networking.musicPlayer.url).get("time").body)
     if t['song'] is None:
         raise ValueError("music player is not playing any song")
     return URIRef(t['song'])
 def main():
     startTime = time.time()

bin/dmxserver

➞

Show inline comments

-#!/usr/bin/python
 #!bin/python
 """
 this is the only process to talk to the dmx hardware. other clients
 can connect to this server and present dmx output, and this server
 will max ('pile-on') all the client requests.

buildout.cfg

➞

Show inline comments

@@ new file 100644 @@
 [buildout]
 parts = external_libs
 bin-directory = bin
 download-cache = /tmp/
 [external_libs]
 recipe = zc.recipe.egg
 eggs = web.py==0.36
        cyclone==1.0-rc4
        rdflib==3.2.1
        restkit==4.1.2
 python = python
 interpreter = python
 extra-paths =
 [python]
 executable = /usr/bin/python2.7

light9/Submaster.py

➞

Show inline comments

 from __future__ import division
 import os, logging
-from rdflib.Graph import Graph
 from rdflib import Graph
 from rdflib import RDFS, Literal, BNode
 from light9.namespaces import L9, XSD
 from light9.TLUtility import dict_scale, dict_max
 from light9 import Patch, showconfig
 try:
     import dispatch.dispatcher as dispatcher

light9/showconfig.py

➞

Show inline comments

 import time, logging
 from os import path, getenv
-from rdflib.Graph import Graph
 from rdflib import Graph
 from rdflib import URIRef
 from namespaces import MUS, L9
 log = logging.getLogger('showconfig')
 _config = (None, None, None) # graph, mtime, len
 def getGraph():

show/dance2011/config.n3

➞

Show inline comments

@@ @@ -16,14 +16,14 @@ show:dance2011 :playList ( @@
   sh:song11 sh:song12 sh:song13 sh:song14 sh:song15
   sh:song16 sh:song17
 ) .
 show:dance2011 :networking sh:netHome .
 sh:netHome
   :musicPlayer <http://plus:8040/>;
   :dmxServer <http://plus:8030/>;
   :musicPlayer <http://dash:8040/>;
   :dmxServer <http://dash:8030/>;
   :keyboardComposer <http://dash:8050/> .
 :Song is rdf:type of sh:song1, sh:song2, sh:song3, sh:song4,
    sh:song5, sh:song6, sh:song7, sh:song8, sh:song9, sh:song10,
    sh:song11, sh:song12, sh:song13, sh:song14, sh:song15, sh:song16,
    sh:song17 .

0 comments (0 inline, 0 general)