docs: updated formatting on tutorial files
This commit is contained in:
parent
81230edac3
commit
cbc35b74f8
13 changed files with 73 additions and 39 deletions
|
@ -21,12 +21,17 @@ class ChatClient:
|
|||
def run(self):
|
||||
server = socket.create_connection((self.address, self.port))
|
||||
sockname = server.getsockname()
|
||||
print(f"connected to server({self.address}:{self.port}) as client({sockname[0]}:{sockname[1]})")
|
||||
print(
|
||||
f"connected to server({self.address}:{self.port}) as "
|
||||
f"client({sockname[0]}:{sockname[1]})"
|
||||
)
|
||||
sockets = [sys.stdin, server]
|
||||
prompt()
|
||||
try:
|
||||
while True:
|
||||
read_sockets, write_socket, error_socket = select.select(sockets, [], [])
|
||||
read_sockets, write_socket, error_socket = select.select(
|
||||
sockets, [], []
|
||||
)
|
||||
for sock in read_sockets:
|
||||
if sock == server:
|
||||
message = server.recv(READ_SIZE)
|
||||
|
@ -53,7 +58,9 @@ def main():
|
|||
formatter_class=argparse.ArgumentDefaultsHelpFormatter,
|
||||
)
|
||||
parser.add_argument("-a", "--address", help="address to listen on", required=True)
|
||||
parser.add_argument("-p", "--port", type=int, help="port to listen on", default=DEFAULT_PORT)
|
||||
parser.add_argument(
|
||||
"-p", "--port", type=int, help="port to listen on", default=DEFAULT_PORT
|
||||
)
|
||||
args = parser.parse_args()
|
||||
client = ChatClient(args.address, args.port)
|
||||
client.run()
|
||||
|
|
|
@ -27,14 +27,17 @@ class ChatServer:
|
|||
self.sockets.append(server)
|
||||
try:
|
||||
while True:
|
||||
read_sockets, write_sockets, error_sockets = select.select(self.sockets, [], [])
|
||||
read_sockets, write_sockets, error_sockets = select.select(
|
||||
self.sockets, [], []
|
||||
)
|
||||
for sock in read_sockets:
|
||||
if sock == server:
|
||||
client_sock, addr = server.accept()
|
||||
self.sockets.append(client_sock)
|
||||
name = f"{addr[0]}:{addr[1]}"
|
||||
print(f"[server] {name} joining")
|
||||
self.broadcast({server, client_sock}, f"[server] {name} entered room\n")
|
||||
self.broadcast({server, client_sock},
|
||||
f"[server] {name} entered room\n")
|
||||
else:
|
||||
peer = sock.getpeername()
|
||||
name = f"{peer[0]}:{peer[1]}"
|
||||
|
@ -45,12 +48,14 @@ class ChatServer:
|
|||
self.broadcast({server, sock}, f"[{name}] {data}\n")
|
||||
else:
|
||||
print(f"[server] {name} leaving")
|
||||
self.broadcast({server, sock}, f"[server] {name} leaving\n")
|
||||
self.broadcast({server, sock},
|
||||
f"[server] {name} leaving\n")
|
||||
sock.close()
|
||||
self.sockets.remove(sock)
|
||||
except socket.error:
|
||||
print(f"[server] {name} leaving")
|
||||
self.broadcast({server, sock}, f"[server] {name} leaving\n")
|
||||
self.broadcast({server, sock},
|
||||
f"[server] {name} leaving\n")
|
||||
sock.close()
|
||||
self.sockets.remove(sock)
|
||||
except KeyboardInterrupt:
|
||||
|
@ -62,8 +67,12 @@ def main():
|
|||
description="chat app server",
|
||||
formatter_class=argparse.ArgumentDefaultsHelpFormatter,
|
||||
)
|
||||
parser.add_argument("-a", "--address", help="address to listen on", default=DEFAULT_ADDRESS)
|
||||
parser.add_argument("-p", "--port", type=int, help="port to listen on", default=DEFAULT_PORT)
|
||||
parser.add_argument(
|
||||
"-a", "--address", help="address to listen on", default=DEFAULT_ADDRESS
|
||||
)
|
||||
parser.add_argument(
|
||||
"-p", "--port", type=int, help="port to listen on", default=DEFAULT_PORT
|
||||
)
|
||||
args = parser.parse_args()
|
||||
server = ChatServer(args.address, args.port)
|
||||
server.run()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue