show media selector instead of hardcoded /hdd/ scan

diff --git a/lib/python/Plugins/Extensions/MediaScanner/plugin.py b/lib/python/Plugins/Extensions/MediaScanner/plugin.py
index 55e1081..3c4b977 100644 (file)
--- a/lib/python/Plugins/Extensions/MediaScanner/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaScanner/plugin.py
@@ -93,7 +93,7 @@ class ScanPath:
 #              ),
 #      ]
 
-def ScanDevice(mountpoint):
+def scanDevice(mountpoint):
        from Components.PluginComponent import plugins
 
        scanner = [ ]
@@ -152,10 +152,15 @@ def execute(option):
        (_, scanner, files, session) = option
        scanner.open(files, session)
 
-def scan(session):
+
+def mountpoint_choosen(option):
+       if option is None:
+               return
+
        from Screens.ChoiceBox import ChoiceBox
-       # HARDCODED - need to scan all mountpoints
-       res = ScanDevice("/hdd/")
+
+       (description, mountpoint, session) = option
+       res = scanDevice(mountpoint)
 
        list = [ (r.description, r, res[r], session) for r in res ]
 
@@ -167,6 +172,14 @@ def scan(session):
                title = "The following files were found...",
                list = list)
 
+def scan(session):
+       from Screens.ChoiceBox import ChoiceBox
+
+       from Components.Harddisk import harddiskmanager
+
+       parts = [ (r.description, r.mountpoint, session) for r in harddiskmanager.getMountedPartitions() ]
+       session.openWithCallback(mountpoint_choosen, ChoiceBox, title = "Please Select Medium to be Scanned", list = parts)
+
 def main(session, **kwargs):
        scan(session)