Merge branch 'bug_672_removed_pvr_device'

[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 c5f6043eb68e8e8659f7d5a136fc1d640a3d7d5d..76bbb26a92d91c514d28926db4383e95b626f80b 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
@@ -15,19 +17,22 @@ def mountpoint_choosen(option):
 
        from Screens.ChoiceBox import ChoiceBox
 
+       print "scanning", option
        (description, mountpoint, session) = option
        res = scanDevice(mountpoint)
 
        list = [ (r.description, r, res[r], session) for r in res ]
 
-       if list == [ ]:
-               print "nothing found"
+       if not list:
                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, 
-               title = "The following files were found...",
+               title = _("The following files were found..."),
                list = list)
 
 def scan(session):
@@ -36,7 +41,10 @@ def scan(session):
        from Components.Harddisk import harddiskmanager
 
        parts = [ (r.description, r.mountpoint, session) for r in harddiskmanager.getMountedPartitions(onlyhotplug = False)]
-       if len(parts):
+       if parts:
+               for x in parts:
+                       if not access(x[1], F_OK|R_OK):
+                               parts.remove(x) 
                session.openWithCallback(mountpoint_choosen, ChoiceBox, title = _("Please Select Medium to be Scanned"), list = parts)
 
 def main(session, **kwargs):
@@ -57,12 +65,17 @@ def menuHook(menuid):
 global_session = None
 
 def partitionListChanged(action, device):
-       pass
-#      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))
+       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
@@ -78,8 +91,8 @@ def autostart(reason, **kwargs):
 
 def Plugins(**kwargs):
        return [
-               PluginDescriptor(name="MediaScanner", description="Scan Files...", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main),
+               PluginDescriptor(name="MediaScanner", description=_("Scan Files..."), where = PluginDescriptor.WHERE_PLUGINMENU, needsRestart = True, fnc=main),
 #              PluginDescriptor(where = PluginDescriptor.WHERE_MENU, fnc=menuHook),
-               PluginDescriptor(where = PluginDescriptor.WHERE_SESSIONSTART, fnc = sessionstart),
-               PluginDescriptor(where = PluginDescriptor.WHERE_AUTOSTART, fnc = autostart)
+               PluginDescriptor(where = PluginDescriptor.WHERE_SESSIONSTART, needsRestart = True, fnc = sessionstart),
+               PluginDescriptor(where = PluginDescriptor.WHERE_AUTOSTART, needsRestart = True, fnc = autostart)
                ]