Merge lp:~mariogrip/goget-ubuntu-touch/device-alias into lp:goget-ubuntu-touch

[Marius Gripsgard ]

Support for device aliases

Unmerged revisions

221. By Marius Gripsgard  on 2016-01-18

Add support for device alias

=== modified file 'ubuntu-device-flash/touch.go'
--- ubuntu-device-flash/touch.go	2015-02-10 05:51:08 +0000
+++ ubuntu-device-flash/touch.go	2016-01-27 17:18:34 +0000
@@ -120,6 +120,12 @@
 	if err := touchCmd.setupDevice(); err != nil {
 		return err
 	}
+
+  if hasDeviceAlias, deviceAlias := channels.HasDeviceAlias(globalArgs.Server, touchCmd.Channel, touchCmd.Device); hasDeviceAlias {
+		log.Printf("|%s| is an alias for |%s|", touchCmd.Device, deviceAlias);
+		touchCmd.Device = deviceAlias
+	}
+
 	log.Printf("Device is |%s|", touchCmd.Device)
 
 	deviceChannel, err := channels.GetDeviceChannel(globalArgs.Server, touchCmd.Channel, touchCmd.Device)

=== modified file 'ubuntuimage/channels.go'
--- ubuntuimage/channels.go	2015-04-16 22:59:18 +0000
+++ ubuntuimage/channels.go	2016-01-27 17:18:34 +0000
@@ -59,6 +59,13 @@
 	return channels, nil
 }
 
+func (channels Channels) HasDeviceAlias(server, channel, device string) (bool, string) {
+	 if _, found := channels[channel].DevicesAlias[device]; found {
+		return true, channels[channel].DevicesAlias[device].Device;
+	}
+	return false, "";
+}
+
 func (channels Channels) GetDeviceChannel(server, channel, device string) (deviceChannel DeviceChannel, err error) {
 	if _, found := channels[channel]; !found {
 		return deviceChannel, fmt.Errorf("Channel %s not found on server %s", channel, server)

=== modified file 'ubuntuimage/types.go'
--- ubuntuimage/types.go	2014-11-19 15:54:36 +0000
+++ ubuntuimage/types.go	2016-01-27 17:18:34 +0000
@@ -23,8 +23,13 @@
 	Index string
 }
 
+type DeviceAlias struct {
+	Device string
+}
+
 type Channel struct {
 	Devices map[string]Device `json:"devices"`
+	DevicesAlias map[string]DeviceAlias   `json:"deviceAlias"`
 	Alias   string            `json:"alias"`
 	Hidden  bool              `json:"hidden,omitempty"`
 }