Merge lp:~sergiusens/snappy/downloadIcon into lp:~snappy-dev/snappy/snappy-moved-to-github

[Sergio Schvezov]

Download store icon for package on install

This is in a directory on its own to later be able to publish the dir and export over http easily (webdm has immediate gains).

I'm not super convinced of the dirPath leaf name given that we may also consider downloading screenshots.

[John Lenton (chipaca)]

modulo a nit

review: Approve

[lp:~sergiusens/snappy/downloadIcon]

528. By Sergio Schvezov on 2015-06-30

Merged splitDown into downloadIcon.

529. By Sergio Schvezov on 2015-06-30

merge trunk

=== modified file 'snappy/dirs.go'
--- snappy/dirs.go	2015-06-16 07:13:22 +0000
+++ snappy/dirs.go	2015-06-30 12:36:43 +0000
@@ -33,6 +33,7 @@
 	snapSeccompDir   string
 	snapUdevRulesDir string
 	localeDir        string
+	snapIconsDir     string
 
 	snapBinariesDir  string
 	snapServicesDir  string
@@ -42,6 +43,8 @@
 	cloudMetaDataFile   string
 )
 
+var snappyDir = filepath.Join("var", "lib", "snappy")
+
 // SetRootDir allows settings a new global root directory, this is useful
 // for e.g. chroot operations
 func SetRootDir(rootdir string) {
@@ -52,7 +55,8 @@
 	snapDataDir = filepath.Join(rootdir, "/var/lib/apps")
 	snapDataHomeGlob = filepath.Join(rootdir, "/home/*/apps/")
 	snapAppArmorDir = filepath.Join(rootdir, "/var/lib/apparmor/clicks")
-	snapSeccompDir = filepath.Join(rootdir, "/var/lib/snappy/seccomp/profiles")
+	snapSeccompDir = filepath.Join(rootdir, snappyDir, "seccomp", "profiles")
+	snapIconsDir = filepath.Join(rootdir, snappyDir, "icons")
 
 	snapBinariesDir = filepath.Join(snapAppsDir, "bin")
 	snapServicesDir = filepath.Join(rootdir, "/etc/systemd/system")
 
=== modified file 'snappy/install_test.go'
--- snappy/install_test.go	2015-06-11 06:33:12 +0000
+++ snappy/install_test.go	2015-06-30 12:36:43 +0000
@@ -97,7 +97,7 @@
 	c.Assert(err, IsNil)
 	defer snapR.Close()
 
-	var dlURL string
+	var dlURL, iconURL string
 	mockServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		switch r.URL.Path {
 		case "/details/foo":
@@ -105,24 +105,27 @@
 "package_name": "foo",
 "version": "2",
 "origin": "test",
-"anon_download_url": "`+dlURL+`"
+"anon_download_url": "`+dlURL+`",
+"icon_url": "`+iconURL+`"
 }`)
 		case "/dl":
 			snapR.Seek(0, 0)
 			io.Copy(w, snapR)
+		case "/icon":
+			fmt.Fprintf(w, "")
 		default:
 			panic("unexpected url path: " + r.URL.Path)
 		}
 	}))
+	c.Assert(mockServer, NotNil)
+	defer mockServer.Close()
 
 	dlURL = mockServer.URL + "/dl"
+	iconURL = mockServer.URL + "/icon"
 
 	storeDetailsURI, err = url.Parse(mockServer.URL + "/details/")
 	c.Assert(err, IsNil)
 
-	c.Assert(mockServer, NotNil)
-	defer mockServer.Close()
-
 	name, err := Install("foo", 0, &progress.NullProgress{})
 	c.Assert(err, IsNil)
 	c.Check(name, Equals, "foo")
@@ -183,7 +186,7 @@
 	defer snapR.Close()
 
 	// details
-	var dlURL string
+	var dlURL, iconURL string
 	mockServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		switch r.URL.Path {
 		case "/details/foo":
@@ -191,30 +194,35 @@
 "package_name": "foo",
 "version": "2",
 "origin": "sideload",
-"anon_download_url": "`+dlURL+`"
+"anon_download_url": "`+dlURL+`",
+"icon_url": "`+iconURL+`"
 }`)
 		case "/dl":
 			snapR.Seek(0, 0)
 			io.Copy(w, snapR)
+		case "/icon":
+			fmt.Fprintf(w, "")
 		default:
 			panic("unexpected url path: " + r.URL.Path)
 		}
 	}))
+	c.Assert(mockServer, NotNil)
+	defer mockServer.Close()
+
 	dlURL = mockServer.URL + "/dl"
+	iconURL = mockServer.URL + "/icon"
 
 	storeDetailsURI, err = url.Parse(mockServer.URL + "/details/")
 	c.Assert(err, IsNil)
 
-	c.Assert(mockServer, NotNil)
-	defer mockServer.Close()
-
 	// bulk
 	mockServer = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		io.WriteString(w, `[{
 	"package_name": "foo",
 	"version": "2",
 	"origin": "sideload",
-	"anon_download_url": "`+dlURL+`"
+	"anon_download_url": "`+dlURL+`",
+	"icon_url": "`+iconURL+`"
 }]`)
 	}))
 
 
=== modified file 'snappy/parts.go'
--- snappy/parts.go	2015-05-20 17:24:29 +0000
+++ snappy/parts.go	2015-06-30 12:36:43 +0000
@@ -23,6 +23,7 @@
 	"fmt"
 	"net"
 	"net/url"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -321,3 +322,9 @@
 func PackageNameActive(name string) bool {
 	return ActiveSnapByName(name) != nil
 }
+
+// iconPath returns the would be path for the local icon
+func iconPath(s Part) string {
+	// TODO: care about extension ever being different than png
+	return filepath.Join(snapIconsDir, fmt.Sprintf("%s_%s.png", QualifiedName(s), s.Version()))
+}
 
=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-06-30 12:36:43 +0000
+++ snappy/snapp.go	2015-06-30 12:36:43 +0000
@@ -1488,6 +1488,33 @@
 	return w.Name(), w.Sync()
 }
 
+func (s *RemoteSnapPart) downloadIcon(pbar progress.Meter) error {
+	if err := os.MkdirAll(snapIconsDir, 0755); err != nil {
+		return err
+	}
+
+	iconPath := iconPath(s)
+	if helpers.FileExists(iconPath) {
+		return nil
+	}
+
+	req, err := http.NewRequest("GET", s.Icon(), nil)
+	if err != nil {
+		return err
+	}
+
+	w, err := os.OpenFile(iconPath, os.O_WRONLY|os.O_CREATE, 0644)
+	if err != nil {
+		return err
+	}
+
+	if err := download("icon for package", w, req, pbar); err != nil {
+		return err
+	}
+
+	return w.Sync()
+}
+
 // Install installs the snap
 func (s *RemoteSnapPart) Install(pbar progress.Meter, flags InstallFlags) (string, error) {
 	downloadedSnap, err := s.Download(pbar)
@@ -1496,6 +1523,10 @@
 	}
 	defer os.Remove(downloadedSnap)
 
+	if err := s.downloadIcon(pbar); err != nil {
+		return "", err
+	}
+
 	return installClick(downloadedSnap, flags, pbar, s.Origin())
 }
 
 
=== modified file 'snappy/snapp_test.go'
--- snappy/snapp_test.go	2015-06-09 19:11:54 +0000
+++ snappy/snapp_test.go	2015-06-30 12:36:43 +0000
@@ -652,20 +652,32 @@
 	c.Assert(envMap["SNAP_VERSION"], Equals, "1.10")
 }
 
-func (s *SnapTestSuite) TestUbuntuStoreRepositoryInstallRemoveSnap(c *C) {
+func (s *SnapTestSuite) TestUbuntuStoreRepositoryInstallRemoteSnap(c *C) {
 	snapPackage := makeTestSnapPackage(c, "")
 	snapR, err := os.Open(snapPackage)
 	c.Assert(err, IsNil)
 
+	iconContent := "this is an icon"
+
 	mockServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		io.Copy(w, snapR)
+		switch r.URL.Path {
+		case "/snap":
+			io.Copy(w, snapR)
+		case "/icon":
+			fmt.Fprintf(w, iconContent)
+		default:
+			panic("unexpected url path: " + r.URL.Path)
+		}
 	}))
-
 	c.Assert(mockServer, NotNil)
 	defer mockServer.Close()
 
 	snap := RemoteSnapPart{}
 	snap.pkg.AnonDownloadURL = mockServer.URL + "/snap"
+	snap.pkg.IconURL = mockServer.URL + "/icon"
+	snap.pkg.Name = "foo"
+	snap.pkg.Origin = "bar"
+	snap.pkg.Version = "1.0"
 
 	p := &MockProgressMeter{}
 	name, err := snap.Install(p, 0)
@@ -673,7 +685,11 @@
 	c.Check(name, Equals, "foo")
 	st, err := os.Stat(snapPackage)
 	c.Assert(err, IsNil)
-	c.Assert(p.written, Equals, int(st.Size()))
+	c.Assert(p.written, Equals, int(st.Size())+len(iconContent))
+
+	iconPath := filepath.Join(snapIconsDir, "foo.bar_1.0.png")
+	_, err = os.Stat(iconPath)
+	c.Assert(err, IsNil)
 }
 
 func (s *SnapTestSuite) TestRemoteSnapUpgradeService(c *C) {
@@ -686,17 +702,28 @@
 	snapR, err := os.Open(snapPackage)
 	c.Assert(err, IsNil)
 
+	iconContent := "icon"
 	mockServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		io.Copy(w, snapR)
-		snapR.Seek(0, 0)
+		switch r.URL.Path {
+		case "/snap":
+			io.Copy(w, snapR)
+			snapR.Seek(0, 0)
+		case "/icon":
+			fmt.Fprintf(w, iconContent)
+		default:
+			panic("unexpected url path: " + r.URL.Path)
+		}
 	}))
-
 	c.Assert(mockServer, NotNil)
 	defer mockServer.Close()
 
 	snap := RemoteSnapPart{}
 	snap.pkg.AnonDownloadURL = mockServer.URL + "/snap"
 	snap.pkg.Origin = testOrigin
+	snap.pkg.IconURL = mockServer.URL + "/icon"
+	snap.pkg.Name = "foo"
+	snap.pkg.Origin = "bar"
+	snap.pkg.Version = "1.0"
 
 	p := &MockProgressMeter{}
 	name, err := snap.Install(p, 0)