X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FPlugins%2FExtensions%2FMediaScanner%2Fplugin.py;h=2c31197dea5783449a8d816a77273e5bc811d93e;hb=60881a22938560d1b583797ddf74b62d24926517;hp=c5f6043eb68e8e8659f7d5a136fc1d640a3d7d5d;hpb=a9e03c73e9b7c9e2bda1418bde9f81dc056f34f8;p=vuplus_dvbapp

diff --git a/lib/python/Plugins/Extensions/MediaScanner/plugin.py b/lib/python/Plugins/Extensions/MediaScanner/plugin.py
old mode 100644
new mode 100755
index c5f6043..2c31197
--- 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,15 +17,18 @@ 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"
 		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, 
@@ -37,6 +42,9 @@ def scan(session):
 
 	parts = [ (r.description, r.mountpoint, session) for r in harddiskmanager.getMountedPartitions(onlyhotplug = False)]
 	if len(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