X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FIdler.py;h=5fe61cf02ea860809089429c5ec926fb8ae4dd99;hp=a231d96a1e63fdd0c51db2c0cc2d613f4bfb0780;hb=247e57bba8f0d39711887737bd171a68ec977fa3;hpb=33cd17ec630302925f6b36fcc45923c882a970f5

diff --git a/sql-edition/servers/Idler.py b/sql-edition/servers/Idler.py
index a231d96..5fe61cf 100755
--- a/sql-edition/servers/Idler.py
+++ b/sql-edition/servers/Idler.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import string, time
+import string, time, popen2, os
 from random import random
 from MessageKeeper import MessageKeeper
 
@@ -19,6 +19,9 @@ class Idler:
 	def finished(self):
 		return False
 
+	def affinity(self):
+		return 1
+
 class TrainIdler(Idler):
 	def __init__(self, v):
 		self.idle_state = 0
@@ -186,12 +189,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):
@@ -213,6 +216,9 @@ class StringIdler(Idler):
 	def next(self):
 		self.mk.update_display()
 
+	def finished(self):	
+		return self.mk.done()
+
 class ClockIdler(Idler):
 	def __init__(self, v):
 		self.v = v
@@ -223,3 +229,33 @@ class ClockIdler(Idler):
 		if output != self.last:
 			self.v.display(" %8.8s " % (output))
 			self.last = output
+
+	def affinity(self):
+		return 3 
+
+class FortuneIdler(StringIdler):
+	def __init__(self, v):
+		fortune = "/usr/games/fortune"
+		text = "I broke my wookie...."
+		if os.access(fortune,os.F_OK|os.X_OK):
+			(stdout, stdin) = popen2.popen2(fortune)
+			text = string.join(stdout.readlines())
+			stdout.close()
+			stdin.close()
+		StringIdler.__init__(self, v, text,repeat=False)
+
+	def affinity(self):
+		return 20
+
+class FileIdler(StringIdler):
+	def __init__(self, v, thefile=None, repeat=False):
+		text = "I broke my wookie...."
+
+		if file and os.access(thefile,os.F_OK|os.R_OK):
+			f = file(thefile,'r')
+			text = string.join(f.readlines())
+			f.close()
+		StringIdler.__init__(self, v, text,repeat=repeat)
+
+	def affinity(self):
+		return 8