Added ability to use local base image for skyimager.

Author: 志宇

Makefile

@@ -43,6 +43,7 @@ test: ## Run tests
 
 integration: build-skyconf ## runs integration tests.
 	./integration/run.sh
+	sudo rm -rf ./integration/mnt
 
 build-skyconf: ## builds skyconf.
 	${OPTS} go install ./cmd/skyconf

go.mod

@@ -10,7 +10,6 @@ require (
 	github.com/SkycoinProject/skywire-mainnet v0.1.2
 	github.com/google/go-github v17.0.0+incompatible
 	github.com/google/go-querystring v1.0.0 // indirect
-	github.com/lucor/fyne-cross v1.4.0 // indirect
 	github.com/mholt/archiver v3.1.1+incompatible
 	github.com/rakyll/statik v0.1.7
 	github.com/sirupsen/logrus v1.5.0

go.sum

@@ -1,5 +1,4 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-fyne.io/fyne v1.2.2/go.mod h1:Ab+3DIB/FVteW0y4DXfmZv4N3JdnCBh2lHkINI02BOU=
 fyne.io/fyne v1.2.3 h1:5xwtSBNjxxmg+GF/lYvvf4xPzyjgWQoJVrzb+bt5gaA=
 fyne.io/fyne v1.2.3/go.mod h1:JhDdBrPP/Kdr1H5ZT3HW8E/6zlz+GkOldWqSirGBDnY=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -141,8 +140,6 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/lucor/fyne-cross v1.4.0 h1:AEY8ayoxskmzQF1XBLcnK8IK5/Ejmiaz2IeThM/yOms=
-github.com/lucor/fyne-cross v1.4.0/go.mod h1:lVIalVfFMFxYEbKuaKTskX9NKh07kT5bnoEEqeKGY2U=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=

pkg/imager/fyne.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"net"
 	"net/http"
+	"os"
 	"path/filepath"
 	"time"
 
@@ -34,15 +35,19 @@ type FyneUI struct {
 	app fyne.App
 	w   fyne.Window
 
-	releases []Release
-	wkDir    string
-	baseImg  string
-	gwIP     net.IP
-	socksPC  string
-	visors   int
-	hvImg    bool
-	hvPKs    []cipher.PubKey
-	bps      []boot.Params
+	releases  []Release
+	locations []string
+
+	wkDir   string
+	imgLoc  string
+	remImg  string
+	fsImg   string
+	gwIP    net.IP
+	socksPC string
+	visors  int
+	hvImg   bool
+	hvPKs   []cipher.PubKey
+	bps     []boot.Params
 }
 
 // NewFyneUI creates a new Fyne UI.
@@ -51,6 +56,10 @@ func NewFyneUI(log logrus.FieldLogger, assets http.FileSystem) *FyneUI {
 	fg.log = log
 	fg.assets = assets
 
+	fg.locations = []string{
+		"From remote server.",
+		"From local filesystem.",
+	}
 	fg.resetPage2Values()
 
 	fa := app.New()
@@ -123,7 +132,7 @@ func (fg *FyneUI) generateBPS() (string, error) {
 func (fg *FyneUI) build() {
 	bpsSlice := fg.bps
 
-	baseURL, err := releaseURL(fg.releases, fg.baseImg)
+	baseURL, err := releaseURL(fg.releases, fg.remImg)
 	if err != nil {
 		err = fmt.Errorf("failed to find download URL for base image: %v", err)
 		dialog.ShowError(err, fg.w)
@@ -137,53 +146,81 @@ func (fg *FyneUI) build() {
 		return
 	}
 
-	// Download section.
-	dlTitle := "Downloading Base Image"
-	dlMsg := fg.baseImg + "\n" + baseURL
-	dlDialog := dialog.NewProgress(dlTitle, dlMsg, fg.w)
-	dlDialog.Show()
-	dlDone := make(chan struct{})
-	go func() {
-		t := time.NewTicker(time.Second)
-		for {
-			select {
-			case <-t.C:
-				dlC, dlT := float64(builder.DownloadCurrent()), float64(builder.DownloadTotal())
-				if pc := dlC / dlT; pc > 0 && pc <= 1 {
-					dlDialog.SetValue(pc)
+	// Final images to obtain.
+	var imgs []string
+
+	switch fg.imgLoc {
+	case fg.locations[0]:
+
+		// Download section.
+		dlTitle := "Downloading Base Image"
+		dlMsg := fg.remImg + "\n" + baseURL
+		dlDialog := dialog.NewProgress(dlTitle, dlMsg, fg.w)
+		dlDialog.Show()
+		dlDone := make(chan struct{})
+		go func() {
+			t := time.NewTicker(time.Second)
+			for {
+				select {
+				case <-t.C:
+					dlC, dlT := float64(builder.DownloadCurrent()), float64(builder.DownloadTotal())
+					if pc := dlC / dlT; pc > 0 && pc <= 1 {
+						dlDialog.SetValue(pc)
+					}
+				case <-dlDone:
+					t.Stop()
+					return
 				}
-			case <-dlDone:
-				t.Stop()
-				return
 			}
+		}()
+		err = builder.Download(baseURL)
+		close(dlDone)
+		dlDialog.Hide()
+		if err != nil {
+			dialog.ShowError(err, fg.w)
+			return
 		}
-	}()
-	err = builder.Download(baseURL)
-	close(dlDone)
-	dlDialog.Hide()
-	if err != nil {
-		dialog.ShowError(err, fg.w)
-		return
-	}
 
-	// Extract section.
-	extDialog := dialog.NewProgressInfinite("Extracting Archive", builder.DownloadPath(), fg.w)
-	extDialog.Show()
-	err = builder.ExtractArchive()
-	extDialog.Hide()
-	if err != nil {
-		dialog.ShowError(err, fg.w)
-		return
-	}
+		// Extract section.
+		extDialog := dialog.NewProgressInfinite("Extracting Archive", builder.DownloadPath(), fg.w)
+		extDialog.Show()
+		err = builder.ExtractArchive()
+		extDialog.Hide()
+		if err != nil {
+			dialog.ShowError(err, fg.w)
+			return
+		}
 
-	imgs := builder.Images()
-	fg.log.
-		WithField("n", len(imgs)).
-		WithField("imgs", imgs).
-		Info("Obtained base images.")
+		imgs = builder.Images()
+		fg.log.
+			WithField("n", len(imgs)).
+			WithField("imgs", imgs).
+			Info("Obtained base images.")
 
-	if len(imgs) == 0 {
-		dialog.ShowError(errors.New("no valid images in archive"), fg.w)
+		if len(imgs) == 0 {
+			dialog.ShowError(errors.New("no valid images in archive"), fg.w)
+			return
+		}
+
+	case fg.locations[1]:
+		// TODO(evanlinjin): The following is very hacky. Please fix.
+		f, err := os.Open(fg.fsImg)
+		if err != nil {
+			dialog.ShowError(fmt.Errorf("failed to open base image: %v", err), fg.w)
+			return
+		}
+		imgs = append(imgs, fg.fsImg)
+		builder.bImgs[fg.fsImg] = BaseImage{
+			File:         f,
+			MD5:          nil,
+			SHA1:         nil,
+			ExpectedMD5:  [16]byte{},
+			ExpectedSHA1: [20]byte{},
+		}
+
+	default:
+		err := errors.New("no base image selected")
+		dialog.ShowError(err, fg.w)
 		return
 	}
 

pkg/imager/fyne_pages.go

@@ -43,15 +43,42 @@ func (fg *FyneUI) Page1() fyne.CanvasObject {
 func (fg *FyneUI) Page2() fyne.CanvasObject {
 	wkDir := newLinkedEntry(&fg.wkDir)
 
-	baseImgs, latestImg := fg.listBaseImgs()
-	baseImg := widget.NewSelect(baseImgs, func(s string) {
-		fg.baseImg = s
-		fg.log.Debugf("Set: fg.baseImg = %v", s)
+	remImgs, latestImg := fg.listBaseImgs()
+	remImg := widget.NewSelect(remImgs, func(s string) {
+		fg.remImg = s
+		fg.log.Debugf("Set: fg.remImg = %v", s)
 	})
-	if baseImg.Selected = fg.baseImg; baseImg.Selected == "" && len(baseImg.Options) > 0 {
-		baseImg.SetSelected(latestImg)
+	if remImg.Selected = fg.remImg; remImg.Selected == "" && len(remImg.Options) > 0 {
+		remImg.SetSelected(latestImg)
 	}
+	remImg.Hide()
 
+	fsImg := widget.NewEntry()
+	fsImg.SetPlaceHolder("path to .img file")
+	fsImg.OnChanged = func(s string) {
+		fg.fsImg = s
+		fg.log.Debugf("Set: fg.fsImg = %v", s)
+	}
+	fsImg.SetText(fg.fsImg)
+	fsImg.Hide()
+
+	imgLoc := widget.NewRadio(fg.locations, func(s string) {
+		switch fg.imgLoc = s; s {
+		case fg.locations[0]:
+			remImg.Show()
+			fsImg.Hide()
+		case fg.locations[1]:
+			remImg.Hide()
+			fsImg.Show()
+		default:
+			remImg.Hide()
+			fsImg.Hide()
+		}
+	})
+	imgLoc.SetSelected(fg.imgLoc)
+	imgLoc.OnChanged(fg.imgLoc)
+
+	// Gateway IP:
 	gwIP := newEntry(fg.gwIP.String(), func(s string) {
 		fg.gwIP = net.ParseIP(s)
 		fg.log.Debugf("Set: fg.gwIP = %v", s)
@@ -147,7 +174,7 @@ func (fg *FyneUI) Page2() fyne.CanvasObject {
 	}
 	return makePage(conf,
 		widget.NewLabel("Work Directory:"), wkDir,
-		widget.NewLabel("Base Image:"), baseImg,
+		widget.NewLabel("Base Image:"), imgLoc, remImg, fsImg,
 		widget.NewLabel("Gateway IP:"), gwIP,
 		widget.NewLabel("Skysocks Passcode:"), socksPC,
 		widget.NewLabel("Number of Visor Images:"), visors,
@@ -156,7 +183,7 @@ func (fg *FyneUI) Page2() fyne.CanvasObject {
 
 func (fg *FyneUI) resetPage2Values() {
 	fg.wkDir = DefaultRootDir()
-	fg.baseImg = ""
+	fg.remImg = ""
 	fg.gwIP = net.ParseIP(boot.DefaultGatewayIP)
 	fg.socksPC = ""
 	fg.visors = DefaultVisors
@@ -168,9 +195,22 @@ func checkPage2Inputs(fg *FyneUI, visorsText string) bool {
 	if _, err := filepath.Abs(fg.wkDir); err != nil {
 		return showErr(fg, fmt.Errorf("invalid Work Directory: %v", err))
 	}
-	if strings.TrimSpace(fg.baseImg) == "" {
-		return showErr(fg, errors.New("invalid Base Image URL: cannot be empty"))
+	switch fg.imgLoc {
+	case fg.locations[0]:
+		if strings.TrimSpace(fg.remImg) == "" {
+			return showErr(fg, errors.New("invalid Base Image URL: cannot be empty"))
+		}
+	case fg.locations[1]:
+		if !strings.HasSuffix(fg.fsImg, ".img") {
+			return showErr(fg, errors.New("invalid Base Image Path: file needs to have .img extension"))
+		}
+		if _, err := os.Stat(fg.fsImg); err != nil {
+			return showErr(fg, fmt.Errorf("cannot access Base Image: %v", err))
+		}
+	default:
+		return showErr(fg, errors.New("no base image selected"))
 	}
+
 	if fg.gwIP == nil {
 		return showErr(fg, fmt.Errorf("invalid Gateway IP"))
 	}
@@ -218,15 +258,15 @@ func (fg *FyneUI) Page3(bpsStr string) fyne.CanvasObject {
 			}
 			bps.SetText(bpsStr)
 		},
-		NextText: "Download and Build",
+		NextText: "Build",
 		Next: func() {
 			// Decode bps entry text to ensure changes are recorded.
 			dec := json.NewDecoder(strings.NewReader(bps.Text))
 			if err := dec.Decode(&fg.bps); err != nil {
 				dialog.ShowError(fmt.Errorf("invalid boot paramters: %v", err), fg.w)
 				return
 			}
-			dialog.ShowConfirm("Confirmation", "Start download and build?", func(b bool) {
+			dialog.ShowConfirm("Confirmation", "Start build?", func(b bool) {
 				if b {
 					fg.build()
 				}