Merge lp:~sergiusens/snapweb/sizeSupport into lp:~snappy-dev/snapweb/trunk

[Sergio Schvezov]

Add size reporting support

[lp:~sergiusens/snapweb/sizeSupport]

116. By Sergio Schvezov on 2015-05-03

adding some extra magic to size stub

[John Lenton (chipaca)]

lgtm, fwiw

[lp:~sergiusens/snapweb/sizeSupport]

117. By Sergio Schvezov on 2015-05-03

Adding readbility space

[Stephen Stewart (stephen-stewart)]

17:31 < sergiusens> beowulf: btw, that was the outcome from size support?
[...]
17:36 < beowulf> sergiusens: about adding it to the store or using it as is? adding to the store i can talk to beuno about tomorrow, though i think he's already aware
17:38 < sergiusens> beowulf: can you comment on my MP then so we don't lose this info; if it's fine as it is now, let's just get that in and add a work item
17:38 < beowulf> sergiusens: using it as is is fine, it'll just be a little inconsistent around the edges of installing
[..]
17:38 < beowulf> sergiusens: ack

[Stephen Stewart (stephen-stewart)]

review: Approve

[John Lenton (chipaca)]

review: Approve

=== modified file 'snappy/common_test.go'
--- snappy/common_test.go	2015-05-03 19:54:18 +0000
+++ snappy/common_test.go	2015-05-03 22:05:46 +0000
@@ -87,6 +87,22 @@
 	return p.installed
 }
 
+func (p fakeSnappyPart) InstalledSize() int64 {
+	if p.installed {
+		return 30
+	}
+
+	return -1
+}
+
+func (p fakeSnappyPart) DownloadSize() int64 {
+	if !p.installed {
+		return 60
+	}
+
+	return -1
+}
+
 func (p fakeSnappyPart) Name() string {
 	return p.name
 }

=== modified file 'snappy/converge.go'
--- snappy/converge.go	2015-05-03 20:35:34 +0000
+++ snappy/converge.go	2015-05-03 22:05:46 +0000
@@ -28,16 +28,18 @@
 )
 
 type snapPkg struct {
-	Name     string          `json:"name"`
-	Origin   string          `json:"origin"`
-	Version  string          `json:"version"`
-	Icon     string          `json:"icon"`
-	Status   string          `json:"status"`
-	Message  string          `json:"message,omitempty"`
-	Progress float64         `json:"progress,omitempty"`
-	Type     snappy.SnapType `json:"type,omitempty"`
-	UIPort   uint64          `json:"ui_port,omitempty"`
-	UIUri    string          `json:"ui_uri,omitempty"`
+	Name          string          `json:"name"`
+	Origin        string          `json:"origin"`
+	Version       string          `json:"version"`
+	Icon          string          `json:"icon"`
+	Status        string          `json:"status"`
+	Message       string          `json:"message,omitempty"`
+	Progress      float64         `json:"progress,omitempty"`
+	InstalledSize int64           `json:"installed_size,omitempty"`
+	DownloadSize  int64           `json:"download_size,omitempty"`
+	Type          snappy.SnapType `json:"type,omitempty"`
+	UIPort        uint64          `json:"ui_port,omitempty"`
+	UIUri         string          `json:"ui_uri,omitempty"`
 }
 
 type response struct {
@@ -180,8 +182,10 @@
 		}
 
 		snap.Icon = iconPath
+		snap.InstalledSize = snapQ.InstalledSize()
 	} else {
 		snap.Icon = snapQ.Icon()
+		snap.DownloadSize = snapQ.DownloadSize()
 	}
 
 	if stat, ok := h.installStatus.Get(snap.Name); ok {

=== modified file 'snappy/converge_test.go'
--- snappy/converge_test.go	2015-05-03 20:35:34 +0000
+++ snappy/converge_test.go	2015-05-03 22:05:46 +0000
@@ -169,14 +169,20 @@
 	c.Check(snaps[0].Name, Equals, "app1.canonical")
 	c.Check(snaps[0].Version, Equals, "1.0")
 	c.Check(snaps[0].Status, Equals, webprogress.StatusInstalled)
+	c.Check(snaps[0].InstalledSize, Equals, int64(30))
+	c.Check(snaps[0].DownloadSize, Equals, int64(0))
 
 	c.Check(snaps[1].Name, Equals, "app2.canonical")
 	c.Check(snaps[1].Version, Equals, "2.0")
 	c.Check(snaps[1].Status, Equals, webprogress.StatusInstalled)
+	c.Check(snaps[1].InstalledSize, Equals, int64(30))
+	c.Check(snaps[1].DownloadSize, Equals, int64(0))
 
 	c.Check(snaps[2].Name, Equals, "app3.canonical")
 	c.Check(snaps[2].Version, Equals, "3.0")
 	c.Check(snaps[2].Status, Equals, webprogress.StatusInstalled)
+	c.Check(snaps[2].InstalledSize, Equals, int64(30))
+	c.Check(snaps[2].DownloadSize, Equals, int64(0))
 
 	// Installed and remotes
 	snaps = mergeSnaps(installed, remotes, false)
@@ -186,18 +192,26 @@
 	c.Check(snaps[0].Name, Equals, "app1.canonical")
 	c.Check(snaps[0].Version, Equals, "1.0")
 	c.Check(snaps[0].Status, Equals, webprogress.StatusInstalled)
+	c.Check(snaps[0].InstalledSize, Equals, int64(30))
+	c.Check(snaps[0].DownloadSize, Equals, int64(0))
 
 	c.Check(snaps[1].Name, Equals, "app2.canonical")
 	c.Check(snaps[1].Version, Equals, "2.0")
 	c.Check(snaps[1].Status, Equals, webprogress.StatusInstalled)
+	c.Check(snaps[1].InstalledSize, Equals, int64(30))
+	c.Check(snaps[1].DownloadSize, Equals, int64(0))
 
 	c.Check(snaps[2].Name, Equals, "app3.canonical")
 	c.Check(snaps[2].Version, Equals, "3.0")
 	c.Check(snaps[2].Status, Equals, webprogress.StatusInstalled)
+	c.Check(snaps[2].InstalledSize, Equals, int64(30))
+	c.Check(snaps[2].DownloadSize, Equals, int64(0))
 
 	c.Check(snaps[3].Name, Equals, "app3.ubuntu")
 	c.Check(snaps[3].Version, Equals, "3.0")
 	c.Check(snaps[3].Status, Equals, webprogress.StatusUninstalled)
+	c.Check(snaps[3].InstalledSize, Equals, int64(0))
+	c.Check(snaps[3].DownloadSize, Equals, int64(60))
 }
 
 func (s *MergeSuite) TestManyInstalledAndManyRemotesSomeInstalling(c *C) {
@@ -235,8 +249,12 @@
 	c.Check(snaps[3].Name, Equals, "app4.ubuntu")
 	c.Check(snaps[3].Version, Equals, "2.0")
 	c.Check(snaps[3].Status, Equals, webprogress.StatusInstalling)
+	c.Check(snaps[3].InstalledSize, Equals, int64(0))
+	c.Check(snaps[3].DownloadSize, Equals, int64(60))
 
 	c.Check(snaps[4].Name, Equals, "app5.ubuntu")
 	c.Check(snaps[4].Version, Equals, "3.0")
 	c.Check(snaps[4].Status, Equals, webprogress.StatusUninstalled)
+	c.Check(snaps[4].InstalledSize, Equals, int64(0))
+	c.Check(snaps[4].DownloadSize, Equals, int64(60))
 }