diff --git a/bin/curvecalc b/bin/curvecalc --- a/bin/curvecalc +++ b/bin/curvecalc @@ -41,7 +41,7 @@ from light9.editchoicegtk import EditCho from light9.gtkpyconsole import togglePyConsole from light9.namespaces import L9 from light9.observable import Observable -from rdfdb import clientsession +from light9 import clientsession from rdfdb.patch import Patch from rdfdb.syncedgraph import SyncedGraph from light9.wavelength import wavelength diff --git a/bin/effectsequencer b/bin/effectsequencer --- a/bin/effectsequencer +++ b/bin/effectsequencer @@ -13,7 +13,7 @@ import optparse, sys, logging import cyclone.web from rdflib import URIRef from light9.effect.sequencer import Sequencer, sendToCollector -from rdfdb import clientsession +from light9 import clientsession class App(object): def __init__(self, show, session): diff --git a/bin/inputdemo b/bin/inputdemo --- a/bin/inputdemo +++ b/bin/inputdemo @@ -9,7 +9,7 @@ import optparse, logging, urllib, time from gi.repository import Gtk from run_local import log from light9 import showconfig, networking -from rdfdb import clientsession +from light9 import clientsession from rdfdb.syncedgraph import SyncedGraph import cyclone.httpclient from light9.curvecalc.client import sendLiveInputPoint diff --git a/bin/keyboardcomposer b/bin/keyboardcomposer --- a/bin/keyboardcomposer +++ b/bin/keyboardcomposer @@ -17,7 +17,7 @@ from light9 import showconfig, networkin from light9.uihelpers import toplevelat from light9.namespaces import L9, RDF, RDFS from light9.tkdnd import initTkdnd, dragSourceRegister, dropTargetRegister -from rdfdb import clientsession +from light9 import clientsession from rdfdb.syncedgraph import SyncedGraph from light9.effect.sequencer import CodeWatcher import light9.effect.effecteval diff --git a/bin/paintserver b/bin/paintserver --- a/bin/paintserver +++ b/bin/paintserver @@ -11,7 +11,7 @@ from greplin import scales import optparse, sys, logging import cyclone.web from rdflib import URIRef -from rdfdb import clientsession +from light9 import clientsession import light9.paint.solve from lib.cycloneerr import PrettyErrorHandler from light9.namespaces import RDF, L9, DEV diff --git a/bin/subcomposer b/bin/subcomposer --- a/bin/subcomposer +++ b/bin/subcomposer @@ -34,7 +34,7 @@ from light9 import dmxclient, Submaster, from light9.Patch import get_channel_name from light9.uihelpers import toplevelat from rdfdb.syncedgraph import SyncedGraph -from rdfdb import clientsession +from light9 import clientsession from light9.tkdnd import initTkdnd from light9.namespaces import L9 from rdfdb.patch import Patch diff --git a/light9/clientsession.py b/light9/clientsession.py new file mode 100644 --- /dev/null +++ b/light9/clientsession.py @@ -0,0 +1,17 @@ +""" +some clients will support the concept of a named session that keeps +multiple instances of that client separate +""" +from rdflib import URIRef +from urllib import quote +from light9 import showconfig + +def add_option(parser): + parser.add_option( + '-s', '--session', + help="name of session used for levels and window position", + default='default') + +def getUri(appName, opts): + return URIRef("%s/sessions/%s/%s" % (showconfig.showUri(), appName, + quote(opts.session, safe='')))