Mercurial > code > home > repos > light9
changeset 1692:6fa4288da8a6
rdfdb is its own package now
Ignore-this: 6b0b51464911b955687fefe6454fb91b
| author | drewp@bigasterisk.com |
|---|---|
| date | Wed, 21 Mar 2018 08:31:45 +0000 |
| parents | a18eb09762b7 |
| children | 53f751982ddf |
| files | bin/captureDevice bin/clientdemo bin/collector bin/curvecalc bin/effecteval bin/effectsequencer bin/gtk_dnd_demo.py bin/homepageConfig bin/inputdemo bin/inputquneo bin/keyboardcomposer bin/listsongs bin/paintserver bin/rdfdb bin/subcomposer bin/subserver bin/vidref bin/vidrefsetup light9/Submaster.py light9/collector/collector_test.py light9/curvecalc/curve.py light9/curvecalc/subterm.py light9/effect/edit.py light9/effect/settings.py light9/effect/settings_test.py light9/paint/capture.py light9/paint/solve_test.py requirements.txt |
| diffstat | 28 files changed, 48 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
--- a/bin/captureDevice Sun Feb 18 08:05:04 2018 +0000 +++ b/bin/captureDevice Wed Mar 21 08:31:45 2018 +0000 @@ -17,12 +17,12 @@ from light9.namespaces import L9, RDF from light9 import networking, showconfig -from light9.rdfdb.syncedgraph import SyncedGraph +from rdfdb.syncedgraph import SyncedGraph from light9.paint.capture import writeCaptureDescription from light9.greplin_cyclone import StatsForCyclone from light9.effect.settings import DeviceSettings from light9.effect.sequencer import sendToCollector -from light9.rdfdb.patch import Patch +from rdfdb.patch import Patch stats = scales.collection('/webServer', scales.PmfStat('setAttr'))
--- a/bin/clientdemo Sun Feb 18 08:05:04 2018 +0000 +++ b/bin/clientdemo Wed Mar 21 08:31:45 2018 +0000 @@ -6,8 +6,8 @@ import cyclone.web, cyclone.httpclient, logging from rdflib import Namespace, Literal, URIRef from light9 import networking -from light9.rdfdb.patch import Patch -from light9.rdfdb.syncedgraph import SyncedGraph +from rdfdb.patch import Patch +from rdfdb.syncedgraph import SyncedGraph if __name__ == "__main__": logging.basicConfig(level=logging.DEBUG)
--- a/bin/collector Sun Feb 18 08:05:04 2018 +0000 +++ b/bin/collector Wed Mar 21 08:31:45 2018 +0000 @@ -25,7 +25,7 @@ from light9.collector.collector import Collector from light9.namespaces import L9 from light9 import networking -from light9.rdfdb.syncedgraph import SyncedGraph +from rdfdb.syncedgraph import SyncedGraph from light9.greplin_cyclone import StatsForCyclone def parseJsonMessage(msg):
--- a/bin/curvecalc Sun Feb 18 08:05:04 2018 +0000 +++ b/bin/curvecalc Wed Mar 21 08:31:45 2018 +0000 @@ -41,9 +41,9 @@ from light9.gtkpyconsole import togglePyConsole from light9.namespaces import L9 from light9.observable import Observable -from light9.rdfdb import clientsession -from light9.rdfdb.patch import Patch -from light9.rdfdb.syncedgraph import SyncedGraph +from rdfdb import clientsession +from rdfdb.patch import Patch +from rdfdb.syncedgraph import SyncedGraph from light9.wavelength import wavelength class SubtermExists(ValueError):
--- a/bin/effecteval Sun Feb 18 08:05:04 2018 +0000 +++ b/bin/effecteval Wed Mar 21 08:31:45 2018 +0000 @@ -16,8 +16,8 @@ from light9.effecteval.effectloop import makeEffectLoop from light9.greplin_cyclone import StatsForCyclone from light9.namespaces import L9 -from light9.rdfdb.patch import Patch -from light9.rdfdb.syncedgraph import SyncedGraph +from rdfdb.patch import Patch +from rdfdb.syncedgraph import SyncedGraph from greplin import scales from lib.cycloneerr import PrettyErrorHandler
--- a/bin/effectsequencer Sun Feb 18 08:05:04 2018 +0000 +++ b/bin/effectsequencer Wed Mar 21 08:31:45 2018 +0000 @@ -6,14 +6,14 @@ from run_local import log from twisted.internet import reactor from light9.greplin_cyclone import StatsForCyclone -from light9.rdfdb.syncedgraph import SyncedGraph +from rdfdb.syncedgraph import SyncedGraph from light9 import networking, showconfig from greplin import scales import optparse, sys, logging import cyclone.web from rdflib import URIRef from light9.effect.sequencer import Sequencer, sendToCollector -from light9.rdfdb import clientsession +from rdfdb import clientsession class App(object): def __init__(self, show, session):
--- a/bin/gtk_dnd_demo.py Sun Feb 18 08:05:04 2018 +0000 +++ b/bin/gtk_dnd_demo.py Wed Mar 21 08:31:45 2018 +0000 @@ -7,7 +7,7 @@ from light9 import networking from light9.editchoicegtk import EditChoice, Local from light9.observable import Observable -from light9.rdfdb.syncedgraph import SyncedGraph +from rdfdb.syncedgraph import SyncedGraph win = gtk.Window()
--- a/bin/homepageConfig Sun Feb 18 08:05:04 2018 +0000 +++ b/bin/homepageConfig Wed Mar 21 08:31:45 2018 +0000 @@ -6,7 +6,7 @@ from urlparse import urlparse from urllib import splitport -from light9.rdfdb.syncedgraph import SyncedGraph +from rdfdb.syncedgraph import SyncedGraph from twisted.internet import reactor graph = showconfig.getGraph()
--- a/bin/inputdemo Sun Feb 18 08:05:04 2018 +0000 +++ b/bin/inputdemo Wed Mar 21 08:31:45 2018 +0000 @@ -9,8 +9,8 @@ from gi.repository import Gtk from run_local import log from light9 import showconfig, networking -from light9.rdfdb import clientsession -from light9.rdfdb.syncedgraph import SyncedGraph +from rdfdb import clientsession +from rdfdb.syncedgraph import SyncedGraph import cyclone.httpclient from light9.curvecalc.client import sendLiveInputPoint
--- a/bin/inputquneo Sun Feb 18 08:05:04 2018 +0000 +++ b/bin/inputquneo Wed Mar 21 08:31:45 2018 +0000 @@ -10,7 +10,7 @@ from twisted.internet import reactor, task from light9.curvecalc.client import sendLiveInputPoint from light9.namespaces import L9, RDF, RDFS -from light9.rdfdb.syncedgraph import SyncedGraph +from rdfdb.syncedgraph import SyncedGraph from light9 import networking import sys
--- a/bin/keyboardcomposer Sun Feb 18 08:05:04 2018 +0000 +++ b/bin/keyboardcomposer Wed Mar 21 08:31:45 2018 +0000 @@ -17,12 +17,12 @@ from light9.uihelpers import toplevelat from light9.namespaces import L9, RDF, RDFS from light9.tkdnd import initTkdnd, dragSourceRegister, dropTargetRegister -from light9.rdfdb import clientsession -from light9.rdfdb.syncedgraph import SyncedGraph +from rdfdb import clientsession +from rdfdb.syncedgraph import SyncedGraph from light9.effect.sequencer import CodeWatcher import light9.effect.effecteval from light9.effect.settings import DeviceSettings -from light9.rdfdb.patch import Patch +from rdfdb.patch import Patch from bcf2000 import BCF2000
--- a/bin/listsongs Sun Feb 18 08:05:04 2018 +0000 +++ b/bin/listsongs Wed Mar 21 08:31:45 2018 +0000 @@ -13,7 +13,7 @@ from rdflib import RDF from light9 import networking from light9.namespaces import L9 -from light9.rdfdb.syncedgraph import SyncedGraph +from rdfdb.syncedgraph import SyncedGraph graph = SyncedGraph(networking.rdfdb.url, "listsongs")
--- a/bin/paintserver Sun Feb 18 08:05:04 2018 +0000 +++ b/bin/paintserver Wed Mar 21 08:31:45 2018 +0000 @@ -5,13 +5,13 @@ import json from twisted.internet import reactor from light9.greplin_cyclone import StatsForCyclone -from light9.rdfdb.syncedgraph import SyncedGraph +from rdfdb.syncedgraph import SyncedGraph from light9 import networking, showconfig from greplin import scales import optparse, sys, logging import cyclone.web from rdflib import URIRef -from light9.rdfdb import clientsession +from rdfdb import clientsession import light9.paint.solve from lib.cycloneerr import PrettyErrorHandler from light9.namespaces import RDF, L9, DEV
--- a/bin/rdfdb Sun Feb 18 08:05:04 2018 +0000 +++ b/bin/rdfdb Wed Mar 21 08:31:45 2018 +0000 @@ -117,12 +117,12 @@ sys.path.append(".") 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 rdfdb.graphfile import GraphFile +from rdfdb.patch import Patch, ALLSTMTS +from rdfdb.rdflibpatch import patchQuads +from rdfdb.file_vs_uri import correctToTopdirPrefix, fileForUri, uriFromFile +from rdfdb.patchsender import sendPatch +from rdfdb.patchreceiver import makePatchEndpointPutMethod from twisted.internet.inotify import INotify from run_local import log
--- a/bin/subcomposer Sun Feb 18 08:05:04 2018 +0000 +++ b/bin/subcomposer Wed Mar 21 08:31:45 2018 +0000 @@ -32,11 +32,11 @@ from light9.Patch import get_channel_name from light9.uihelpers import toplevelat -from light9.rdfdb.syncedgraph import SyncedGraph -from light9.rdfdb import clientsession +from rdfdb.syncedgraph import SyncedGraph +from rdfdb import clientsession from light9.tkdnd import initTkdnd from light9.namespaces import L9 -from light9.rdfdb.patch import Patch +from rdfdb.patch import Patch from light9.observable import Observable from light9.editchoice import EditChoice, Local from light9.subcomposer import subcomposerweb
--- a/bin/subserver Sun Feb 18 08:05:04 2018 +0000 +++ b/bin/subserver Wed Mar 21 08:31:45 2018 +0000 @@ -10,8 +10,8 @@ import cyclone.web, cyclone.httpclient, cyclone.websocket from rdflib import RDF, URIRef, Literal import pyjade.utils -from light9.rdfdb.syncedgraph import SyncedGraph -from light9.rdfdb.patch import Patch +from rdfdb.syncedgraph import SyncedGraph +from rdfdb.patch import Patch from light9.namespaces import L9, DCTERMS from light9 import networking, showconfig
--- a/bin/vidref Sun Feb 18 08:05:04 2018 +0000 +++ b/bin/vidref Wed Mar 21 08:31:45 2018 +0000 @@ -13,7 +13,7 @@ from light9 import networking, showconfig from light9.vidref.main import Gui from light9.vidref.replay import snapshotDir -from light9.rdfdb.syncedgraph import SyncedGraph +from rdfdb.syncedgraph import SyncedGraph # find replay dirs correctly. show multiple # replays. trash. reorder/pin. dump takes that are too short; they're
--- a/bin/vidrefsetup Sun Feb 18 08:05:04 2018 +0000 +++ b/bin/vidrefsetup Wed Mar 21 08:31:45 2018 +0000 @@ -9,8 +9,8 @@ import cyclone.web, cyclone.httpclient, cyclone.websocket from rdflib import RDF, URIRef, Literal import pyjade.utils -from light9.rdfdb.syncedgraph import SyncedGraph -from light9.rdfdb.patch import Patch +from rdfdb.syncedgraph import SyncedGraph +from rdfdb.patch import Patch from light9.namespaces import L9, DCTERMS from light9 import networking, showconfig
--- a/light9/Submaster.py Sun Feb 18 08:05:04 2018 +0000 +++ b/light9/Submaster.py Wed Mar 21 08:31:45 2018 +0000 @@ -7,7 +7,7 @@ from light9 import showconfig from light9.Patch import resolve_name, get_dmx_channel, get_channel_uri, reload_data from louie import dispatcher -from light9.rdfdb.patch import Patch +from rdfdb.patch import Patch log = logging.getLogger('submaster') class Submaster(object):
--- a/light9/collector/collector_test.py Sun Feb 18 08:05:04 2018 +0000 +++ b/light9/collector/collector_test.py Wed Mar 21 08:31:45 2018 +0000 @@ -5,7 +5,7 @@ from light9.namespaces import L9, DEV from light9.collector.collector import Collector, outputMap -from light9.rdfdb.mock_syncedgraph import MockSyncedGraph +from rdfdb.mock_syncedgraph import MockSyncedGraph UDMX = Namespace('http://light9.bigasterisk.com/output/udmx/') DMX0 = Namespace('http://light9.bigasterisk.com/output/dmx0/')
--- a/light9/curvecalc/curve.py Sun Feb 18 08:05:04 2018 +0000 +++ b/light9/curvecalc/curve.py Wed Mar 21 08:31:45 2018 +0000 @@ -6,7 +6,7 @@ from rdflib import Literal from light9 import showconfig from light9.namespaces import L9, RDF, RDFS -from light9.rdfdb.patch import Patch +from rdfdb.patch import Patch log = logging.getLogger() # todo: move to config, consolidate with ascoltami, musicPad, etc
--- a/light9/curvecalc/subterm.py Sun Feb 18 08:05:04 2018 +0000 +++ b/light9/curvecalc/subterm.py Wed Mar 21 08:31:45 2018 +0000 @@ -4,7 +4,7 @@ import light9.Effects from light9 import Submaster, showconfig, prof from light9.Patch import get_dmx_channel -from light9.rdfdb.patch import Patch +from rdfdb.patch import Patch from light9.namespaces import L9 log = logging.getLogger()
--- a/light9/effect/edit.py Sun Feb 18 08:05:04 2018 +0000 +++ b/light9/effect/edit.py Wed Mar 21 08:31:45 2018 +0000 @@ -5,7 +5,7 @@ from light9 import networking from light9.namespaces import L9, RDF, RDFS -from light9.rdfdb.patch import Patch +from rdfdb.patch import Patch from light9.curvecalc.curve import CurveResource def clamp(x, lo, hi):
--- a/light9/effect/settings.py Sun Feb 18 08:05:04 2018 +0000 +++ b/light9/effect/settings.py Wed Mar 21 08:31:45 2018 +0000 @@ -8,7 +8,7 @@ import numpy from rdflib import URIRef, Literal from light9.namespaces import RDF, L9, DEV -from light9.rdfdb.patch import Patch +from rdfdb.patch import Patch import logging log = logging.getLogger('settings') from light9.collector.device import resolve
--- a/light9/effect/settings_test.py Sun Feb 18 08:05:04 2018 +0000 +++ b/light9/effect/settings_test.py Wed Mar 21 08:31:45 2018 +0000 @@ -1,7 +1,7 @@ import unittest from rdflib import Literal -from light9.rdfdb.patch import Patch -from light9.rdfdb.localsyncedgraph import LocalSyncedGraph +from rdfdb.patch import Patch +from rdfdb.localsyncedgraph import LocalSyncedGraph from light9.namespaces import RDF, L9, DEV from light9.effect.settings import DeviceSettings
--- a/light9/paint/capture.py Sun Feb 18 08:05:04 2018 +0000 +++ b/light9/paint/capture.py Wed Mar 21 08:31:45 2018 +0000 @@ -1,7 +1,7 @@ import os from rdflib import URIRef from light9 import showconfig -from light9.rdfdb.patch import Patch +from rdfdb.patch import Patch from light9.namespaces import L9, RDF from light9.paint.solve import loadNumpy
--- a/light9/paint/solve_test.py Sun Feb 18 08:05:04 2018 +0000 +++ b/light9/paint/solve_test.py Wed Mar 21 08:31:45 2018 +0000 @@ -3,7 +3,7 @@ import solve from rdflib import Namespace from light9.namespaces import RDF, L9, DEV -from light9.rdfdb.localsyncedgraph import LocalSyncedGraph +from rdfdb.localsyncedgraph import LocalSyncedGraph from light9.effect.settings import DeviceSettings class TestSolve(unittest.TestCase):