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

[Sergio Schvezov]

Create standard home dirs (Documents, Downloads, Music, Pictures and Videos) after mounting, if they don't exist

This silently creates Pictures and Videos if it doesn't exist on the mountpoint. This may not be desktop friendly.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Don't we need to do this respecting the current language of the system? We might also need to create some additional dirs, such as Documents and Downloads. Might want to check how that is done on the desktop, and do a similar thing for touch (sdcard).

review: Needs Information

[Ricardo Salveti (rsalveti)]

From IRC, let's make sure we're creating the following dirs: Music, Pictures, Videos, Downloads and Documents.

review: Needs Fixing

[lp:~sergiusens/ciborium/mediadirs]

84. By Sergio Schvezov on 2014-11-26

Creating all the standard dirs

[Sergio Schvezov (sergiusens)]

updated.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

review: Needs Fixing

[lp:~sergiusens/ciborium/mediadirs]

85. By Sergio Schvezov on 2014-11-27

Changing naming and comments

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Florian Boucault (fboucault)]

> Don't we need to do this respecting the current language of the system? We
> might also need to create some additional dirs, such as Documents and
> Downloads. Might want to check how that is done on the desktop, and do a
> similar thing for touch (sdcard).

I asked that question to jdstrand and he said that the apparmor profiles would not accomodate with variable paths hence the names had to remain always the same regardless of language.

[Florian Boucault (fboucault)]

> Don't we need to do this respecting the current language of the system? We
> might also need to create some additional dirs, such as Documents and
> Downloads. Might want to check how that is done on the desktop, and do a
> similar thing for touch (sdcard).

I asked that question to jdstrand and he said that the apparmor profiles would not accomodate with variable paths hence the names had to remain always the same regardless of language.

[Ricardo Salveti (rsalveti)]

Comments inline.

review: Needs Fixing

[Manuel de la Peña (mandel)]

review: Approve

[Ricardo Salveti (rsalveti)]

review: Needs Fixing

[lp:~sergiusens/ciborium/mediadirs]

86. By Sergio Schvezov on 2014-11-30

Don't return if err == nil

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~sergiusens/ciborium/mediadirs]

87. By Sergio Schvezov on 2014-12-01

Added unit tests

[Ricardo Salveti (rsalveti)]

LGTM, worked fine now.

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== added file 'cmd/ciborium/dir_test.go'
--- cmd/ciborium/dir_test.go	1970-01-01 00:00:00 +0000
+++ cmd/ciborium/dir_test.go	2014-12-01 13:10:22 +0000
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * Authors:
+ * Sergio Schvezov: [e-mail]
+ *
+ * This file is part of ubuntu-emulator.
+ *
+ * ciborium is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * ubuntu-emulator is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package main
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	. "launchpad.net/gocheck"
+)
+
+var _ = Suite(&StandardDirsTestSuite{})
+
+type StandardDirsTestSuite struct {
+	tmpDir string
+}
+
+func (s *StandardDirsTestSuite) SetUpTest(c *C) {
+	s.tmpDir = c.MkDir()
+}
+
+func Test(t *testing.T) { TestingT(t) }
+
+func (s *StandardDirsTestSuite) TestCreateFromScratch(c *C) {
+	createStandardHomeDirs(s.tmpDir)
+
+	for _, d := range []string{"Documents", "Downloads", "Music", "Pictures", "Videos"} {
+		fi, err := os.Stat(filepath.Join(s.tmpDir, d))
+		c.Assert(err, IsNil)
+		c.Assert(fi.IsDir(), Equals, true)
+	}
+}
+
+func (s *StandardDirsTestSuite) TestCreateWithPreExistingHead(c *C) {
+	c.Assert(os.Mkdir(filepath.Join(s.tmpDir, "Documents"), 0755), IsNil)
+	c.Assert(os.Mkdir(filepath.Join(s.tmpDir, "Downloads"), 0755), IsNil)
+
+	c.Assert(createStandardHomeDirs(s.tmpDir), IsNil)
+
+	for _, d := range []string{"Documents", "Downloads", "Music", "Pictures", "Videos"} {
+		fi, err := os.Stat(filepath.Join(s.tmpDir, d))
+		c.Assert(err, IsNil)
+		c.Assert(fi.IsDir(), Equals, true)
+	}
+}
+
+func (s *StandardDirsTestSuite) TestCreateWithPreExistingTail(c *C) {
+	c.Assert(os.Mkdir(filepath.Join(s.tmpDir, "Videos"), 0755), IsNil)
+
+	c.Assert(createStandardHomeDirs(s.tmpDir), IsNil)
+
+	for _, d := range []string{"Documents", "Downloads", "Music", "Pictures", "Videos"} {
+		fi, err := os.Stat(filepath.Join(s.tmpDir, d))
+		c.Assert(err, IsNil)
+		c.Assert(fi.IsDir(), Equals, true)
+	}
+}
+
+func (s *StandardDirsTestSuite) TestCreateWithPreExistingMiddle(c *C) {
+	c.Assert(os.Mkdir(filepath.Join(s.tmpDir, "Music"), 0755), IsNil)
+
+	c.Assert(createStandardHomeDirs(s.tmpDir), IsNil)
+
+	for _, d := range []string{"Documents", "Downloads", "Music", "Pictures", "Videos"} {
+		fi, err := os.Stat(filepath.Join(s.tmpDir, d))
+		c.Assert(err, IsNil)
+		c.Assert(fi.IsDir(), Equals, true)
+	}
+}
+
+func (s *StandardDirsTestSuite) TestCreateWithPreExistingNonDir(c *C) {
+	musicFile := filepath.Join(s.tmpDir, "Music")
+	f, err := os.Create(musicFile)
+	c.Assert(err, IsNil)
+	f.Close()
+
+	c.Assert(createStandardHomeDirs(s.tmpDir), IsNil)
+
+	fi, err := os.Stat(musicFile)
+	c.Assert(err, IsNil)
+	c.Assert(fi.IsDir(), Equals, false)
+
+	for _, d := range []string{"Documents", "Downloads", "Pictures", "Videos"} {
+		fi, err := os.Stat(filepath.Join(s.tmpDir, d))
+		c.Assert(err, IsNil)
+		c.Assert(fi.IsDir(), Equals, true)
+	}
+}

=== modified file 'cmd/ciborium/main.go'
--- cmd/ciborium/main.go	2014-09-24 23:02:18 +0000
+++ cmd/ciborium/main.go	2014-12-01 13:10:22 +0000
@@ -23,6 +23,8 @@
 	"errors"
 	"fmt"
 	"log"
+	"os"
+	"path/filepath"
 	"strings"
 	"sync"
 	"syscall"
@@ -183,6 +185,11 @@
 						msgStorageSuccess.Body,
 						sdCardIcon,
 					)
+
+					if err := createStandardHomeDirs(m); err != nil {
+						log.Println("Failed to create standard dir layout:", err)
+					}
+
 					mw.set(mountpoint(m), true)
 				}
 			case e := <-blockError:
@@ -224,6 +231,24 @@
 	<-done
 }
 
+// createStandardHomeDirs creates directories reflecting a standard home, these
+// directories are Documents, Downloads, Music, Pictures and Videos
+func createStandardHomeDirs(mountpoint string) error {
+	for _, node := range []string{"Documents", "Downloads", "Music", "Pictures", "Videos"} {
+		dir := filepath.Join(mountpoint, node)
+
+		if _, err := os.Stat(dir); err != nil && os.IsNotExist(err) {
+			if err := os.MkdirAll(dir, 755); err != nil {
+				return err
+			}
+		} else if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 // notify only notifies if a notification is actually needed
 // depending on freeThreshold and on warningSent's status
 func buildFreeNotify(nh *notifications.NotificationHandler) notifyFreeFunc {

=== modified file 'debian/control'
--- debian/control	2014-09-02 07:01:27 +0000
+++ debian/control	2014-12-01 13:10:22 +0000
@@ -9,6 +9,7 @@
  golang-go,
  golang-go-dbus-dev,
  golang-go-xdg-dev,
+ golang-gocheck-dev,
  libqt5opengl5-dev,
  pkg-config,
  qtbase5-private-dev,