X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=sql-edition%2Fservers%2FIdler.py;h=392da6b3b3c9ed36f81e83d04ee952e2c23ea338;hb=e98c4f3df5b2b7dd54a90902605c72bd41a53272;hp=48e819a46fa8869d84b91d391f0204ed37f30a7a;hpb=ce75000d4e6f38c8143c1eb0cafe2756d903c6ed;p=uccvend-vendserver.git

diff --git a/sql-edition/servers/Idler.py b/sql-edition/servers/Idler.py
index 48e819a..392da6b 100755
--- a/sql-edition/servers/Idler.py
+++ b/sql-edition/servers/Idler.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import string
+import string, time
 from random import random
 from MessageKeeper import MessageKeeper
 
@@ -15,6 +15,9 @@ class Idler:
 
 	def reset(self):
 		pass
+	
+	def finished(self):
+		return False
 
 class TrainIdler(Idler):
 	def __init__(self, v):
@@ -183,12 +186,12 @@ class GrayIdler(Idler):
 
 
 class StringIdler(Idler):
-	def __init__(self, v, text="Hello Cruel World!  "):
+	def __init__(self, v, text="Hello Cruel World!  ",repeat=True):
 		self.v = v
 		self.mk = MessageKeeper(v)
-		self.text = self.clean_text(text)
+		self.text = self.clean_text(text) + "          "
 		
-		msg = [("",False, None),(self.text, True, 0.8)]
+		msg = [("",False, None),(self.text, repeat, 0.8)]
 		self.mk.set_messages(msg)
 
 	def clean_text(self, text):
@@ -210,6 +213,16 @@ class StringIdler(Idler):
 	def next(self):
 		self.mk.update_display()
 
-	def reset(self):
-		pass
-		#self.mk.update_display(forced=True)
+	def finished(self):	
+		return self.mk.done()
+
+class ClockIdler(Idler):
+	def __init__(self, v):
+		self.v = v
+		self.last = None
+
+	def next(self):
+		output = time.strftime("%H:%M:%S")
+		if output != self.last:
+			self.v.display(" %8.8s " % (output))
+			self.last = output