fix service type

[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 1ee5f39206643a42114ec4721af047992faf90ff..7d57ce0b193e9e93dcc2c6fd2cb52a5d54f8ec9a 100644 (file)
--- a/lib/python/Plugins/Extensions/MediaScanner/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaScanner/plugin.py
@@ -1,5 +1,7 @@
 from Plugins.Plugin import PluginDescriptor
 from Components.Scanner import scanDevice
+from Screens.InfoBar import InfoBar
+from os import access, F_OK, R_OK
 
 def execute(option):
        print "execute", option
@@ -21,9 +23,11 @@ def mountpoint_choosen(option):
        list = [ (r.description, r, res[r], session) for r in res ]
 
        if list == [ ]:
-               print "nothing found"
                from Screens.MessageBox import MessageBox
-               session.open(MessageBox, "No displayable files on this medium found!", MessageBox.TYPE_ERROR)
+               if access(mountpoint, F_OK|R_OK):
+                       session.open(MessageBox, "No displayable files on this medium found!", MessageBox.TYPE_ERROR)
+               else:
+                       print "ignore", mountpoint, "because its not accessible"
                return
 
        session.openWithCallback(execute, ChoiceBox, 
@@ -45,14 +49,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 [(("%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)
+               ]