Merge lp:~jamesodhunt/goget-ubuntu-touch/add-list-images-option into lp:goget-ubuntu-touch

[James Hunt]

ubuntu-device-flash: add '--list-images' option to display brief image details, one per line.

Add '--list-images' option.

[lp:~jamesodhunt/goget-ubuntu-touch/add-list-images-option]

74. By James Hunt on 2014-09-30

[ Sergio Schvezov ]
ubuntu-device-flash: minor improvements to user experience and code
polish

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:73
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesodhunt/goget-ubuntu-touch/add-list-images-option/+merge/236510/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-ci/72/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-utopic-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-utopic-armhf-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-utopic-i386-ci/36

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/goget-ubuntu-touch-ci/72/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:74
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesodhunt/goget-ubuntu-touch/add-list-images-option/+merge/236510/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-ci/73/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-utopic-amd64-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-utopic-armhf-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-utopic-i386-ci/37

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/goget-ubuntu-touch-ci/73/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:74
http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-ci/74/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-utopic-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-utopic-armhf-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-utopic-i386-ci/38

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/goget-ubuntu-touch-ci/74/rebuild

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

you probably want to do something like this (or move it to a separate function maybe)

if args.ListImages
 if args.Device == "" {
  log.Fatal("You must specify a device type")
 }

 deviceChannel, err := channels.GetDeviceChannel(
  args.Server, args.Channel, args.Device)
 if err != nil {
  log.Fatal(err)
 }

 return deviceChannel.ListImageVersions()
}

and keep the original deviceChannel setup that in it's original location to avoid the from below to not break current "device" autodetection

review: Needs Fixing

[lp:~jamesodhunt/goget-ubuntu-touch/add-list-images-option]

75. By James Hunt on 2014-10-02

* ubuntu-device-flash/main.go: Revert to calling GetDeviceChannel() as
  late as possible to avoid breaking device auto-detection when not
  running '--list-images'.

[James Hunt (jamesodhunt)]

Thanks for reviewing. Branch updated.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:75
http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-ci/75/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-utopic-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-utopic-armhf-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-utopic-i386-ci/39

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/goget-ubuntu-touch-ci/75/rebuild

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'ubuntu-device-flash/args.go'
--- ubuntu-device-flash/args.go	2014-09-03 12:53:40 +0000
+++ ubuntu-device-flash/args.go	2014-10-02 08:49:00 +0000
@@ -28,6 +28,7 @@
 	Revision      int    `long:"revision" description:"revision to flash, absolute or relative allowed"`
 	Bootstrap     bool   `long:"bootstrap" description:"bootstrap the system, do this from the bootloader"`
 	ListChannels  bool   `long:"list-channels" description:"List available channels"`
+	ListImages    bool   `long:"list-images" description:"List available images for a channel"`
 	Wipe          bool   `long:"wipe" description:"Clear all data after flashing"`
 	Channel       string `long:"channel" description:"Specify an alternate channel"`
 	ShowImage     bool   `long:"show-image" description:"Show information for an image in the given channel"`

=== modified file 'ubuntu-device-flash/main.go'
--- ubuntu-device-flash/main.go	2014-09-25 13:40:20 +0000
+++ ubuntu-device-flash/main.go	2014-10-02 08:49:00 +0000
@@ -98,6 +98,25 @@
 		}
 		return
 	}
+
+	if args.ListImages {
+		if args.Device == "" {
+			log.Fatal("You must specify a device type")
+		}
+
+		deviceChannel, err := channels.GetDeviceChannel(
+			args.Server, args.Channel, args.Device)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		err = deviceChannel.ListImageVersions()
+		if err != nil {
+			log.Fatal(err)
+		}
+		return
+	}
+
 	cacheDir := ubuntuimage.GetCacheDir()
 	if args.CleanCache {
 		log.Print("Cleaning prevously downloaded content")

=== modified file 'ubuntuimage/channels.go'
--- ubuntuimage/channels.go	2014-04-16 17:00:53 +0000
+++ ubuntuimage/channels.go	2014-10-02 08:49:00 +0000
@@ -26,10 +26,12 @@
 	"errors"
 	"fmt"
 	"net/http"
+	"io/ioutil"
 )
 
 const (
 	channelsPath = "/channels.json"
+	indexName    = "index.json"
 	FULL_IMAGE   = "full"
 )
 
@@ -80,6 +82,8 @@
 		return i1.Version > i2.Version
 	}
 	ImageBy(order).ImageSort(deviceChannel.Images)
+
+	deviceChannel.Url = channelUri
 	return deviceChannel, err
 }
 
@@ -93,6 +97,53 @@
 	return image, fmt.Errorf("Failed to locate image %d", revision)
 }
 
+func (deviceChannel *DeviceChannel) ListImageVersions() (err error) {
+
+	jsonData := map[string]interface{}{}
+
+	resp, err := client.Get(deviceChannel.Url)
+	if err != nil {
+		return err
+	}
+
+	if (resp.StatusCode != 200) {
+		statusErr := errors.New(fmt.Sprintf("Invalid HTTP response: %d", resp.StatusCode))
+		return statusErr
+	}
+
+	defer resp.Body.Close()
+
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return err
+	}
+
+	err = json.Unmarshal(body, &jsonData)
+	if err != nil {
+		return err
+	}
+
+	images := jsonData["images"].([]interface{})
+
+	for i := range images {
+		entry := images[i].(map[string]interface{})
+
+		imageType := entry["type"]
+
+		if imageType != FULL_IMAGE {
+			// ignore delta images as they cannot be used to
+			// perform an initial device flash
+			continue
+		}
+
+		fmt.Printf("%d: description='%s'\n",
+			int(entry["version"].(float64)),
+			entry["description"])
+	}
+
+	return nil
+}
+
 func (deviceChannel *DeviceChannel) GetRelativeImage(revision int) (image Image, err error) {
 	var steps int
 	if revision < 0 {

=== modified file 'ubuntuimage/types.go'
--- ubuntuimage/types.go	2014-04-16 11:43:38 +0000
+++ ubuntuimage/types.go	2014-10-02 08:49:00 +0000
@@ -30,6 +30,12 @@
 
 type Channels map[string]Channel
 
+type ImageVersion struct {
+	Description               string
+}
+
+type ImageVersions map[int]ImageVersion
+
 type File struct {
 	Server                    string
 	Checksum, Path, Signature string
@@ -43,6 +49,7 @@
 }
 
 type DeviceChannel struct {
+	Url    string
 	Alias  string
 	Images []Image
 }