add support for one shot Idlers

[uccvend-vendserver.git] / sql-edition / servers / VendServer.py

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 8942855..eda4dc9 100755 (executable)
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -4,7 +4,7 @@
 USE_DB = 0
 
 import ConfigParser
 USE_DB = 0
 
 import ConfigParser

-import sys, os, string, re, pwd, signal
+import sys, os, string, re, pwd, signal, math

 import logging, logging.handlers
 from traceback import format_tb
 if USE_DB: import pg
 import logging, logging.handlers
 from traceback import format_tb
 if USE_DB: import pg


@@ -15,7 +15,7 @@ from VendingMachine import VendingMachine, VendingException
 from MessageKeeper import MessageKeeper
 from HorizScroll import HorizScroll
 from random import random, seed
 from MessageKeeper import MessageKeeper
 from HorizScroll import HorizScroll
 from random import random, seed

-from Idler import TrainIdler,GrayIdler,StringIdler
+from Idler import TrainIdler,GrayIdler,StringIdler,ClockIdler

 import socket
 from posix import geteuid
 
 import socket
 from posix import geteuid
 


@@ -26,6 +26,13 @@ Mark Tearle
 Nick Bannon
 Cameron Patrick
 and a collective of hungry alpacas.
 Nick Bannon
 Cameron Patrick
 and a collective of hungry alpacas.

+
+
+
+For a good time call +61 8 6488 3901
+
+
+

 """
 
 GREETING = 'UCC SNACKS'
 """
 
 GREETING = 'UCC SNACKS'


@@ -178,11 +185,15 @@ def center(str):
 
 idlers = []
 idler = None
 
 idlers = []
 idler = None

+

 def setup_idlers(v):
        global idlers, idler
        idlers = [
 def setup_idlers(v):
        global idlers, idler
        idlers = [

+               ClockIdler(v),

                StringIdler(v),
                StringIdler(v, text=CREDITS),
                StringIdler(v),
                StringIdler(v, text=CREDITS),

+               StringIdler(v, text=str(math.pi) + "            "),
+               StringIdler(v, text=str(math.e) + "            "),

                GrayIdler(v),
                TrainIdler(v),
                GrayIdler(v,one="*",zero="-"),
                GrayIdler(v),
                TrainIdler(v),
                GrayIdler(v,one="*",zero="-"),


@@ -201,6 +212,8 @@ def choose_idler():
 
 def idle_step():
        global idler
 
 def idle_step():
        global idler

+       if idler.finished():
+               choose_idler()

        idler.next()
 
 def run_forever(rfh, wfh, options, cf):
        idler.next()
 
 def run_forever(rfh, wfh, options, cf):