Skip to content

Commit

Permalink
Add support for update notifications
Browse files Browse the repository at this point in the history
Include a copy of the autoupdater package as an internal package,
since its API is still in flux and likely to break
  • Loading branch information
alberto-frsky committed Mar 25, 2020
1 parent e91c22c commit 670d51e
Show file tree
Hide file tree
Showing 10 changed files with 497 additions and 0 deletions.
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ require (
github.com/fiam/max7456tool v0.0.0-20200315213155-9fc707e4e8d8
github.com/go-daq/crc8 v0.0.0-20170116120732-380c22547098
github.com/google/go-github v17.0.0+incompatible
github.com/google/go-github/v30 v30.0.0
github.com/google/go-querystring v1.0.0 // indirect
github.com/gotk3/gotk3 v0.4.0 // indirect
github.com/hashicorp/go-version v1.2.0
github.com/icza/bitio v1.0.0
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
github.com/sirupsen/logrus v1.4.2
github.com/sqweek/dialog v0.0.0-20200304031853-0dcd55bfe06a
github.com/stretchr/testify v1.4.0
Expand Down
9 changes: 9 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@ github.com/go-gl/glfw v0.0.0-20181213070059-819e8ce5125f h1:7MsFMbSn8Lcw0blK4+NE
github.com/go-gl/glfw v0.0.0-20181213070059-819e8ce5125f/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/goki/freetype v0.0.0-20181231101311-fa8a33aabaff h1:W71vTCKoxtdXgnm1ECDFkfQnpdqAO00zzGXLA5yaEX8=
github.com/goki/freetype v0.0.0-20181231101311-fa8a33aabaff/go.mod h1:wfqRWLHRBsRgkp5dmbG56SA0DmVtwrF5N3oPdI8t+Aw=
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
github.com/google/go-github/v30 v30.0.0 h1:5UgIxLcf4zolLP8QpFcrSku0G1Y/p5+WChWL11dFlnQ=
github.com/google/go-github/v30 v30.0.0/go.mod h1:n8jBpHl45a/rlBUtRJMOG4GhNADUQFEufcolZ95JfU8=
github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
github.com/gotk3/gotk3 v0.4.0 h1:TIuhyQitGeRTxOQIV3AJlYtEWWJpC74JHwAIsxlH8MU=
Expand All @@ -50,6 +53,8 @@ github.com/mattn/go-gtk v0.0.0-20180216084204-5a311a1830ab/go.mod h1:PwzwfeB5syF
github.com/mattn/go-pointer v0.0.0-20171114154726-1d30dc4b6f28/go.mod h1:2zXcozF6qYGgmsG+SeTZz3oAbFLdD3OWqnUbNvJZAlc=
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 h1:49lOXmGaUpV9Fz3gd7TFZY106KVlPVa5jcYD1gaQf98=
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Expand All @@ -74,6 +79,7 @@ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJy
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
go.bug.st/serial v1.0.0 h1:ogEPzrllCsnG00EqKRjeYvPRsO7NJW6DqykzkdD6E/k=
go.bug.st/serial v1.0.0/go.mod h1:rpXPISGjuNjPTRTcMlxi9lN6LoIPxd1ixVjBd8aSk/Q=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8 h1:idBdZTd9UioThJp8KpM/rTSinK/ChZFBE43/WtIy8zg=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
Expand All @@ -82,8 +88,10 @@ golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDA
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Expand All @@ -93,6 +101,7 @@ golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9 h1:ZBzSG/7F4eNKz2L3GE9o300RX
golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
Expand Down
156 changes: 156 additions & 0 deletions internal/autoupdater/autoupdater.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
package autoupdater

import (
"context"
"errors"
"log"
"sort"
"sync"
"time"

"github.com/hashicorp/go-version"
"github.com/pkg/browser"
)

type Options struct {
// Version overrides the app version returned automatically
Version string
AcceptPreleases bool
// NoSkipRelease disables the "Skip this release" option
NoSkipRelease bool
Source Source
Dialog Dialog
}

type AutoUpdater struct {
opts *Options
}

// New returns a new AutoUpdater. See the Options
// type for the available options.
func New(opts *Options) (*AutoUpdater, error) {
if opts == nil || opts.Source == nil {
panic(errors.New("Source cannot be nil"))
}
if opts == nil || opts.Dialog == nil {
panic(errors.New("Dialog cannot be nil"))
}
return &AutoUpdater{
opts: opts,
}, nil
}

func (au *AutoUpdater) currentVersion() (string, error) {
return au.opts.Version, nil
}

func (au *AutoUpdater) CheckForUpdates(ctx context.Context) error {
var allReleases []*Release
var releases []*Release
var next string
var err error
for {
releases, next, err = au.opts.Source.AvailableVersions(ctx, next)
if err != nil {
return err
}
foundNonPrerelease := false
for _, r := range releases {
if !r.IsPrerelease {
foundNonPrerelease = true
}
allReleases = append(allReleases, r)
}
if foundNonPrerelease {
break
}
if next == "" {
break
}
}
if !au.opts.AcceptPreleases {
var nonPrereleases []*Release
for _, r := range allReleases {
if !r.IsPrerelease {
nonPrereleases = append(nonPrereleases, r)
}
}
allReleases = nonPrereleases
}
if len(allReleases) == 0 {
// No updates found
return nil
}
sort.Slice(allReleases, func(i, j int) bool {
ri := allReleases[i]
rj := allReleases[j]
vi := version.Must(version.NewVersion(ri.Version))
vj := version.Must(version.NewVersion(rj.Version))

return vi.GreaterThan(vj)
})
currentVersion, err := au.currentVersion()
if err != nil {
return err
}
var responses []DialogResponse
if au.opts.NoSkipRelease {
responses = append(responses, DialogResponseCancel)
} else {
responses = append(responses, DialogResponseSkipRelease)
}
responses = append(responses, DialogResponseRemindLater)
if au.canInstallUpdates() {
responses = append(responses, DialogResponseDownloadAndInstall)
} else {
responses = append(responses, DialogResponseDownload)
}
var resp DialogResponse
var wg sync.WaitGroup
wg.Add(1)
opts := &DialogOptions{
CurrentVersion: currentVersion,
AvailableRelease: allReleases[0],
Responses: responses,
Response: func(r DialogResponse) {
defer wg.Done()
resp = r
},
}
go au.opts.Dialog.ShowUpdaterDialog(opts)
wg.Wait()
switch resp {
case DialogResponseCancel:
return nil
case DialogResponseSkipRelease:
return au.skipRelease(opts.AvailableRelease)
case DialogResponseRemindLater:
// Nothing to do, we'll remind on next check
return nil
case DialogResponseDownload:
return browser.OpenURL(opts.AvailableRelease.URL)
case DialogResponseDownloadAndInstall:
// TODO
}
return nil
}

func (au *AutoUpdater) skipRelease(rel *Release) error {
// TODO: Skip
return nil
}

// ScheduleCheckingForUpdates checks for updates once, then starts
// checking again indefinitely at the given interval.
func (au *AutoUpdater) ScheduleCheckingForUpdates(interval time.Duration) {
doCheck := func() {
ctx := context.Background()
if err := au.CheckForUpdates(ctx); err != nil {
log.Printf("error checking for updates: %v", err)
}
}
go doCheck()
for range time.Tick(interval) {
doCheck()
}
}
49 changes: 49 additions & 0 deletions internal/autoupdater/dialog.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package autoupdater

import "fmt"

type DialogOptions struct {
CurrentVersion string
AvailableRelease *Release
Responses []DialogResponse
Response func(DialogResponse)
}

func (opts *DialogOptions) AllowsResponse(r DialogResponse) bool {
for _, v := range opts.Responses {
if v == r {
return true
}
}
return false
}

type DialogResponse int

const (
DialogResponseSkipRelease DialogResponse = iota
DialogResponseCancel
DialogResponseRemindLater
DialogResponseDownload
DialogResponseDownloadAndInstall
)

func (r DialogResponse) String() string {
switch r {
case DialogResponseSkipRelease:
return "Skip this release"
case DialogResponseCancel:
return "Cancel"
case DialogResponseRemindLater:
return "Remind me later"
case DialogResponseDownload:
return "Download"
case DialogResponseDownloadAndInstall:
return "Download and install"
}
return fmt.Sprintf("unknown %T = %d", r, int(r))
}

type Dialog interface {
ShowUpdaterDialog(opts *DialogOptions)
}
3 changes: 3 additions & 0 deletions internal/autoupdater/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Package autoupdater implements an autoupdater mechanism
// for apps.
package autoupdater
12 changes: 12 additions & 0 deletions internal/autoupdater/install.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package autoupdater

import "errors"

func (au *AutoUpdater) canInstallUpdates() bool {
// For now no platform supports autoinstall
return false
}

func (au *AutoUpdater) installUpdate(downloadedPkgPath string) error {
return errors.New("unimplemented")
}
17 changes: 17 additions & 0 deletions internal/autoupdater/release.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package autoupdater

// Asset represents a release asset that can be downloaded
type Asset struct {
Name string
URL string
}

// Release represents a release of the app
type Release struct {
Version string
IsPrerelease bool
Notes string
NotesHTML string
URL string
Assets []*Asset
}
Loading

0 comments on commit 670d51e

Please sign in to comment.