X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bc5c320cbcf22f8da293b8dbf3ce4582775bdaf3..1b1339127ce152097492d899e401e3c6a2438f2c:/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 7d57ce0b..76bbb26a 100644
--- a/lib/python/Plugins/Extensions/MediaScanner/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaScanner/plugin.py
@@ -17,21 +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 == [ ]:
+	if not list:
 		from Screens.MessageBox import MessageBox
 		if access(mountpoint, F_OK|R_OK):
-			session.open(MessageBox, "No displayable files on this medium found!", MessageBox.TYPE_ERROR)
+			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):
@@ -40,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):
@@ -87,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)
 		]