X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7fe27f601f70eddb3019e22cbdb8388c05d3af7e..2d470a436a60b917a27c2055952a0a24374b994c:/lib/python/Components/PluginComponent.py

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index f1a0a95a..67373ea7 100644
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -1,35 +1,58 @@
 import os
 
 from Tools.Directories import *
-#import Plugins
+from Screens.Menu import menuupdater
 
 class PluginComponent:
 	def __init__(self):
 		self.plugins = []
 		self.setPluginPrefix("Plugins.")
+		self.menuEntries = []
 		
 	def setPluginPrefix(self, prefix):
 		self.prefix = prefix
 
 	def getPluginList(self):
 		list = []
-		dir = os.listdir("/usr/lib/enigma2/python/Plugins/")
+		dir = os.listdir(resolveFilename(SCOPE_PLUGINS))
+		self.menuDelete()
+		self.menuEntries = []
+
 		for x in dir:
-			if x[-3:] == ".py" and x[:-3] != "__init__":
-				#try:
-				print "trying to import " + self.prefix + x[:-3]
-				exec "import " + self.prefix + x[:-3]
-				picturepath = eval(self.prefix + x[:-3]).getPicturePath()
-				pluginname = eval(self.prefix + x[:-3]).getPluginName()
-				list.append((picturepath, pluginname , x[:-3]))
-				#except:
-					#print "Failed to open module - wrong plugin!"
+			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)
+						picturepath = plugin.getPicturePath()
+						pluginname = plugin.getPluginName()
+						try:
+							for menuEntry in plugin.getMenuRegistrationList():
+								self.menuEntries.append([menuEntry, pluginmodule])
+						except:
+							pass
+		
+						list.append((picturepath, pluginname , x))
+			except:
+				print "Directory", path, "contains a faulty plugin"
+		self.menuUpdate()
 		return list
 	
+	def menuDelete(self):
+		for menuEntry in self.menuEntries:
+			menuupdater.delMenuItem(menuEntry[0][0], menuEntry[0][2], menuEntry[1], menuEntry[0][3])
+
+	def menuUpdate(self):
+		for menuEntry in self.menuEntries:
+			menuupdater.addMenuItem(menuEntry[0][0], menuEntry[0][2], menuEntry[1], menuEntry[0][3])
+	
 	def runPlugin(self, plugin, session):
 		try:
-			exec "import " + self.prefix + plugin[2]
-			eval(self.prefix + plugin[2]).main(session)
+			exec "import " + self.prefix + plugin[2] + ".plugin"
+			eval(self.prefix + plugin[2] + ".plugin").main(session)
 		except:
 			print "exec of plugin failed!"