remove no more exist isTop argument

[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 4b2b937036fa09c3550fb102035d5d895e2e2518..5b320ea9d07af31087ea4b5cdbcdb74165e8506f 100644 (file)
--- a/lib/python/Plugins/Extensions/MediaScanner/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaScanner/plugin.py
@@ -1,5 +1,6 @@
 from Plugins.Plugin import PluginDescriptor
 from Components.Scanner import scanDevice
+from Screens.InfoBar import InfoBar
 
 def execute(option):
        print "execute", option
@@ -22,6 +23,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, 
@@ -43,14 +46,46 @@ def main(session, **kwargs):
 def menuEntry(*args):
        mountpoint_choosen(args)
 
+from Components.Harddisk import harddiskmanager
+
 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)]
+       return [(("%s (files)") % r.description, boundFunction(menuEntry, r.description, r.mountpoint), "hotplug_%s" % r.mountpoint, None) for r in harddiskmanager.getMountedPartitions(onlyhotplug = True)]
+
+global_session = None
+
+def partitionListChanged(action, device):
+       if InfoBar.instance:
+               if InfoBar.instance.execing:
+                       if action == 'add' and device.is_hotplug:
+                               print "mountpoint", device.mountpoint
+                               print "description", device.description
+                               print "force_mounted", device.force_mounted
+                               mountpoint_choosen((device.description, device.mountpoint, global_session))
+               else:
+                       print "main infobar is not execing... so we ignore hotplug event!"
+       else:
+                       print "hotplug event.. but no infobar"
+
+def sessionstart(reason, session):
+       global global_session
+       global_session = session
+
+def autostart(reason, **kwargs):
+       global global_session
+       if reason == 0:
+               harddiskmanager.on_partition_list_change.append(partitionListChanged)
+       elif reason == 1:
+               harddiskmanager.on_partition_list_change.remove(partitionListChanged)
+               global_session = None
 
 def Plugins(**kwargs):
-       return [ PluginDescriptor(name="MediaScanner", description="Scan Files...", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main),
-               PluginDescriptor(where = PluginDescriptor.WHERE_MENU, fnc=menuHook)]
+       return [
+               PluginDescriptor(name="MediaScanner", description="Scan Files...", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main),
+#              PluginDescriptor(where = PluginDescriptor.WHERE_MENU, fnc=menuHook),
+               PluginDescriptor(where = PluginDescriptor.WHERE_SESSIONSTART, fnc = sessionstart),
+               PluginDescriptor(where = PluginDescriptor.WHERE_AUTOSTART, fnc = autostart)
+               ]