Merge lp:~mandel/ciborium/ensure-dirs-created into lp:ciborium

[Manuel de la Peña]

Ensure that the default dirs are created after the sd card has been formatted.

Ensure that the default dirs are created after the sd card has been formatted. When testing, do take a look at the sd card and ensure that the Downloads, Documents.. folders are present.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:115
http://jenkins.qa.ubuntu.com/job/ciborium-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-vivid-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-vivid-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/ciborium-vivid-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-vivid-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ciborium-ci/23/rebuild

review: Approve (continuous-integration)

[lp:~mandel/ciborium/ensure-dirs-created]

116. By Manuel de la Peña on 2015-03-02

Link bug.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:116
http://jenkins.qa.ubuntu.com/job/ciborium-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-vivid-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-vivid-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/ciborium-vivid-armhf-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-vivid-i386-ci/19

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ciborium-ci/25/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

LGTM, and works as expected.

review: Approve

=== modified file 'cmd/ciborium/main.go'
--- cmd/ciborium/main.go	2015-02-05 15:43:44 +0000
+++ cmd/ciborium/main.go	2015-03-02 12:08:19 +0000
@@ -165,7 +165,7 @@
 	notificationHandler := notifications.NewLegacyHandler(sessionBus, "ciborium")
 	notifyFree := buildFreeNotify(notificationHandler)
 
-	blockAdded, blockError := udisks2.SubscribeAddEvents()
+	blockAdded, formatCompleted, blockError := udisks2.SubscribeAddEvents()
 	mountRemoved := udisks2.SubscribeRemoveEvents()
 
 	go func() {
@@ -201,6 +201,28 @@
 					msgStorageFail.Body,
 					errorIcon,
 				)
+			case f := <-formatCompleted:
+				if m, err := udisks2.Mount(f); err != nil {
+					log.Println("Cannot mount", f.Path, "due to:", err)
+					n = notificationHandler.NewStandardPushMessage(
+						msgStorageFail.Summary,
+						msgStorageFail.Body,
+						errorIcon,
+					)
+				} else {
+					log.Println("Mounted", f.Path, "as", m)
+					n = notificationHandler.NewStandardPushMessage(
+						msgStorageSuccess.Summary,
+						msgStorageSuccess.Body,
+						sdCardIcon,
+					)
+
+					if err := createStandardHomeDirs(m); err != nil {
+						log.Println("Failed to create standard dir layout:", err)
+					}
+
+					mw.set(mountpoint(m), true)
+				}
 			case m := <-mountRemoved:
 				log.Println("Path removed", m)
 				n = notificationHandler.NewStandardPushMessage(
@@ -236,6 +258,7 @@
 // createStandardHomeDirs creates directories reflecting a standard home, these
 // directories are Documents, Downloads, Music, Pictures and Videos
 func createStandardHomeDirs(mountpoint string) error {
+	log.Println("createStandardHomeDirs(", mountpoint, ")")
 	for _, node := range []string{"Documents", "Downloads", "Music", "Pictures", "Videos"} {
 		dir := filepath.Join(mountpoint, node)
 

=== modified file 'udisks2/udisks2.go'
--- udisks2/udisks2.go	2015-03-02 12:08:19 +0000
+++ udisks2/udisks2.go	2015-03-02 12:08:19 +0000
@@ -61,21 +61,22 @@
 type mountpointMap map[dbus.ObjectPath]string
 
 type UDisks2 struct {
-	conn          *dbus.Connection
-	validFS       sort.StringSlice
-	blockAdded    chan *Event
-	driveAdded    *dbus.SignalWatch
-	mountRemoved  chan string
-	blockError    chan error
-	driveRemoved  *dbus.SignalWatch
-	blockDevice   chan bool
-	drives        driveMap
-	mountpoints   mountpointMap
-	mapLock       sync.Mutex
-	startLock     sync.Mutex
-	dispatcher    *dispatcher
-	jobs          *jobManager
-	pendingMounts []string
+	conn            *dbus.Connection
+	validFS         sort.StringSlice
+	blockAdded      chan *Event
+	driveAdded      *dbus.SignalWatch
+	mountRemoved    chan string
+	blockError      chan error
+	driveRemoved    *dbus.SignalWatch
+	blockDevice     chan bool
+	drives          driveMap
+	mountpoints     mountpointMap
+	mapLock         sync.Mutex
+	startLock       sync.Mutex
+	dispatcher      *dispatcher
+	jobs            *jobManager
+	pendingMounts   []string
+	formatCompleted chan *Event
 }
 
 func NewStorageWatcher(conn *dbus.Connection, filesystems ...string) (u *UDisks2) {
@@ -90,10 +91,11 @@
 	return u
 }
 
-func (u *UDisks2) SubscribeAddEvents() (<-chan *Event, <-chan error) {
+func (u *UDisks2) SubscribeAddEvents() (<-chan *Event, <-chan *Event, <-chan error) {
 	u.blockAdded = make(chan *Event)
 	u.blockError = make(chan error)
-	return u.blockAdded, u.blockError
+	u.formatCompleted = make(chan *Event)
+	return u.blockAdded, u.formatCompleted, u.blockError
 }
 
 func (u *UDisks2) SubscribeRemoveEvents() <-chan string {
@@ -119,6 +121,7 @@
 	}
 
 	u.mountpoints[s.Path] = mountpoint
+	log.Println("Mounth path for '", s.Path, "' set to be", mountpoint)
 	return mountpoint, err
 }
 
@@ -305,18 +308,15 @@
 }
 
 func (u *UDisks2) processAddEvent(s *Event) error {
+	log.Println("processAddEvents(", s.Path, s.Props, s.Interfaces, ")")
 	u.mapLock.Lock()
 	defer u.mapLock.Unlock()
+
 	pos := sort.SearchStrings(u.pendingMounts, string(s.Path))
 	if pos != len(u.pendingMounts) && s.Props.isFilesystem() {
-		log.Println("Mount path", s.Path)
-		_, err := u.Mount(s)
-		u.pendingMounts = append(u.pendingMounts[:pos], u.pendingMounts[pos+1:]...)
-		if err != nil {
-			u.blockError <- err
-		} else {
-			u.blockAdded <- s
-		}
+		log.Println("Path", s.Path, "must be remounted.")
+		u.formatCompleted <- s
+		return nil
 	}
 	if isBlockDevice, err := u.drives.addInterface(s); err != nil {
 		return err