Show partition label in unlocking dialog

Resolves #305

Author: coldfix

udiskie/config.py

@@ -87,6 +87,7 @@ class DeviceFilter:
         'in_use',
         'should_automount',
         'ui_label',
+        'ui_label_dialog',
         'loop_file',
         'setup_by_uid',
         'autoclear',

udiskie/prompt.py

@@ -154,7 +154,7 @@ async def password_dialog(key, title, message, options):
 
 def get_password_gui(device, options):
     """Get the password to unlock a device from GUI."""
-    text = _('Enter password for {0.device_presentation}: ', device)
+    text = _('Enter password for {0.ui_label_dialog}: ', device)
     try:
         return password_dialog(device.id_uuid, 'udiskie', text, options)
     except RuntimeError:
@@ -164,7 +164,7 @@ def get_password_gui(device, options):
 async def get_password_tty(device, options):
     """Get the password to unlock a device from terminal."""
     # TODO: make this a TRUE async
-    text = _('Enter password for {0.device_presentation}: ', device)
+    text = _('Enter password for {0.ui_label_dialog}: ', device)
     try:
         return PasswordResult(getpass.getpass(text),
                               options.get('cache_hint', False))

udiskie/udisks2.py

@@ -598,6 +598,18 @@ def ui_label(self):
             self.ui_id_label or self.ui_id_uuid or self.drive_label
         ]))
 
+    @property
+    def ui_label_dialog(self):
+        """UI string identifying the partition if possible."""
+        dev_path = self.ui_device_presentation
+        fs_label = self.ui_id_label or self.ui_id_uuid or self.drive_label
+        if dev_path and fs_label:
+            return '{0} [{1}]'.format(dev_path, fs_label)
+        elif fs_label:
+            return fs_label
+        else:
+            return dev_path
+
     @property
     def ui_device_label(self):
         """UI string identifying the device (drive) if toplevel."""