updated and fixed formatting with proper version of python black
This commit is contained in:
parent
a80796ac72
commit
db89fbf066
9 changed files with 49 additions and 41 deletions
|
@ -36,8 +36,9 @@ class ChatServer:
|
|||
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]}"
|
||||
|
@ -48,14 +49,16 @@ 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:
|
||||
|
|
|
@ -4,8 +4,9 @@ from core.api.grpc.wrappers import NodeType, Position
|
|||
|
||||
def main():
|
||||
# interface helper
|
||||
iface_helper = client.InterfaceHelper(ip4_prefix="10.0.0.0/24",
|
||||
ip6_prefix="2001::/64")
|
||||
iface_helper = client.InterfaceHelper(
|
||||
ip4_prefix="10.0.0.0/24", ip6_prefix="2001::/64"
|
||||
)
|
||||
|
||||
# create grpc client and connect
|
||||
core = client.CoreGrpcClient()
|
||||
|
@ -16,8 +17,9 @@ def main():
|
|||
|
||||
# create nodes
|
||||
position = Position(x=200, y=200)
|
||||
wlan = session.add_node(1, name="wlan1", _type=NodeType.WIRELESS_LAN,
|
||||
position=position)
|
||||
wlan = session.add_node(
|
||||
1, name="wlan1", _type=NodeType.WIRELESS_LAN, position=position
|
||||
)
|
||||
position = Position(x=100, y=100)
|
||||
node1 = session.add_node(2, name="n2", model="mdr", position=position)
|
||||
position = Position(x=300, y=100)
|
||||
|
|
|
@ -55,8 +55,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()
|
||||
|
|
|
@ -97,7 +97,7 @@ def main():
|
|||
core.move_node(sessions[0].id, node_number, position=position)
|
||||
current_x = x
|
||||
current_y = y
|
||||
time.sleep(.25)
|
||||
time.sleep(0.25)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
|
|
@ -24,7 +24,7 @@ def main():
|
|||
_type=NodeType.EMANE,
|
||||
name="emane1",
|
||||
position=position,
|
||||
emane=EmaneIeee80211abgModel.name
|
||||
emane=EmaneIeee80211abgModel.name,
|
||||
)
|
||||
position = Position(x=250, y=250)
|
||||
node2 = session.add_node(_id=2, model="mdr", name="n2", position=position)
|
||||
|
|
|
@ -24,7 +24,7 @@ def main():
|
|||
_type=NodeType.EMANE,
|
||||
name="emane1",
|
||||
position=position,
|
||||
emane=EmaneIeee80211abgModel.name
|
||||
emane=EmaneIeee80211abgModel.name,
|
||||
)
|
||||
position = Position(x=250, y=250)
|
||||
node2 = session.add_node(_id=2, model="mdr", name="n2", position=position)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue