added threading

Author: DebianProgrammer

server.py

@@ -1,4 +1,5 @@
 import socket
+import _thread
 import os
 import os.path
 
@@ -14,78 +15,75 @@
 authhash = "" # this is the md5 hash of the correct password, this is required if auth is enabled but ignored if disabled
 # end of server config
 
-s = socket.socket()
-s.bind((myip, myport))
-s.listen(5)
-sock, addr = s.accept()
-print(addr)
-wel = f"Welcome to {socket.gethostname()}"
-sock.send(wel.encode())
+def newclient(sock, addr):
+	print(addr)
+	wel = f"Welcome to {socket.gethostname()}"
+	sock.send(wel.encode())
 
-def readsize(size):
-    for u in ["B", "KiB", "MiB", "GiB", "TiB"]:
-        if size < 1024.0:
-            break
-        size /= 1024.0
-        return f"{size:.3f}{u}"
+	if(authenabled == 1):
+		sock.send("auth is active".encode())
+		passhash = sock.recv(1024).decode()
+		if(passhash == authhash):
+			sock.send("correct".encode())
+		else:
+			sock.send("incorrect".encode())
+			sock.close()
+	else:
+		sock.send("no auth is needed".encode())
+	while True:
+		filecommand = sock.recv(1024)
+		if(filecommand.decode() == "help"):
+			back = "commands:\nhelp - list this\nlist - list directory\ndownload - lets you download a file\ncloseserver - close socket"
+			sock.send(back.encode())
+		elif(filecommand.decode() == "list"):
+			note = "Note: this only lists files, dirs are not supported"
+			sock.send(note.encode())
+			size = []
+			filelist = [f for f in os.listdir(serverpath) if os.path.isfile(os.path.join(serverpath,f))]
+			for i in os.listdir(serverpath):
+				si = os.path.getsize(serverpath + "/" + i)
+				si = readsize(si)
+				size.append(si)
+			filelist2 = []
+			for x, y in zip(filelist, size):
+				filelist2.append(f"{x} -- {y}")
+			filelist2 = str(filelist2)
+			sock.send(filelist2.encode())
+		elif(filecommand.decode() == "download"):
+			whatfile = sock.recv(1024).decode()
+			if(os.path.exists(serverpath + "/" + whatfile)):
+				openfile = serverpath + "/" + whatfile
+				sendfile = open(openfile, "rb")
+				readcontent = sendfile.read(1024)
+				while(readcontent):
+					sock.send(readcontent)
+					readcontent = sendfile.read(1024)
+				sendfile.close()
+			else:
+				cool = "no file"
+				sock.send(cool.encode())
+		elif(filecommand.decode() == "query"):
+			checkfile = sock.recv(1024).decode()
+			if(os.path.exists(serverpath + "/" + checkfile)):
+				sock.send("Does".encode())
+			else:
+				sock.send("Does not".encode())  
+		elif(filecommand.decode() == "closeserver"):
+			sock.close()
+		else:
+			back = "invalid command - use help for help"
+			sock.send(back.encode())
 
-if(authenabled == 1):
-    sock.send("auth is active".encode())
-    passhash = sock.recv(1024).decode()
-    if(passhash == authhash):
-        sock.send("correct".encode())
-    else:
-        sock.send("incorrect".encode())
-        s.close()
-        quit()
-else:
-    sock.send("no auth is needed".encode())
+def readsize(size):
+	for u in ["B", "KiB", "MiB", "GiB", "TiB"]:
+	if size < 1024.0:
+		break
+	size /= 1024.0
+	return f"{size:.3f}{u}"
 
+s = socket.socket()
+s.bind((myip, myport))
+s.listen(5)
 while True:
-    filecommand = sock.recv(1024)
-    if(filecommand.decode() == "help"):
-        back = "commands:\nhelp - list this\nlist - list directory\ndownload - lets you download a file\ncloseserver - close socket"
-        sock.send(back.encode())
-    elif(filecommand.decode() == "list"):
-        note = "Note: this only lists files, dirs are not supported"
-        sock.send(note.encode())
-        size = []
-        filelist = [f for f in os.listdir(serverpath) if os.path.isfile(os.path.join(serverpath,f))]
-        #filelist = str(filelist)
-        #sock.send(filelist.encode())
-        for i in os.listdir(serverpath):
-            si = os.path.getsize(serverpath + "/" + i)
-            si = readsize(si)
-            size.append(si)
-        filelist2 = []
-        for x, y in zip(filelist, size):
-            filelist2.append(f"{x} -- {y}")
-        filelist2 = str(filelist2)
-        sock.send(filelist2.encode())
-    elif(filecommand.decode() == "download"):
-        whatfile = sock.recv(1024).decode()
-        if(os.path.exists(serverpath + "/" + whatfile)):
-            #goodnote = "exists"
-            #goodcheck = sock.send(goodnote.encode())
-            openfile = serverpath + "/" + whatfile
-            sendfile = open(openfile, "rb")
-            readcontent = sendfile.read(1024)
-            while(readcontent):
-                sock.send(readcontent)
-                readcontent = sendfile.read(1024)
-            sendfile.close()
-        else:
-            cool = "no file"
-            sock.send(cool.encode())
-    elif(filecommand.decode() == "query"):
-        checkfile = sock.recv(1024).decode()
-        if(os.path.exists(serverpath + "/" + checkfile)):
-            sock.send("Does".encode())
-        else:
-            sock.send("Does not".encode())  
-    elif(filecommand.decode() == "closeserver"):
-        s.close()
-        quit()
-    else:
-        back = "invalid command - use help for help"
-        sock.send(back.encode())
+	sock, addr = s.accept()
+	_thread.start_new_thread(newclient,(sock, addr))