1
=== added file 'cmd/ciborium/dir_test.go'
2
--- cmd/ciborium/dir_test.go	1970-01-01 00:00:00 +0000
3
+++ cmd/ciborium/dir_test.go	2014-12-01 13:10:22 +0000
4
@@ -0,0 +1,108 @@
5
1
/*
6
2
 * Copyright 2014 Canonical Ltd.
7
3
 *
8
4
 * Authors:
9
5
 * Sergio Schvezov: sergio.schvezov@canonical.com
10
6
 *
11
7
 * This file is part of ubuntu-emulator.
12
8
 *
13
9
 * ciborium is free software; you can redistribute it and/or modify
14
10
 * it under the terms of the GNU General Public License as published by
15
11
 * the Free Software Foundation; version 3.
16
12
 *
17
13
 * ubuntu-emulator is distributed in the hope that it will be useful,
18
14
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
20
16
 * GNU General Public License for more details.
21
17
 *
22
18
 * You should have received a copy of the GNU General Public License
23
19
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
24
20
 */
25
21
26
22
package main
27
23
28
24
import (
29
25
	"os"
30
26
	"path/filepath"
31
27
	"testing"
32
28
33
29
	. "launchpad.net/gocheck"
34
30
)
35
31
36
32
var _ = Suite(&StandardDirsTestSuite{})
37
33
38
34
type StandardDirsTestSuite struct {
39
35
	tmpDir string
40
36
}
41
37
42
38
func (s *StandardDirsTestSuite) SetUpTest(c *C) {
43
39
	s.tmpDir = c.MkDir()
44
40
}
45
41
46
42
func Test(t *testing.T) { TestingT(t) }
47
43
48
44
func (s *StandardDirsTestSuite) TestCreateFromScratch(c *C) {
49
45
	createStandardHomeDirs(s.tmpDir)
50
46
51
47
	for _, d := range []string{"Documents", "Downloads", "Music", "Pictures", "Videos"} {
52
48
		fi, err := os.Stat(filepath.Join(s.tmpDir, d))
53
49
		c.Assert(err, IsNil)
54
50
		c.Assert(fi.IsDir(), Equals, true)
55
51
	}
56
52
}
57
53
58
54
func (s *StandardDirsTestSuite) TestCreateWithPreExistingHead(c *C) {
59
55
	c.Assert(os.Mkdir(filepath.Join(s.tmpDir, "Documents"), 0755), IsNil)
60
56
	c.Assert(os.Mkdir(filepath.Join(s.tmpDir, "Downloads"), 0755), IsNil)
61
57
62
58
	c.Assert(createStandardHomeDirs(s.tmpDir), IsNil)
63
59
64
60
	for _, d := range []string{"Documents", "Downloads", "Music", "Pictures", "Videos"} {
65
61
		fi, err := os.Stat(filepath.Join(s.tmpDir, d))
66
62
		c.Assert(err, IsNil)
67
63
		c.Assert(fi.IsDir(), Equals, true)
68
64
	}
69
65
}
70
66
71
67
func (s *StandardDirsTestSuite) TestCreateWithPreExistingTail(c *C) {
72
68
	c.Assert(os.Mkdir(filepath.Join(s.tmpDir, "Videos"), 0755), IsNil)
73
69
74
70
	c.Assert(createStandardHomeDirs(s.tmpDir), IsNil)
75
71
76
72
	for _, d := range []string{"Documents", "Downloads", "Music", "Pictures", "Videos"} {
77
73
		fi, err := os.Stat(filepath.Join(s.tmpDir, d))
78
74
		c.Assert(err, IsNil)
79
75
		c.Assert(fi.IsDir(), Equals, true)
80
76
	}
81
77
}
82
78
83
79
func (s *StandardDirsTestSuite) TestCreateWithPreExistingMiddle(c *C) {
84
80
	c.Assert(os.Mkdir(filepath.Join(s.tmpDir, "Music"), 0755), IsNil)
85
81
86
82
	c.Assert(createStandardHomeDirs(s.tmpDir), IsNil)
87
83
88
84
	for _, d := range []string{"Documents", "Downloads", "Music", "Pictures", "Videos"} {
89
85
		fi, err := os.Stat(filepath.Join(s.tmpDir, d))
90
86
		c.Assert(err, IsNil)
91
87
		c.Assert(fi.IsDir(), Equals, true)
92
88
	}
93
89
}
94
90
95
91
func (s *StandardDirsTestSuite) TestCreateWithPreExistingNonDir(c *C) {
96
92
	musicFile := filepath.Join(s.tmpDir, "Music")
97
93
	f, err := os.Create(musicFile)
98
94
	c.Assert(err, IsNil)
99
95
	f.Close()
100
96
101
97
	c.Assert(createStandardHomeDirs(s.tmpDir), IsNil)
102
98
103
99
	fi, err := os.Stat(musicFile)
104
100
	c.Assert(err, IsNil)
105
101
	c.Assert(fi.IsDir(), Equals, false)
106
102
107
103
	for _, d := range []string{"Documents", "Downloads", "Pictures", "Videos"} {
108
104
		fi, err := os.Stat(filepath.Join(s.tmpDir, d))
109
105
		c.Assert(err, IsNil)
110
106
		c.Assert(fi.IsDir(), Equals, true)
111
107
	}
112
108
}
113
0
109
114
=== modified file 'cmd/ciborium/main.go'
115
--- cmd/ciborium/main.go	2014-09-24 23:02:18 +0000
116
+++ cmd/ciborium/main.go	2014-12-01 13:10:22 +0000
117
@@ -23,6 +23,8 @@
118
23
	"errors"
23
	"errors"
119
24
	"fmt"
24
	"fmt"
120
25
	"log"
25
	"log"
121
26
	"os"
122
27
	"path/filepath"
123
26
	"strings"
28
	"strings"
124
27
	"sync"
29
	"sync"
125
28
	"syscall"
30
	"syscall"
126
@@ -183,6 +185,11 @@
127
183
						msgStorageSuccess.Body,
185
						msgStorageSuccess.Body,
128
184
						sdCardIcon,
186
						sdCardIcon,
129
185
					)
187
					)
130
188
131
189
					if err := createStandardHomeDirs(m); err != nil {
132
190
						log.Println("Failed to create standard dir layout:", err)
133
191
					}
134
192
135
186
					mw.set(mountpoint(m), true)
193
					mw.set(mountpoint(m), true)
136
187
				}
194
				}
137
188
			case e := <-blockError:
195
			case e := <-blockError:
138
@@ -224,6 +231,24 @@
139
224
	<-done
231
	<-done
140
225
}
232
}
141
226
233
142
234
// createStandardHomeDirs creates directories reflecting a standard home, these
143
235
// directories are Documents, Downloads, Music, Pictures and Videos
144
236
func createStandardHomeDirs(mountpoint string) error {
145
237
	for _, node := range []string{"Documents", "Downloads", "Music", "Pictures", "Videos"} {
146
238
		dir := filepath.Join(mountpoint, node)
147
239
148
240
		if _, err := os.Stat(dir); err != nil && os.IsNotExist(err) {
149
241
			if err := os.MkdirAll(dir, 755); err != nil {
150
242
				return err
151
243
			}
152
244
		} else if err != nil {
153
245
			return err
154
246
		}
155
247
	}
156
248
157
249
	return nil
158
250
}
159
251
160
227
// notify only notifies if a notification is actually needed
252
// notify only notifies if a notification is actually needed
161
228
// depending on freeThreshold and on warningSent's status
253
// depending on freeThreshold and on warningSent's status
162
229
func buildFreeNotify(nh *notifications.NotificationHandler) notifyFreeFunc {
254
func buildFreeNotify(nh *notifications.NotificationHandler) notifyFreeFunc {
163
230
255
164
=== modified file 'debian/control'
165
--- debian/control	2014-09-02 07:01:27 +0000
166
+++ debian/control	2014-12-01 13:10:22 +0000
167
@@ -9,6 +9,7 @@
168
9
 golang-go,
9
 golang-go,
169
10
 golang-go-dbus-dev,
10
 golang-go-dbus-dev,
170
11
 golang-go-xdg-dev,
11
 golang-go-xdg-dev,
171
12
 golang-gocheck-dev,
172
12
 libqt5opengl5-dev,
13
 libqt5opengl5-dev,
173
13
 pkg-config,
14
 pkg-config,
174
14
 qtbase5-private-dev,
15
 qtbase5-private-dev,
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-12-01
Ricardo Salveti (community)		2014-11-25	Approve on 2014-12-01
Manuel de la Peña (community)			Approve on 2014-11-28
Florian Boucault		2014-11-26	Pending
Review via email: mp+242838@code.launchpad.net