Merge pull request #60 from anywherelan/dirty_builds_update

dirty builds can update now

cmd/awl-tray/main.go

@@ -59,6 +59,10 @@ func onReady() {
  }
  if conf.Update.TrayAutoCheckEnabled {
  go func() {
+ if config.IsDevVersion() {
+ logger.Info("updates auto check is disabled for dev version")
+ return
+ }
  interval, err := time.ParseDuration(conf.Update.TrayAutoCheckInterval)
  if err != nil {
  logger.Errorf("update auto check: interval parse: %v", err)

cmd/awl-tray/tray.go

@@ -263,12 +263,14 @@ func checkForUpdatesWithDesktopNotification() {
  logger.Errorf("update auto check: check for updates: %v", err)
  return
  }
- if updStatus {
- notifyErr := beeep.Notify("Anywherelan: new version available!",
- fmt.Sprintf("Version %s: %s available for installation!\nUse tray menu option %q\n",
- updService.NewVersion.VersionTag(), updService.NewVersion.VersionName(), updateMenuLabel), tempIconFilepath)
- if notifyErr != nil {
- logger.Errorf("show notification: new version available: %v", notifyErr)
- }
+ if !updStatus {
+ return
+ }
+
+ notifyErr := beeep.Notify("Anywherelan: new version available!",
+ fmt.Sprintf("Version %s: %s available for installation!\nUse tray menu option %q\n",
+ updService.NewVersion.VersionTag(), updService.NewVersion.VersionName(), updateMenuLabel), tempIconFilepath)
+ if notifyErr != nil {
+ logger.Errorf("show notification: new version available: %v", notifyErr)
  }
 }

config/config.go

@@ -320,6 +320,9 @@ func (c *Config) LogLevel() zapcore.Level {
  return lvl
 }
 
+// DevMode
+// Possible duplicate of IsDevVersion()
+// Based on Config.LoggerLevel (could be used by any user)
 func (c *Config) DevMode() bool {
  return c.LoggerLevel == "dev"
 }

config/version.go

@@ -4,12 +4,21 @@ import (
  "strings"
 )
 
+const DevVersion = "dev"
+
 var (
- Version = "dev"
+ Version = DevVersion
  UserAgent = UserAgentPrefix + Version
  UserAgentPrefix = "awl/"
 )
 
+// IsDevVersion
+// Possible duplicate of *Config.DevMode()
+// Based on build version (unchangeable after build, could be used only by developers)
+func IsDevVersion() bool {
+ return Version == DevVersion
+}
+
 func VersionFromUserAgent(userAgent string) string {
  return strings.TrimPrefix(userAgent, UserAgentPrefix)
 }

update/update.go

@@ -7,6 +7,8 @@ import (
  "path/filepath"
  "regexp"
  "runtime"
+ "strings"
+ "unicode"
 
  "github.com/GrigoryKrasnochub/updaterini"
  "github.com/anywherelan/awl/config"
@@ -42,6 +44,10 @@ var (
 )
 
 func NewUpdateService(c *config.Config, logger *log.ZapEventLogger, appType ApplicationType) (UpdateService, error) {
+ if config.IsDevVersion() {
+ return UpdateService{}, errors.New("updates are unsupported for dev version")
+ }
+
  channels := make([]updaterini.Channel, 1)
  channels[0] = updaterini.NewReleaseChannel(true)
 
@@ -67,7 +73,14 @@ func NewUpdateService(c *config.Config, logger *log.ZapEventLogger, appType Appl
  filenamesRegex[0] = awlTrayFilenamesRegex
  }
 
- appConf, err := updaterini.NewApplicationConfig(config.Version, channels, filenamesRegex)
+ // TODO update when issue will be fixed https://github.com/GrigoryKrasnochub/updaterini/issues/6
+ version := config.Version
+ splitVer := strings.Split(config.Version, "-")
+ if len(splitVer) > 1 && (len(splitVer[1]) == 0 || unicode.IsDigit([]rune(splitVer[1])[0])) {
+ version = splitVer[0]
+ }
+
+ appConf, err := updaterini.NewApplicationConfig(version, channels, filenamesRegex)
  if err != nil {
  return UpdateService{}, err
  }