Skip to content

Commit 472c41e

Browse files
committed
working on read and wrtie
1 parent 851477c commit 472c41e

File tree

5 files changed

+84
-21
lines changed

5 files changed

+84
-21
lines changed

Root/helloworld.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

Server_A/server.py

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@ def recieve_from_server(socket):
162162
temp_list = local_file_list
163163
msg = "list | " + temp_list
164164
socket.sendall().encode()
165+
elif msg[:4] == "send":
166+
socket.sendall(("recieve " + msg[5:]).encode())
167+
send_file(socket, msg[5:])
168+
elif msg[:7] == 'recieve':
169+
recieve_file(socket, msg[8:])
165170
else:
166171
print(msg)
167172

@@ -186,11 +191,22 @@ def recieve_from_client(socket):
186191
list_str = list_str[:-1]
187192
socket.sendall((list_str+"###").encode())
188193
elif command[:4] == "read":
189-
if check_if_file_exists:
190-
socket.sendall(("sending file").encode())
191-
send_file(socket, command[5:])
192-
else:
193-
socket.sendall(("No such file exists").encode())
194+
temp_list = global_file_list
195+
for item in temp_list:
196+
if item[0] == command[5:]:
197+
if item[1] == 'self':
198+
socket.sendall(("sending file").encode())
199+
send_file(socket, command[5:])
200+
break
201+
else:
202+
item[1].sendall(("send "+command[5:]).encode())
203+
time.sleep(1)
204+
socket.sendall(("sending file").encode())
205+
send_file(socket, command[5:])
206+
break
207+
else:
208+
socket.sendall(("No such file exists").encode())
209+
break
194210
elif command[:5] == "write":
195211
recieve_file(socket, command[6:])
196212
else:

Server_B/server.py

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@ def recieve_from_server(socket):
162162
temp_list = local_file_list
163163
msg = "list | " + temp_list
164164
socket.sendall().encode()
165+
elif msg[:4] == "send":
166+
socket.sendall(("recieve " + msg[5:]).encode())
167+
send_file(socket, msg[5:])
168+
elif msg[:7] == 'recieve':
169+
recieve_file(socket, msg[8:])
165170
else:
166171
print(msg)
167172

@@ -186,11 +191,22 @@ def recieve_from_client(socket):
186191
list_str = list_str[:-1]
187192
socket.sendall((list_str+"###").encode())
188193
elif command[:4] == "read":
189-
if check_if_file_exists:
190-
socket.sendall(("sending file").encode())
191-
send_file(socket, command[5:])
192-
else:
193-
socket.sendall(("No such file exists").encode())
194+
temp_list = global_file_list
195+
for item in temp_list:
196+
if item[0] == command[5:]:
197+
if item[1] == 'self':
198+
socket.sendall(("sending file").encode())
199+
send_file(socket, command[5:])
200+
break
201+
else:
202+
item[1].sendall(("send "+command[5:]).encode())
203+
time.sleep(1)
204+
socket.sendall(("sending file").encode())
205+
send_file(socket, command[5:])
206+
break
207+
else:
208+
socket.sendall(("No such file exists").encode())
209+
break
194210
elif command[:5] == "write":
195211
recieve_file(socket, command[6:])
196212
else:

Server_C/server.py

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@ def recieve_from_server(socket):
162162
temp_list = local_file_list
163163
msg = "list | " + temp_list
164164
socket.sendall().encode()
165+
elif msg[:4] == "send":
166+
socket.sendall(("recieve " + msg[5:]).encode())
167+
send_file(socket, msg[5:])
168+
elif msg[:7] == 'recieve':
169+
recieve_file(socket, msg[8:])
165170
else:
166171
print(msg)
167172

@@ -186,11 +191,22 @@ def recieve_from_client(socket):
186191
list_str = list_str[:-1]
187192
socket.sendall((list_str+"###").encode())
188193
elif command[:4] == "read":
189-
if check_if_file_exists:
190-
socket.sendall(("sending file").encode())
191-
send_file(socket, command[5:])
192-
else:
193-
socket.sendall(("No such file exists").encode())
194+
temp_list = global_file_list
195+
for item in temp_list:
196+
if item[0] == command[5:]:
197+
if item[1] == 'self':
198+
socket.sendall(("sending file").encode())
199+
send_file(socket, command[5:])
200+
break
201+
else:
202+
item[1].sendall(("send "+command[5:]).encode())
203+
time.sleep(1)
204+
socket.sendall(("sending file").encode())
205+
send_file(socket, command[5:])
206+
break
207+
else:
208+
socket.sendall(("No such file exists").encode())
209+
break
194210
elif command[:5] == "write":
195211
recieve_file(socket, command[6:])
196212
else:

server.py

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@ def recieve_from_server(socket):
162162
temp_list = local_file_list
163163
msg = "list | " + temp_list
164164
socket.sendall().encode()
165+
elif msg[:4] == "send":
166+
socket.sendall(("recieve " + msg[5:]).encode())
167+
send_file(socket, msg[5:])
168+
elif msg[:7] == 'recieve':
169+
recieve_file(socket, msg[8:])
165170
else:
166171
print(msg)
167172

@@ -186,11 +191,22 @@ def recieve_from_client(socket):
186191
list_str = list_str[:-1]
187192
socket.sendall((list_str+"###").encode())
188193
elif command[:4] == "read":
189-
if check_if_file_exists:
190-
socket.sendall(("sending file").encode())
191-
send_file(socket, command[5:])
192-
else:
193-
socket.sendall(("No such file exists").encode())
194+
temp_list = global_file_list
195+
for item in temp_list:
196+
if item[0] == command[5:]:
197+
if item[1] == 'self':
198+
socket.sendall(("sending file").encode())
199+
send_file(socket, command[5:])
200+
break
201+
else:
202+
item[1].sendall(("send "+command[5:]).encode())
203+
time.sleep(1)
204+
socket.sendall(("sending file").encode())
205+
send_file(socket, command[5:])
206+
break
207+
else:
208+
socket.sendall(("No such file exists").encode())
209+
break
194210
elif command[:5] == "write":
195211
recieve_file(socket, command[6:])
196212
else:

0 commit comments

Comments
 (0)