From 2e8b8c758c9b9544d0771c06ca91b228bf1147bf Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Thu, 28 Feb 2008 00:32:46 +0000 Subject: [PATCH] show hotplug media in main menu --- .../Plugins/Extensions/MediaScanner/plugin.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/python/Plugins/Extensions/MediaScanner/plugin.py b/lib/python/Plugins/Extensions/MediaScanner/plugin.py index ed114008..4b2b9370 100644 --- a/lib/python/Plugins/Extensions/MediaScanner/plugin.py +++ b/lib/python/Plugins/Extensions/MediaScanner/plugin.py @@ -33,11 +33,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 [(_("Show files from %s") % r.description, boundFunction(menuEntry, r.description, r.mountpoint), "hotplug", 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)] -- 2.30.2