From a63fe4fc45fc957dce2db4752839cb0191646e26 Mon Sep 17 00:00:00 2001
From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Fri, 20 Jan 2006 15:33:12 +0000
Subject: [PATCH] disable test-plugin reenable the try/except block for faulty
 plugin catching don't expect a directory /usr/lib/tuxbox/plugins to be
 present by the tuxbox plugin starter

---
 lib/python/Components/PluginComponent.py   | 64 +++++++++++-----------
 lib/python/Plugins/Makefile.am             |  2 +-
 lib/python/Plugins/tuxboxplugins/plugin.py | 42 ++++++++------
 3 files changed, 59 insertions(+), 49 deletions(-)

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index 26eadd10..adfc98a0 100644
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -20,38 +20,38 @@ class PluginComponent:
 
 		for x in dir:
 			path = resolveFilename(SCOPE_PLUGINS, x) + "/"
-#			try:
-			if os.path.exists(path):
-				if fileExists(path + "plugin.py"):
-					pluginmodule = self.prefix + x + ".plugin"
-					print "trying to import " + pluginmodule
-					exec "import " + pluginmodule
-					plugin = eval(pluginmodule)
-					plugins = plugin.getPlugins()
-					try: picturepaths = plugin.getPicturePaths()
-					except:
-						picturepaths = []
-						for p in plugins:
-							picturepaths.append("")
-					try:
-						for menuEntry in plugin.getMenuRegistrationList():
-							self.menuEntries.append([menuEntry, pluginmodule])
-					except:
-						pass
-
-					for y in range(len(plugins)):
-						if len(plugins[y]) < 5:
-							list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][2], plugins[y][3], None, plugins[y][1]))
-						else:
-							list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][2], plugins[y][3], plugins[y][4], plugins[y][1]))
-					if runAutostartPlugins:
-						try: plugin.autostart()
-						except:	pass
-					if runAutoendPlugins:
-						try: plugin.autoend()
-						except:	pass
-#			except:
-#				print "Directory", path, "contains a faulty plugin"
+			try:
+				if os.path.exists(path):
+					if fileExists(path + "plugin.py"):
+						pluginmodule = self.prefix + x + ".plugin"
+						print "trying to import " + pluginmodule
+						exec "import " + pluginmodule
+						plugin = eval(pluginmodule)
+						plugins = plugin.getPlugins()
+						try: picturepaths = plugin.getPicturePaths()
+						except:
+							picturepaths = []
+							for p in plugins:
+								picturepaths.append("")
+						try:
+							for menuEntry in plugin.getMenuRegistrationList():
+								self.menuEntries.append([menuEntry, pluginmodule])
+						except:
+							pass
+	
+						for y in range(len(plugins)):
+							if len(plugins[y]) < 5:
+								list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][2], plugins[y][3], None, plugins[y][1]))
+							else:
+								list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][2], plugins[y][3], plugins[y][4], plugins[y][1]))
+						if runAutostartPlugins:
+							try: plugin.autostart()
+							except:	pass
+						if runAutoendPlugins:
+							try: plugin.autoend()
+							except:	pass
+			except:
+				print "Directory", path, "contains a faulty plugin"
 		self.menuUpdate()
 		return list
 	
diff --git a/lib/python/Plugins/Makefile.am b/lib/python/Plugins/Makefile.am
index 93ee65ad..01f21d4e 100644
--- a/lib/python/Plugins/Makefile.am
+++ b/lib/python/Plugins/Makefile.am
@@ -1,6 +1,6 @@
 installdir = $(LIBDIR)/enigma2/python/Plugins
 
-SUBDIRS = update tuxboxplugins web test
+SUBDIRS = update tuxboxplugins web
 
 install_PYTHON =	\
 	__init__.py
diff --git a/lib/python/Plugins/tuxboxplugins/plugin.py b/lib/python/Plugins/tuxboxplugins/plugin.py
index b7005662..bf789465 100644
--- a/lib/python/Plugins/tuxboxplugins/plugin.py
+++ b/lib/python/Plugins/tuxboxplugins/plugin.py
@@ -7,31 +7,41 @@ from Components.Label import Label
 import os
 
 def getPlugins():
-	dir = os.listdir("/usr/lib/tuxbox/plugins/")
-	
 	pluginlist = []
-	for x in dir:
-		try:
-			if x[-3:] == "cfg":
-				params = getPluginParams(x)
-				pluginlist.append((params["name"], params["desc"], "function", "main", x))
-		except:
-			pass
+
+	try:
+		dir = os.listdir("/usr/lib/tuxbox/plugins/")
+	
+		for x in dir:
+			try:
+				if x[-3:] == "cfg":
+					params = getPluginParams(x)
+					pluginlist.append((params["name"], params["desc"], "function", "main", x))
+			except:
+				pass
+	except:
+		print "no tuxbox plugins found"
 	return pluginlist
 
 def getPicturePaths():
 	list = []
-	dir = os.listdir("/usr/lib/tuxbox/plugins/")
-	for x in dir: list.append("tuxbox.png")
+	try:
+		dir = os.listdir("/usr/lib/tuxbox/plugins/")
+		for x in dir: list.append("tuxbox.png")
+	except:
+		print "no tuxbox plugins found"
 	return list
 
 def getPluginParams(file):
 	params = {}
-	file = open("/usr/lib/tuxbox/plugins/" + file, "r")
-	for x in file.readlines():
-		split = x.split("=")
-		params[split[0]] = split[1]
-	file.close()
+	try:
+		file = open("/usr/lib/tuxbox/plugins/" + file, "r")
+		for x in file.readlines():
+			split = x.split("=")
+			params[split[0]] = split[1]
+		file.close()
+	except:
+		print "not tuxbox plugins found"
 
 	return params
 
-- 
2.30.2