--- a/bin/dmx-web.py Sat Jun 07 16:23:16 2014 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-#!/usr/bin/env python
-
-import pvl.args
-import pvl.web.args
-import qmsk.dmx
-import qmsk.dmx.web
-
-import logging; log = logging.getLogger('dmx')
-
-import optparse
-
-def dmx_universe (options, dmx) :
- from qmsk.dmx import heads
-
- return heads.Universe(dmx, {
- 'ledpar': heads.Stairville_LEDPar56(1),
- 'par1': heads.Dimmer(5),
- 'par2': heads.Dimmer(6),
- 'ledbar_roof': heads.AmericanDJ_MegaTri60_Mode2(10),
- 'ledbar_floor': heads.AmericanDJ_MegaTri60_Mode2(20),
- })
-
-def main (argv) :
- """
- DMX web control.
- """
-
- parser = optparse.OptionParser(main.__doc__)
- parser.add_option_group(pvl.args.parser(parser))
- parser.add_option_group(pvl.web.args.parser(parser))
-
- parser.add_option('--dmx-serial', default=None,
- help="Path to /dev/tty*")
-
- options, args = parser.parse_args(argv[1:])
-
- pvl.args.apply(options)
-
- # dmx
- if options.dmx_serial :
- dmx = qmsk.dmx.DMX.open(options.dmx_serial)
- #dmx.zero()
- else :
- dmx = None
-
- universe = dmx_universe(options, dmx)
-
- # app
- app = qmsk.dmx.web.DMXWebApplication(universe)
-
- pvl.web.args.main(options, app)
-
-if __name__ == '__main__':
- pvl.args.main(main)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/qmsk.dmx-web Sat Jun 07 16:23:30 2014 +0300
@@ -0,0 +1,52 @@
+#!/usr/bin/env python3.4
+
+import qmsk.args
+import qmsk.web.args
+import qmsk.dmx
+import qmsk.dmx.web
+
+import logging; log = logging.getLogger('dmx')
+
+import argparse
+
+def dmx_universe (options, dmx) :
+ from qmsk.dmx import heads
+
+ return heads.Universe({
+ 'ledpar': heads.Stairville_LEDPar56(1),
+ 'par1': heads.Dimmer(5),
+ 'par2': heads.Dimmer(6),
+ 'ledbar_roof': heads.AmericanDJ_MegaTri60_Mode2(10),
+ 'ledbar_floor': heads.AmericanDJ_MegaTri60_Mode2(20),
+ }, dmx)
+
+def main (argv) :
+ """
+ DMX web control.
+ """
+
+ parser = qmsk.args.parser(description=main.__doc__)
+ qmsk.web.args.options(parser, static='static')
+
+ parser.add_argument('--dmx-serial', default=None,
+ help="Path to /dev/tty*")
+
+ args = qmsk.args.parse(parser, argv)
+
+ # dmx
+ if args.dmx_serial :
+ dmx = qmsk.dmx.DMX.open(args.dmx_serial)
+ #dmx.zero()
+ else :
+ dmx = None
+
+ universe = dmx_universe(args, dmx)
+
+ # Web app
+ application = qmsk.web.args.apply(args, qmsk.dmx.web.DMXWebApplication, universe)
+
+ # Run application
+ return qmsk.web.args.main(args, application)
+
+if __name__ == '__main__':
+ qmsk.args.main(main)