cosmetic fixes/workarounds

[enigma2.git] / 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 ed1140085697e62ad1d0ebcea7728930a664a7e1..1ee5f39206643a42114ec4721af047992faf90ff 100644 (file)
--- 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)]