split out idlers into Seperate file

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

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 7021622..6d79b51 100755 (executable)
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -12,6 +12,7 @@ from VendingMachine import VendingMachine
 from ConfigParser import ConfigParser
 from HorizScroll import HorizScroll
 from random import random, seed
+from Idler import TrainIdler,GrayIdler
 
 GREETING = 'UCC SNACKS'
 PIN_LENGTH = 4
@@ -122,65 +123,6 @@ def door_open_mode(vending_machine):
                                sleep(1)
                                return
 
-class Idler:
-       def __init__(self, v):
-               self.idle_state = 0
-               self.v = v
-
-       def put_shark(self, s, l):
-               if self.s[l] == ' ':
-                       self.s[l] = s
-               elif self.s[l] == 'X':
-                       self.s[l] = '*'
-               else:
-                       self.s[l] = 'X'
-
-       def next(self):
-               # does the next stage of a dance
-               self.s = [' ']*10
-               shark1 = self.idle_state % 18
-               if shark1 < 9:
-                       self.put_shark('^', shark1)
-               else:
-                       self.put_shark('^', 18-shark1)
-
-               shark2 = ((self.idle_state+4) % 36)/2
-               if shark2 < 9:
-                       self.put_shark('<', shark2)
-               else:
-                       self.put_shark('<', 18-shark2)
-
-               shark3 = ((self.idle_state+7) % 54)/3
-               if shark3 < 9:
-                       self.put_shark('>', 9-shark3)
-               else:
-                       self.put_shark('>', 9-(18-shark3))
-
-               train1 = ((self.idle_state%(18*36)))
-               train1_start = 122
-               if train1 > train1_start and train1 < train1_start+(10*2):
-                       for i in range(5):
-                               ptr = i+train1-train1_start-5
-                               if ptr >= 0 and ptr < 10: self.s[ptr] = '#'
-
-               train2 = ((self.idle_state%(18*36)))
-               train2_start = 400
-               if train2 > train2_start and train2 < train2_start+(10*2):
-                       for i in range(5):
-                               ptr = i+train2-train2_start-5
-                               if ptr >= 0 and ptr < 10: self.s[9-ptr] = '#'
-
-               train3 = ((self.idle_state%(18*36)))
-               train3_start = 230
-               if train3 > train3_start and train3 < train3_start+(10*2):
-                       for i in range(10):
-                               ptr = i+train3-train3_start-10
-                               if ptr >= 0 and ptr < 10: self.s[ptr] = '-'
-
-               self.v.display(string.join(self.s, ''))
-               self.idle_state += 1
-               self.idle_state %= 18*36*54
-
 def cookie(v):
        seed(time())
        messages = ['  WASSUP! ', 'PINK FISH ', ' SECRETS ', '  ESKIMO  ', ' FORTUNES ', 'MORE MONEY']
@@ -286,7 +228,9 @@ if __name__ == '__main__':
        mk = MessageKeeper(v)
        mk.set_message(GREETING)
        time_to_autologout = None
-       idler = Idler(v)
+       #idler = TrainIdler(v)
+       #idler = GrayIdler(v)
+       idler = GrayIdler(v,one="*",zero="-")
        time_to_idle = None
        last_timeout_refresh = None