# HG changeset patch # User Drew Perttula # Date 2014-06-01 10:22:14 # Node ID 4595a82f5a903d8ed64f78bdb77b0f93bc0dbe78 # Parent 9937e2e3d17bf0c538e9aa683ed34aa85d7d5c45 effecteval has a delete button on effect rows Ignore-this: 6a66737cd6857d2f7be4ec382e4890 diff --git a/bin/effecteval b/bin/effecteval --- a/bin/effecteval +++ b/bin/effecteval @@ -20,9 +20,17 @@ sys.path.append("/my/proj/homeauto/lib") sys.path.append("/home/drewp/projects/homeauto/lib") from cycloneerr import PrettyErrorHandler -class EffectEdit(cyclone.web.RequestHandler): +class EffectEdit(PrettyErrorHandler, cyclone.web.RequestHandler): def get(self): self.write(open("light9/effecteval/effect.html").read()) + def delete(self): + graph = self.settings.graph + uri = URIRef(self.get_argument('uri')) + with graph.currentState(tripleFilter=(None, L9['effect'], uri)) as g: + song = ctx = list(g.subjects(L9['effect'], uri))[0] + self.settings.graph.patch(Patch(delQuads=[ + (song, L9['effect'], uri, ctx), + ])) class SongEffects(PrettyErrorHandler, cyclone.web.RequestHandler): def post(self): @@ -61,7 +69,7 @@ class SongEffectsUpdates(cyclone.websock out = [] for s in songs: out.append({'uri': s, 'label': self.graph.label(s)}) - out[-1]['effects'] = sorted(self.graph.objects(s, L9['effect'])) + out[-1]['effects'] = [{'uri': uri} for uri in sorted(self.graph.objects(s, L9['effect']))] self.sendMessage({'songs': out}) diff --git a/light9/effecteval/index.coffee b/light9/effecteval/index.coffee --- a/light9/effecteval/index.coffee +++ b/light9/effecteval/index.coffee @@ -12,8 +12,18 @@ model.drop = (uri, event) -> dropped = (songTargetUri, dropUri) -> $.post('songEffects', {uri: songTargetUri, drop: dropUri}) +deleteEffect = (uri) -> + $.ajax + type: 'DELETE' + url: 'effect?' + $.param({uri: uri}) + console.log("del", uri) + reconnectingWebSocket "ws://localhost:8070/songEffectsUpdates", (msg) -> - console.log(msg.songs) + for s in msg.songs + for e in s.effects + do (e) -> + e.deleteEffect = -> deleteEffect(e.uri) + model.songs(msg.songs) ko.applyBindings(model) diff --git a/light9/effecteval/index.html b/light9/effecteval/index.html --- a/light9/effecteval/index.html +++ b/light9/effecteval/index.html @@ -14,7 +14,9 @@ Song