提交 2806260f 作者: Henry

use inconshreveable's go-update to check for updates

上级 1e623f88
...@@ -7,6 +7,7 @@ import ( ...@@ -7,6 +7,7 @@ import (
"runtime/pprof" "runtime/pprof"
flag "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/gonuts/flag" flag "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/gonuts/flag"
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/inconshreveable/go-update/check"
commander "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/commander" commander "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/commander"
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
...@@ -126,18 +127,17 @@ func localNode(confdir string, online bool) (*core.IpfsNode, error) { ...@@ -126,18 +127,17 @@ func localNode(confdir string, online bool) (*core.IpfsNode, error) {
} }
if cfg.Version.ShouldCheckForUpdate() { if cfg.Version.ShouldCheckForUpdate() {
obsolete := updates.CheckForUpdates() _, err := updates.CheckForUpdate()
if obsolete != nil { if err != nil {
if cfg.Version.Check == config.CheckError { if err != check.NoUpdateAvailable {
return nil, obsolete log.Error("Error while checking for update: %v\n", err)
} return nil, err
// when "warn" version.check mode we just show warning message }
log.Warning(fmt.Sprintf("%v", obsolete)) log.Notice("No update available")
} else {
// update most recent check timestamp in config
config.RecordUpdateCheck(cfg, filename)
} }
config.RecordUpdateCheck(cfg, filename)
} }
return core.NewIpfsNode(cfg, online) return core.NewIpfsNode(cfg, online)
......
package updates package updates
import ( import (
"encoding/json"
"fmt"
"net/http"
"os" "os"
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/coreos/go-semver/semver" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/coreos/go-semver/semver"
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/inconshreveable/go-update"
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/inconshreveable/go-update/check"
u "github.com/jbenet/go-ipfs/util" u "github.com/jbenet/go-ipfs/util"
) )
const ( const (
Version = "0.1.0" // actual current application's version literal Version = "0.1.0" // actual current application's version literal
EndpointURLLatestReleases = "https://api.github.com/repos/jbenet/go-ipfs/tags" UpdateEndpointURL = "https://api.equinox.io/1/Updates"
VersionErrorShort = `Warning: You are running version %s of go-ipfs. The latest version is %s.` UpdateAppID = "ap_ywkPmAR40q4EfdikN9Jh2hgIHi"
VersionErrorLong = `
Warning: You are running version %s of go-ipfs. The latest version is %s.
Since this is alpha software, it is strongly recommended you update.
You can update go-ipfs by running
ipfs version update
You can silence this message by running
ipfs config update.check ignore
`
) )
var log = u.Logger("updates") var log = u.Logger("updates")
...@@ -45,42 +31,13 @@ func init() { ...@@ -45,42 +31,13 @@ func init() {
func parseVersion() (*semver.Version, error) { func parseVersion() (*semver.Version, error) {
return semver.NewVersion(Version) return semver.NewVersion(Version)
} }
func CheckForUpdates() error {
resp, err := http.Get(EndpointURLLatestReleases) func CheckForUpdate() (*check.Result, error) {
if err != nil { param := check.Params{
// can't reach the endpoint, coud be firewall, or no internet connection or something else AppVersion: Version,
log.Error("update check: error connecting to API endpoint for newer versions: %v", err) AppId: UpdateAppID,
return nil Channel: "stable",
}
var body interface{}
_ = json.NewDecoder(resp.Body).Decode(&body)
releases, ok := body.([]interface{})
if !ok {
// the response body does not seem to meet specified Github API format
// https://developer.github.com/v3/repos/#list-tags
log.Error("update check: API endpoint for newer versions does not seem to be in Github API specified format")
return nil
}
for _, r := range releases {
release, ok := r.(map[string]interface{})
if !ok {
continue
}
tagName, ok := release["name"].(string)
if !ok {
continue
}
if len(tagName) > 0 && tagName[0] == 'v' {
// both 'v0.1.0' and '0.1.0' semver tagname conventions can be encountered
tagName = tagName[1:]
}
releaseVersion, err := semver.NewVersion(tagName)
if err != nil {
continue
}
if currentVersion.LessThan(*releaseVersion) {
return fmt.Errorf(VersionErrorLong, Version, tagName)
}
} }
return nil
return param.CheckForUpdate(UpdateEndpointURL, update.New())
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论