X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fdb15fdd11d88b73900badf092cf2db0e8d3aabf..7b5f4da148acb53068e7642651fe82225fa40e90:/lib/python/Plugins/Extensions/MediaScanner/plugin.py

diff --git a/lib/python/Plugins/Extensions/MediaScanner/plugin.py b/lib/python/Plugins/Extensions/MediaScanner/plugin.py
index ed114008..1ee5f392 100644
--- a/lib/python/Plugins/Extensions/MediaScanner/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaScanner/plugin.py
@@ -22,6 +22,8 @@ def mountpoint_choosen(option):
 
 	if list == [ ]:
 		print "nothing found"
+		from Screens.MessageBox import MessageBox
+		session.open(MessageBox, "No displayable files on this medium found!", MessageBox.TYPE_ERROR)
 		return
 
 	session.openWithCallback(execute, ChoiceBox, 
@@ -33,11 +35,24 @@ def scan(session):
 
 	from Components.Harddisk import harddiskmanager
 
-	parts = [ (r.description, r.mountpoint, session) for r in harddiskmanager.getMountedPartitions() ]
-	session.openWithCallback(mountpoint_choosen, ChoiceBox, title = "Please Select Medium to be Scanned", list = parts)
+	parts = [ (r.description, r.mountpoint, session) for r in harddiskmanager.getMountedPartitions(onlyhotplug = False)]
+	if len(parts):
+		session.openWithCallback(mountpoint_choosen, ChoiceBox, title = _("Please Select Medium to be Scanned"), list = parts)
 
 def main(session, **kwargs):
 	scan(session)
 
+def menuEntry(*args):
+	mountpoint_choosen(args)
+
+def menuHook(menuid):
+	if menuid != "mainmenu": 
+		return [ ]
+
+	from Components.Harddisk import harddiskmanager
+	from Tools.BoundFunction import boundFunction
+	return [(("%s (files)") % r.description, boundFunction(menuEntry, r.description, r.mountpoint), "hotplug_%s" % r.mountpoint, None) for r in harddiskmanager.getMountedPartitions(onlyhotplug = True)]
+
 def Plugins(**kwargs):
-	return PluginDescriptor(name="MediaScanner", description="Scan Files...", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main)
+	return [ PluginDescriptor(name="MediaScanner", description="Scan Files...", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main),
+		PluginDescriptor(where = PluginDescriptor.WHERE_MENU, fnc=menuHook)]