Skip to content

Commit d8041e1

Browse files
committed
added function for list
1 parent 679d74d commit d8041e1

File tree

2 files changed

+33
-15
lines changed

2 files changed

+33
-15
lines changed

client.py

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,15 @@ def append_to_file(file_name, message):
3535
fd.write(message)
3636

3737

38-
def list_files(directory):
39-
temp_list = os.listdir(directory)
40-
for file in temp_list:
41-
print(file)
38+
def list_files(server_sock, directory):
39+
while True:
40+
data = server_sock.recv(1024)
41+
if not data:
42+
break
43+
temp_list = data
44+
for item in temp_list:
45+
print(item)
46+
4247

4348

4449
def send_file(server_sock, file_name):
@@ -72,10 +77,15 @@ def make_socket():
7277
# create a socket object
7378
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
7479

75-
# get local machine name
76-
host = socket.gethostname()
80+
# get server ip
81+
print("Enter server IP")
82+
msg = input()
83+
host = msg
7784

78-
port = 9999
85+
# get server port
86+
print("Enter server port")
87+
msg = input()
88+
port = msg
7989

8090
# connection to hostname on the port.
8191
s.connect((host, port))

server.py

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import socket
22
import threading
3+
import os
34

45
# set directory for file server
56
root = "Root/"
@@ -53,15 +54,22 @@ def recieve_from_server(socket):
5354

5455
msg = socket.recv(1024)
5556
if len(msg) == 0:
56-
socket.close()
57-
elif msg.decode("utf-8") == "close":
58-
socket.close()
57+
socket.send("error")
58+
elif msg == "list local":
59+
temp_list = list_local("Root")
60+
socket.send(str(temp_list))
5961
else:
60-
if msg.decode("utf-8") == "download":
61-
msg = "Here is your downloaded file haha"
62-
socket.send(msg.encode("utf-8"))
63-
else:
64-
socket.send(msg)
62+
socket.send("error")
63+
64+
65+
def list_local(directory):
66+
temp_list = os.listdir(directory)
67+
return temp_list
68+
69+
70+
def list_global():
71+
for server in servers:
72+
server.send("list local")
6573

6674

6775
def send_file(client_sock, file_name):

0 commit comments

Comments
 (0)