|
@@ -4,8 +4,11 @@ import sys
|
|
import time
|
|
import time
|
|
|
|
|
|
import requests
|
|
import requests
|
|
|
|
+from packaging import version as v
|
|
|
|
|
|
import client_controller
|
|
import client_controller
|
|
|
|
+import version
|
|
|
|
+from connection import client_request, host
|
|
from debug import debug
|
|
from debug import debug
|
|
from lib.print_exc_plus import print_exc_plus
|
|
from lib.print_exc_plus import print_exc_plus
|
|
from routes import client_commands
|
|
from routes import client_commands
|
|
@@ -28,12 +31,27 @@ def fake_loading_bar(msg, duration=5.):
|
|
sys.stdout.flush()
|
|
sys.stdout.flush()
|
|
|
|
|
|
|
|
|
|
|
|
+def check_for_updates():
|
|
|
|
+ server_version = client_request('server_version')['version']
|
|
|
|
+ client_version = version.__version__
|
|
|
|
+ if v.parse(server_version) != v.parse(client_version):
|
|
|
|
+ print(f'WARNING: You have Orderer version {client_version} installed while the server is running version {server_version}.')
|
|
|
|
+ print(f' This may or may not lead to problems.')
|
|
|
|
+ print(f' A recent client version should be available for download at '
|
|
|
|
+ f' {host}/orderer.zip')
|
|
|
|
+
|
|
|
|
+
|
|
def load():
|
|
def load():
|
|
print('Loading...')
|
|
print('Loading...')
|
|
|
|
|
|
fake_loading_bar('Initializing fake loading bars', duration=5)
|
|
fake_loading_bar('Initializing fake loading bars', duration=5)
|
|
fake_loading_bar('Loading data from disk', duration=1)
|
|
fake_loading_bar('Loading data from disk', duration=1)
|
|
fake_loading_bar('Loading available commands', duration=3.5)
|
|
fake_loading_bar('Loading available commands', duration=3.5)
|
|
|
|
+ fake_loading_bar('Checking for updates', duration=0.4)
|
|
|
|
+ try:
|
|
|
|
+ check_for_updates()
|
|
|
|
+ except (ConnectionError, requests.exceptions.ConnectionError):
|
|
|
|
+ print('WARNING: There has been a problem connecting when to the server.')
|
|
fake_loading_bar('Updating indices', duration=2)
|
|
fake_loading_bar('Updating indices', duration=2)
|
|
fake_loading_bar('Waiting', duration=5)
|
|
fake_loading_bar('Waiting', duration=5)
|
|
print('Done.\n\n')
|
|
print('Done.\n\n')
|