Merge lp:~sergiusens/ciborium/remove_notification into lp:ciborium

[Sergio Schvezov]

Adding a notification for when a device is 'unmounted'

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'cmd/ciborium/main.go'
--- cmd/ciborium/main.go	2014-08-06 19:31:54 +0000
+++ cmd/ciborium/main.go	2014-08-13 02:40:31 +0000
@@ -58,6 +58,15 @@
 			// with regards to the failure when adding a storage device.
 			Body: gettext.Gettext("Make sure the storage device is correctly formated"),
 		}
+
+		msgStorageRemoved message = message{
+			// TRANSLATORS: This is the summary of a notification bubble with a short message of
+			// a storage device being removed
+			Summary: gettext.Gettext("Storage device has been removed"),
+			// TRANSLATORS: This is the body of a notification bubble with a short message about content
+			// from the removed device no longer being available
+			Body: gettext.Gettext("Content previously available on this device will no longer be accessible"),
+		}
 	)
 
 	var (
@@ -81,15 +90,22 @@
 	n := notifications.NewNotificationHandler(sessionBus, "ciborium", "system-settings", timeout)
 
 	go func() {
-		for a := range udisks2.DriveAdded {
-			if mountpoint, err := a.Mount(systemBus); err != nil {
-				log.Println("Cannot mount", a.Path, "due to:", err)
-				if err := n.SimpleNotify(msgStorageFail.Summary, msgStorageFail.Body); err != nil {
-					log.Println(err)
+		for {
+			select {
+			case a := <-udisks2.DriveAdded:
+				if mountpoint, err := a.Mount(systemBus); err != nil {
+					log.Println("Cannot mount", a.Path, "due to:", err)
+					if err := n.SimpleNotify(msgStorageFail.Summary, msgStorageFail.Body); err != nil {
+						log.Println(err)
+					}
+				} else {
+					log.Println("Mounted", a.Path, "as", mountpoint)
+					if err := n.SimpleNotify(msgStorageSucces.Summary, msgStorageSucces.Body); err != nil {
+						log.Println(err)
+					}
 				}
-			} else {
-				log.Println("Mounted", a.Path, "as", mountpoint)
-				if err := n.SimpleNotify(msgStorageSucces.Summary, msgStorageSucces.Body); err != nil {
+			case <-udisks2.DriveRemoved:
+				if err := n.SimpleNotify(msgStorageRemoved.Summary, msgStorageRemoved.Body); err != nil {
 					log.Println(err)
 				}
 			}

=== modified file 'po/ciborium.pot'
--- po/ciborium.pot	2014-08-06 17:40:12 +0000
+++ po/ciborium.pot	2014-08-13 02:40:31 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ciborium\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-06 14:40-0300\n"
+"POT-Creation-Date: 2014-08-12 23:31-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -19,24 +19,37 @@
 
 #. TRANSLATORS: This is the summary of a notification bubble with a short message of
 #. success when addding a storage device.
-#: cmd/ciborium/main.go:45
+#: cmd/ciborium/main.go:47
 msgid "Storage device detected"
 msgstr ""
 
 #. TRANSLATORS: This is the body of a notification bubble with a short message about content
 #. being scanned when addding a storage device.
-#: cmd/ciborium/main.go:48
+#: cmd/ciborium/main.go:50
 msgid "This device will be scanned for new content"
 msgstr ""
 
 #. TRANSLATORS: This is the summary of a notification bubble with a short message of
 #. failure when adding a storage device.
-#: cmd/ciborium/main.go:54
+#: cmd/ciborium/main.go:56
 msgid "Failed to add storage device"
 msgstr ""
 
 #. TRANSLATORS: This is the body of a notification bubble with a short message with hints
 #. with regards to the failure when adding a storage device.
-#: cmd/ciborium/main.go:57
+#: cmd/ciborium/main.go:59
 msgid "Make sure the storage device is correctly formated"
 msgstr ""
+
+#. TRANSLATORS: This is the summary of a notification bubble with a short message of
+#. a storage device being removed
+#: cmd/ciborium/main.go:65
+msgid "Storage device has been removed"
+msgstr ""
+
+#. TRANSLATORS: This is the body of a notification bubble with a short message about content
+#. from the removed device no longer being available
+#: cmd/ciborium/main.go:68
+msgid ""
+"Content previously available on this device will no longer be accessible"
+msgstr ""

=== modified file 'udisks2/udisks2.go'
--- udisks2/udisks2.go	2014-08-13 02:40:31 +0000
+++ udisks2/udisks2.go	2014-08-13 02:40:31 +0000
@@ -41,6 +41,7 @@
 
 type VariantMap map[string]dbus.Variant
 type InterfacesAndProperties map[string]VariantMap
+type Interfaces []string
 
 type Storage struct {
 	Path  dbus.ObjectPath
@@ -50,11 +51,13 @@
 type driveMap map[dbus.ObjectPath]InterfacesAndProperties
 
 type UDisks2 struct {
-	conn       *dbus.Connection
-	validFS    sort.StringSlice
-	DriveAdded chan *Storage
-	driveAdded *dbus.SignalWatch
-	drives     driveMap
+	conn         *dbus.Connection
+	validFS      sort.StringSlice
+	DriveAdded   chan *Storage
+	driveAdded   *dbus.SignalWatch
+	DriveRemoved chan dbus.ObjectPath
+	driveRemoved *dbus.SignalWatch
+	drives       driveMap
 }
 
 func (u *UDisks2) connectToSignal(path dbus.ObjectPath, inter, member string) (*dbus.SignalWatch, error) {
@@ -71,20 +74,44 @@
 	return u.connectToSignal(dbusObject, dbusObjectManagerInterface, dbusAddedSignal)
 }
 
-func (u *UDisks2) initInterfacesAddedChan() {
+func (u *UDisks2) connectToSignalInterfacesRemoved() (*dbus.SignalWatch, error) {
+	return u.connectToSignal(dbusObject, dbusObjectManagerInterface, dbusRemovedSignal)
+}
+
+func (u *UDisks2) initInterfacesWatchChan() {
 	go func() {
-		for msg := range u.driveAdded.C {
-			var addedEvent Storage
-			if err := msg.Args(&addedEvent.Path, &addedEvent.Props); err != nil {
-				log.Print(err)
-				continue
-			}
-			if addedEvent.desiredEvent(u.validFS) {
-				u.DriveAdded <- &addedEvent
+		defer close(u.DriveAdded)
+		defer close(u.DriveRemoved)
+		for {
+			select {
+			case msg := <-u.driveAdded.C:
+				var event Storage
+				if err := msg.Args(&event.Path, &event.Props); err != nil {
+					log.Print(err)
+					continue
+				}
+				if event.desiredAddEvent(u.validFS) {
+					u.drives[event.Path] = event.Props
+					u.DriveAdded <- &event
+				}
+			case msg := <-u.driveRemoved.C:
+				var objectPath dbus.ObjectPath
+				var interfaces Interfaces
+				if err := msg.Args(&objectPath, &interfaces); err != nil {
+					log.Print(err)
+					continue
+				}
+				if _, ok := u.drives[objectPath]; !ok {
+					log.Println("not concerned about event for", objectPath)
+					continue
+				}
+				if interfaces.desiredRemoveEvent() {
+					delete(u.drives, objectPath)
+					u.DriveRemoved <- objectPath
+				}
 			}
 		}
 		log.Print("Shutting down InterfacesAdded channel")
-		close(u.DriveAdded)
 	}()
 
 	u.emitExistingDevices()
@@ -104,7 +131,7 @@
 
 	for objectPath, props := range allDevices {
 		s := Storage{objectPath, props}
-		if s.desiredEvent(u.validFS) {
+		if s.desiredAddEvent(u.validFS) {
 			u.DriveAdded <- &s
 		}
 	}
@@ -112,28 +139,43 @@
 
 func NewStorageWatcher(conn *dbus.Connection, filesystems ...string) (u *UDisks2) {
 	u = &UDisks2{
-		conn:       conn,
-		validFS:    sort.StringSlice(filesystems),
-		DriveAdded: make(chan *Storage),
+		conn:         conn,
+		validFS:      sort.StringSlice(filesystems),
+		DriveAdded:   make(chan *Storage),
+		DriveRemoved: make(chan dbus.ObjectPath),
+		drives:       make(driveMap),
 	}
 	runtime.SetFinalizer(u, cleanDriveWatch)
 	return u
 }
 
 func cleanDriveWatch(u *UDisks2) {
-	log.Print("Cancelling InterfacesAdded signal watch")
+	log.Print("Cancelling Interfaces signal watch")
 	u.driveAdded.Cancel()
+	u.driveRemoved.Cancel()
 }
 
 func (u *UDisks2) Init() (err error) {
 	if u.driveAdded, err = u.connectToSignalInterfacesAdded(); err != nil {
 		return err
 	}
-	u.initInterfacesAddedChan()
+	if u.driveRemoved, err = u.connectToSignalInterfacesRemoved(); err != nil {
+		return err
+	}
+	u.initInterfacesWatchChan()
 	return nil
 }
 
-func (s *Storage) desiredEvent(validFS sort.StringSlice) bool {
+func (iface Interfaces) desiredRemoveEvent() bool {
+	for i := range iface {
+		if iface[i] == dbusFilesystemInterface {
+			return true
+		}
+	}
+	return false
+}
+
+func (s *Storage) desiredAddEvent(validFS sort.StringSlice) bool {
 	propFS, ok := s.Props[dbusFilesystemInterface]
 	if !ok {
 		return false