Skip to content

Commit

Permalink
feat: Change the default language for self-update to English (#970)
Browse files Browse the repository at this point in the history
  • Loading branch information
jeessy2 committed Jan 11, 2024
1 parent 7c69aa1 commit 826f7a0
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion util/semver/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func init() {
func NewVersion(v string) (*Version, error) {
m := versionRegex.FindStringSubmatch(v)
if m == nil {
return nil, fmt.Errorf("%s 不是有效的语义化版本", v)
return nil, fmt.Errorf("the %s, it's not a semantic version", v)
}

sv := &Version{}
Expand Down
2 changes: 1 addition & 1 deletion util/update/decompress.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func decompressCommand(src io.Reader, url, cmd string) (io.Reader, error) {
return decompress(src, cmd)
}
}
log.Print("未压缩文件")
log.Print("It's not a compressed file, skip decompressing")
return src, nil
}

Expand Down
8 changes: 4 additions & 4 deletions util/update/detect.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func findAssetForArch(arch string, rel *Release,
}

if release == nil {
log.Printf("未找到适用于 %s/%s 的任何 release", runtime.GOOS, runtime.GOARCH)
log.Printf("Cannot find any release for %s/%s", runtime.GOOS, runtime.GOARCH)
return nil, nil, false
}

Expand All @@ -64,14 +64,14 @@ func findAssetForArch(arch string, rel *Release,

func findAssetFromRelease(rel *Release, suffixes []string) (*Asset, *semver.Version, bool) {
if rel == nil {
log.Print("没有源 release 信息")
log.Print("There is no source release information")
return nil, nil, false
}

// 如果无法解析版本文本,则表示该文本不符合语义化版本规范,应该跳过。
ver, err := semver.NewVersion(rel.tagName)
if err != nil {
log.Printf("无法解析语义化版本:%s", rel.tagName)
log.Printf("Cannot parse semantic version: %s", rel.tagName)
return nil, nil, false
}

Expand All @@ -81,7 +81,7 @@ func findAssetFromRelease(rel *Release, suffixes []string) (*Asset, *semver.Vers
}
}

log.Printf("未在 release %s 中找到合适的 asset", rel.tagName)
log.Printf("Can't find suitable asset in release %s", rel.tagName)
return nil, nil, false
}

Expand Down
4 changes: 2 additions & 2 deletions util/update/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ package update
import "errors"

var (
errCannotDecompressFile = errors.New("无法解压")
errExecutableNotFoundInArchive = errors.New("找不到可执行文件")
errCannotDecompressFile = errors.New("failed to decompress")
errExecutableNotFoundInArchive = errors.New("executable not found")
)
18 changes: 9 additions & 9 deletions util/update/package.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,36 @@ func Self(version string) {
// 如果不为语义化版本立即退出
v, err := semver.NewVersion(version)
if err != nil {
log.Printf("无法更新!因为:%v", err)
log.Printf("Cannot update because: %v", err)
return
}

latest, found, err := detectLatest("jeessy2/ddns-go")
if err != nil {
log.Printf("检测最新版本时发生错误:%v", err)
log.Printf("Error happened when detecting latest version: %v", err)
return
}
if !found {
log.Printf("无法从 GitHub 仓库找到 %s/%s 的最新版本", runtime.GOOS, runtime.GOARCH)
log.Printf("Cannot find any release for %s/%s", runtime.GOOS, runtime.GOARCH)
return
}
if v.GreaterThanOrEqual(latest.Version) {
log.Printf("当前版本(%s)是最新的", version)
log.Printf("Current version (%s) is the latest", version)
return
}

exe, err := os.Executable()
if err != nil {
log.Printf("找不到可执行路径:%v", err)
log.Printf("Cannot find executable path: %v", err)
return
}

if err = to(latest.URL, latest.Name, exe); err != nil {
log.Printf("更新二进制文件时发生错误:%v", err)
log.Printf("Error happened when updating binary: %v", err)
return
}

log.Printf("成功更新到 v%s", latest.Version.String())
log.Printf("Success update to v%s", latest.Version.String())
}

// to 从 assetURL 下载可执行文件,并用下载的文件替换当前的可执行文件。
Expand All @@ -65,11 +65,11 @@ func downloadAssetFromURL(url string) (rc io.ReadCloser, err error) {
client := util.CreateHTTPClient()
resp, err := client.Get(url)
if err != nil {
return nil, fmt.Errorf("从 %s 下载 release 失败:%v", url, err)
return nil, fmt.Errorf("could not download release from %s: %v", url, err)
}
if resp.StatusCode >= 300 {
resp.Body.Close()
return nil, fmt.Errorf("从 %s 下载 release 失败,返回状态码:%d", url, resp.StatusCode)
return nil, fmt.Errorf("could not download release from %s. Response code: %d", url, resp.StatusCode)
}

return resp.Body, nil
Expand Down

0 comments on commit 826f7a0

Please sign in to comment.