From c2e9a0e56b9a2cffb03c3483dca1317b02d780af Mon Sep 17 00:00:00 2001 From: echel0n Date: Sat, 12 Apr 2014 03:26:24 -0700 Subject: [PATCH] Updated versionChecker code --- nzbtomedia/versionCheck.py | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/nzbtomedia/versionCheck.py b/nzbtomedia/versionCheck.py index 5718f05f..c0497617 100644 --- a/nzbtomedia/versionCheck.py +++ b/nzbtomedia/versionCheck.py @@ -289,33 +289,18 @@ class GitUpdateManager(UpdateManager): self._num_commits_ahead), logger.DEBUG) def set_newest_text(self): - - # if we're up to date then don't set this - nzbtomedia.NEWEST_VERSION_STRING = None - if self._num_commits_ahead: logger.log(u"Local branch is ahead of " + self.branch + ". Automatic update not possible.", logger.ERROR) - newest_text = "Local branch is ahead of " + self.branch + ". Automatic update not possible." - elif self._num_commits_behind > 0: - - base_url = 'http://github.com/' + self.github_repo_user + '/' + self.github_repo - if self._newest_commit_hash: - url = base_url + '/compare/' + self._cur_commit_hash + '...' + self._newest_commit_hash - else: - url = base_url + '/commits/' - newest_text = 'There is a newer version available ' newest_text += " (you're " + str(self._num_commits_behind) + " commit" if self._num_commits_behind > 1: newest_text += 's' newest_text += ' behind)' - + logger.log(newest_text, logger.MESSAGE) else: return - nzbtomedia.NEWEST_VERSION_STRING = newest_text - def need_update(self): self._find_installed_version() @@ -436,27 +421,17 @@ class SourceUpdateManager(UpdateManager): nzbtomedia.NEWEST_VERSION_STRING = None if not self._cur_commit_hash: - logger.log(u"Unknown current version number, don't know if we should update or not", logger.DEBUG) - - newest_text = "Unknown current version number: If you've never used the Sick Beard upgrade system before then current version is not set." - + logger.log(u"Unknown current version number, don't know if we should update or not", logger.ERROR) elif self._num_commits_behind > 0: - base_url = 'http://github.com/' + self.github_repo_user + '/' + self.github_repo - if self._newest_commit_hash: - url = base_url + '/compare/' + self._cur_commit_hash + '...' + self._newest_commit_hash - else: - url = base_url + '/commits/' - newest_text = 'There is a newer version available' newest_text += " (you're " + str(self._num_commits_behind) + " commit" if self._num_commits_behind > 1: newest_text += "s" newest_text += " behind)" + logger.log(newest_text, logger.MESSAGE) else: return - nzbtomedia.NEWEST_VERSION_STRING = newest_text - def update(self): """ Downloads the latest source tarball from github and installs it over the existing version.