Byron Clark avatar Byron Clark committed 6d8900e

Mount notification cleanup.

Make import consistent with the rest of the code.
Use the device file provided by udisks in the notification.
Move the notification out of the dbus try/catch.

Comments (0)

Files changed (1)

 import dbus
 import gobject
+import pynotify
 import udiskie.device
-import os
-from pynotify import init as NotifyInitialize
-from pynotify import Notification
 class DeviceState:
     def __init__(self, mounted):
         self.mounted = mounted
                 device.mount(filesystem, options)
       'mounted device %s' % (device,))
-		Notification('Device mounted',
-                             '%s mounted on %s' % (os.path.basename(str(device)),
-                             	                   ', '.join(device.mount_paths())),
-                             'drive-removable-media').show()
             except dbus.exceptions.DBusException, dbus_err:
                 self.log.error('failed to mount device %s: %s' % (device,
+                return
+            mount_paths = ', '.join(device.mount_paths())
+            pynotify.Notification('Device mounted',
+                                  '%s mounted on %s' % (device.device_file(),
+                                                        mount_paths),
+                                  'drive-removable-media').show()
     def mount_present_devices(self):
         """Mount handleable devices that are already present."""
         log_level = logging.DEBUG
     logging.basicConfig(level=log_level, format='%(message)s')
-    NotifyInitialize('udiskie.mount')
+    pynotify.init('udiskie.mount')
     mounter = AutoMounter()
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.