From f1172d85d0efd8deb638f6468930bba3386a5e6d Mon Sep 17 00:00:00 2001
From: bjschuma <bjschuma@gmail.com>
Date: Wed, 24 Feb 2010 19:16:57 -0500
Subject: [PATCH] Created a sorted list class

---
 src/core/bt/PriorityList.py |  9 ---------
 src/core/bt/scripting.py    |  5 +++--
 src/core/bt/slist.py        | 15 +++++++++++++++
 src/plugins/exec.py         |  9 +--------
 src/tests/test.py           |  4 ++++
 src/tests/test.scion        |  3 +++
 src/tests/test2.scion       |  2 ++
 src/tests/test3.scion       |  1 +
 8 files changed, 29 insertions(+), 19 deletions(-)
 delete mode 100644 src/core/bt/PriorityList.py
 create mode 100644 src/core/bt/slist.py
 create mode 100644 src/tests/test.py
 create mode 100644 src/tests/test.scion
 create mode 100644 src/tests/test2.scion
 create mode 100644 src/tests/test3.scion

diff --git a/src/core/bt/PriorityList.py b/src/core/bt/PriorityList.py
deleted file mode 100644
index f4c54fe6..00000000
--- a/src/core/bt/PriorityList.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /usr/bin/python
-
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
-
-__author__="bjschuma"
-__date__ ="$Feb 22, 2010 10:52:13 PM$"
-
-
diff --git a/src/core/bt/scripting.py b/src/core/bt/scripting.py
index 54a3e0e0..3f77f920 100644
--- a/src/core/bt/scripting.py
+++ b/src/core/bt/scripting.py
@@ -26,7 +26,7 @@ def add(script):
 
 def runScript(script):
 	# Run commands if the script is not a python script
-	if re.match("\w*\.py",script) == None:
+	if re.match("(\/|\w)*\.py",script) == None:
 		from bt import cmd
 		f = file.fopen(script)
 		for line in f:
@@ -34,6 +34,7 @@ def runScript(script):
 		f.close()
 	# Execute the script with the python interpreter as a backend
 	else:
+		write("Running python script: "+script,2)
 		execfile(script)
 
 
@@ -65,7 +66,7 @@ def isScript(script):
 	global scripts
 	write("Checking if file is a script: "+script,2)
 	for ext in extension:
-		if not re.match("\w*\."+ext,script) == None:
+		if not re.match("(\/|\w)*\."+ext,script) == None:
 			scripts += [script]
 
 
diff --git a/src/core/bt/slist.py b/src/core/bt/slist.py
new file mode 100644
index 00000000..2c711e89
--- /dev/null
+++ b/src/core/bt/slist.py
@@ -0,0 +1,15 @@
+
+__author__="bjschuma"
+__date__ ="$Feb 22, 2010 10:52:13 PM$"
+
+
+# This is a sorted list (as long as items are inserted with add() )
+class slist(list):
+	def __init__(self):
+		list.__init__(self)
+
+
+	def add(self,item):
+		self += [item]
+		self.sort()
+
diff --git a/src/plugins/exec.py b/src/plugins/exec.py
index 5497f1f8..8e7324e2 100644
--- a/src/plugins/exec.py
+++ b/src/plugins/exec.py
@@ -16,16 +16,9 @@ class Plugin(plugin.Plugin):
 		self.usage = "exec [command, file file.py]"
 
 
-	def open(self):
-		pass
-
-
-	def close(self):
-		pass
-
-
 	def run(self, args=None):
 		if args==None:
+			write(self.usage)
 			return
 
 		join = ' '
diff --git a/src/tests/test.py b/src/tests/test.py
new file mode 100644
index 00000000..ce625420
--- /dev/null
+++ b/src/tests/test.py
@@ -0,0 +1,4 @@
+print "hello,world"
+import session
+from bt.message import write
+write(session.settings)
diff --git a/src/tests/test.scion b/src/tests/test.scion
new file mode 100644
index 00000000..0e5ceab0
--- /dev/null
+++ b/src/tests/test.scion
@@ -0,0 +1,3 @@
+echo success!
+echo I love you, Holly!
+echo echo test!
diff --git a/src/tests/test2.scion b/src/tests/test2.scion
new file mode 100644
index 00000000..dbf5771b
--- /dev/null
+++ b/src/tests/test2.scion
@@ -0,0 +1,2 @@
+echo this is a script
+echo 42
diff --git a/src/tests/test3.scion b/src/tests/test3.scion
new file mode 100644
index 00000000..a84b6639
--- /dev/null
+++ b/src/tests/test3.scion
@@ -0,0 +1 @@
+exec file tests/test.py