LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

remove lbryum version check

Browse source
This commit is contained in:
jobevers 2017-02-16 11:55:04 -06:00
parent 0eb8e1609f
commit 17d32ca696
1 changed files with 1 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lbrynet/lbrynet_daemon/Daemon.py
View file

@ -132,8 +132,6 @@ class CheckRemoteVersions(object):
def __call__(self): def __call__(self):
d = threads.deferToThread(self._get_lbrynet_version) d = threads.deferToThread(self._get_lbrynet_version)
d.addErrback(self._trap_and_log_error, 'lbrynet') d.addErrback(self._trap_and_log_error, 'lbrynet')
d.addCallback(lambda _: threads.deferToThread(self._get_lbryum_version))
d.addErrback(self._trap_and_log_error, 'lbryum')
d.addErrback(log.fail(), 'Failure checking versions on github') d.addErrback(log.fail(), 'Failure checking versions on github')
def _trap_and_log_error(self, err, module_checked): def _trap_and_log_error(self, err, module_checked):
@ -143,14 +141,6 @@ class CheckRemoteVersions(object):
if err.check(requests_exceptions.RequestException, KeyError): if err.check(requests_exceptions.RequestException, KeyError):
log.warning("Failed to check latest %s version from github", module_checked) log.warning("Failed to check latest %s version from github", module_checked)
def _get_lbryum_version(self):
self.daemon.git_lbryum_version = get_lbryum_version_from_github()
log.info(
"remote lbryum %s > local lbryum %s = %s",
self.daemon.git_lbryum_version, lbryum_version,
utils.version_is_greater_than(self.daemon.git_lbryum_version, lbryum_version)
)
def _get_lbrynet_version(self): def _get_lbrynet_version(self):
self.daemon.git_lbrynet_version = get_lbrynet_version_from_github() self.daemon.git_lbrynet_version = get_lbrynet_version_from_github()
log.info( log.info(
@ -234,7 +224,6 @@ class Daemon(AuthJSONRPCServer):
self.connected_to_internet = True self.connected_to_internet = True
self.connection_status_code = None self.connection_status_code = None
self.git_lbrynet_version = None self.git_lbrynet_version = None
self.git_lbryum_version = None
self.platform = None self.platform = None
self.first_run = None self.first_run = None
self.log_file = conf.settings.get_log_filename() self.log_file = conf.settings.get_log_filename()
@ -358,7 +347,7 @@ class Daemon(AuthJSONRPCServer):
def _update_connection_status(self): def _update_connection_status(self):
self.connection_status_code = CONNECTION_STATUS_CONNECTED self.connection_status_code = CONNECTION_STATUS_CONNECTED
if not self.git_lbrynet_version or not self.git_lbryum_version: if not self.git_lbrynet_version:
self.connection_status_code = CONNECTION_STATUS_VERSION_CHECK self.connection_status_code = CONNECTION_STATUS_VERSION_CHECK
if not self.connected_to_internet: if not self.connected_to_internet:
@ -1242,11 +1231,6 @@ class Daemon(AuthJSONRPCServer):
self.git_lbrynet_version, lbrynet_version) self.git_lbrynet_version, lbrynet_version)
except TypeError: except TypeError:
lbrynet_update_available = False lbrynet_update_available = False
try:
lbryum_update_available = utils.version_is_greater_than(
self.git_lbryum_version, lbryum_version)
except TypeError:
lbryum_update_available = False
msg = { msg = {
'platform': platform_info['platform'], 'platform': platform_info['platform'],
'os_release': platform_info['os_release'], 'os_release': platform_info['os_release'],
@ -1255,9 +1239,7 @@ class Daemon(AuthJSONRPCServer):
'lbryum_version': lbryum_version, 'lbryum_version': lbryum_version,
'ui_version': platform_info['ui_version'], 'ui_version': platform_info['ui_version'],
'remote_lbrynet': self.git_lbrynet_version, 'remote_lbrynet': self.git_lbrynet_version,
'remote_lbryum': self.git_lbryum_version,
'lbrynet_update_available': lbrynet_update_available, 'lbrynet_update_available': lbrynet_update_available,
'lbryum_update_available': lbryum_update_available
} }
log.info("Get version info: " + json.dumps(msg)) log.info("Get version info: " + json.dumps(msg))
@ -2488,10 +2470,6 @@ class Daemon(AuthJSONRPCServer):
return d return d
def get_lbryum_version_from_github():
return get_version_from_github('https://api.github.com/repos/lbryio/lbryum/releases/latest')
def get_lbrynet_version_from_github(): def get_lbrynet_version_from_github():
return get_version_from_github('https://api.github.com/repos/lbryio/lbry/releases/latest') return get_version_from_github('https://api.github.com/repos/lbryio/lbry/releases/latest')