diff --git a/workflow/src/actions/__init__.py b/workflow/src/actions/__init__.py index ac4c352..4efb571 100644 --- a/workflow/src/actions/__init__.py +++ b/workflow/src/actions/__init__.py @@ -2,7 +2,7 @@ from src import icons from src.lib.requests.exceptions import SSLError -from src.lib.workflow import (PasswordNotFound, __version__) +from src.lib.workflow import PasswordNotFound from src.lib.workflow.background import run_in_background from src.lib.workflow.background import is_running @@ -44,16 +44,6 @@ def build_bamboo_facade(): return BambooFacade(bamboo_host, bamboo_user, bamboo_pw, verify_cert) -def notify_if_upgrade_available(): - if workflow().update_available: - v = workflow().cached_data('__workflow_update_status', max_age=0)['version'] - workflow().add_item('An update is available!', - 'Update the workflow from version {} to {}'.format(__version__, v), - arg=':config update', - valid=True, - icon=icons.UPDATE) - - def _notify_if_cache_update_in_progress(): # Notify the user if the cache is being updated if is_running(SYNC_JOB_NAME): diff --git a/workflow/src/routing.py b/workflow/src/routing.py index 17a01c9..1187515 100644 --- a/workflow/src/routing.py +++ b/workflow/src/routing.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- -from src.actions import notify_if_upgrade_available, HOST_URL +from src import icons, __version__ +from src.actions import HOST_URL from src.actions.branches import BranchesWorkflowAction from src.actions.configure import ConfigureWorkflowAction from src.actions.help import HelpWorkflowAction @@ -35,5 +36,15 @@ def route(args): # e.g., args = ":config sethost http://localhost,--exec" handler().execute(command, cmd_pressed='--cmd' in args, shift_pressed='--shift' in args) else: # show menu handler().menu(command) - notify_if_upgrade_available() + _notify_if_upgrade_available() workflow().send_feedback() + + +def _notify_if_upgrade_available(): + if workflow().update_available: + new_version = workflow().cached_data('__workflow_update_status', max_age=0)['version'] + workflow().add_item('An update is available!', + 'Update the workflow from version {} to {}'.format(__version__, new_version), + arg=':config update', + valid=True, + icon=icons.UPDATE)