From 29866f04464343a0471fe33e813c7c4ebdf0f51b Mon Sep 17 00:00:00 2001 From: DarkCat09 Date: Wed, 24 May 2023 20:04:00 +0400 Subject: [PATCH] Rewritten examples respectively (see the prev. commit) --- examples/console_example.py | 5 ++++- examples/files_example.py | 16 +++++++++++++--- examples/info_example.py | 6 +++++- examples/start_example.py | 5 ++++- examples/websocket_args_example.py | 6 ++++-- examples/websocket_example.py | 5 ++++- examples/websocket_status_example.py | 6 ++++-- 7 files changed, 38 insertions(+), 11 deletions(-) diff --git a/examples/console_example.py b/examples/console_example.py index 2244451..b9cfe6a 100644 --- a/examples/console_example.py +++ b/examples/console_example.py @@ -6,7 +6,10 @@ from python_aternos import Client, atwss user = input('Username: ') pswd = getpass('Password: ') resp = input('Show responses? ').upper() == 'Y' -aternos = Client.from_credentials(user, pswd) + +atclient = Client() +aternos = atclient.account +atclient.login(user, pswd) s = aternos.list_servers()[0] socket = s.wss() diff --git a/examples/files_example.py b/examples/files_example.py index d032a50..b61a9ab 100644 --- a/examples/files_example.py +++ b/examples/files_example.py @@ -1,9 +1,14 @@ from getpass import getpass +from typing import Optional from python_aternos import Client +from python_aternos.atfile import AternosFile user = input('Username: ') pswd = getpass('Password: ') -aternos = Client.from_credentials(user, pswd) + +atclient = Client() +aternos = atclient.account +atclient.login(user, pswd) s = aternos.list_servers()[0] files = s.files() @@ -34,6 +39,11 @@ while True: print('\t' + file.name) if cmd == 'world': - file = files.get_file('/world') + file_w = files.get_file('/world') + + if file_w is None: + print('Cannot create /world directory object') + continue + with open('world.zip', 'wb') as f: - f.write(file.get_content()) + f.write(file_w.get_content()) diff --git a/examples/info_example.py b/examples/info_example.py index de5691d..8b3dbe9 100644 --- a/examples/info_example.py +++ b/examples/info_example.py @@ -3,9 +3,13 @@ from python_aternos import Client, atserver user = input('Username: ') pswd = getpass('Password: ') -aternos = Client.from_credentials(user, pswd) + +atclient = Client() +aternos = atclient.account +atclient.login(user, pswd) srvs = aternos.list_servers() + for srv in srvs: print('***', srv.domain, '***') print(srv.motd) diff --git a/examples/start_example.py b/examples/start_example.py index 5718e84..f793256 100644 --- a/examples/start_example.py +++ b/examples/start_example.py @@ -3,7 +3,10 @@ from python_aternos import Client user = input('Username: ') pswd = getpass('Password: ') -aternos = Client.from_credentials(user, pswd) + +atclient = Client() +aternos = atclient.account +atclient.login(user, pswd) srvs = aternos.list_servers() print(srvs) diff --git a/examples/websocket_args_example.py b/examples/websocket_args_example.py index bc29bb2..1cfea6e 100644 --- a/examples/websocket_args_example.py +++ b/examples/websocket_args_example.py @@ -16,14 +16,16 @@ if logs: logging.basicConfig(level=logging.DEBUG) # Authentication -aternos = Client.from_credentials(user, pswd) +atclient = Client() +aternos = atclient.account +atclient.login(user, pswd) server = aternos.list_servers()[0] socket = server.wss() # Handler for console messages -@socket.wssreceiver(Streams.console, ('Server 1',)) +@socket.wssreceiver(Streams.console, ('Server 1',)) # type: ignore async def console( msg: Dict[Any, Any], args: Tuple[str]) -> None: diff --git a/examples/websocket_example.py b/examples/websocket_example.py index b7f44a0..6309f0f 100644 --- a/examples/websocket_example.py +++ b/examples/websocket_example.py @@ -4,7 +4,10 @@ from python_aternos import Client, atwss user = input('Username: ') pswd = getpass('Password: ') -aternos = Client.from_credentials(user, pswd) + +atclient = Client() +aternos = atclient.account +atclient.login(user, pswd) s = aternos.list_servers()[0] socket = s.wss() diff --git a/examples/websocket_status_example.py b/examples/websocket_status_example.py index 9b166f7..c109aa4 100644 --- a/examples/websocket_status_example.py +++ b/examples/websocket_status_example.py @@ -16,14 +16,16 @@ if logs: logging.basicConfig(level=logging.DEBUG) # Authentication -aternos = Client.from_credentials(user, pswd) +atclient = Client() +aternos = atclient.account +atclient.login(user, pswd) server = aternos.list_servers()[0] socket = server.wss() # Handler for server status -@socket.wssreceiver(Streams.status, ('Server 1',)) +@socket.wssreceiver(Streams.status, ('Server 1',)) # type: ignore async def state( msg: Dict[Any, Any], args: Tuple[str]) -> None: