QRouland
/
L3DNC
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

end ?

This commit is contained in:
DonRenando 2015-04-16 12:52:25 +02:00
parent ef0de22c54
commit 59d43d3572
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
client/download/homerRasta.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 135 KiB

BIN
client/download/wallpaper targaryen_sigil.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 MiB

11
client/start.py
View File

@ -538,9 +538,11 @@ class start(QtGui.QMainWindow):
self.s.send("/userlistaway".encode()) self.s.send("/userlistaway".encode())
if self.codeNb(txt.split(" ")[0]) == "HAS_ASKED_FILE": if self.codeNb(txt.split(" ")[0]) == "HAS_ASKED_FILE":
self.ShowMessageOK(txt.split(" ")[1]+" share a file with you, do you want download "+' '.join(txt.split(" ")[2].split("/")[-1:])+" ?") nomfichierEn = ' '.join(txt.split(" ")[2:])
self.questionMessage(txt.split(" ")[1],txt.split(" ")[2]) nomfichier = ' '.join(nomfichierEn.split("/")[-1:])
self.fileNom = ' '.join(txt.split(" ")[2].split("/")[-1:]) self.ShowMessageOK(txt.split(" ")[1]+" share a file with you, do you want download "+nomfichier+" ?")
self.questionMessage(txt.split(" ")[1],nomfichierEn)
self.fileNom = nomfichier
if self.codeNb(txt.split(" ")[0]) == "SUCC_ASKED_FILE": if self.codeNb(txt.split(" ")[0]) == "SUCC_ASKED_FILE":
self.ShowMessageOK("Succes asked file") self.ShowMessageOK("Succes asked file")
@ -555,7 +557,8 @@ class start(QtGui.QMainWindow):
ms = socket(AF_INET, SOCK_STREAM) ms = socket(AF_INET, SOCK_STREAM)
print(txt.split(" ")[2]+" "+txt.split(" ")[3]) print(txt.split(" ")[2]+" "+txt.split(" ")[3])
ms.connect((str(txt.split(" ")[2]), int(txt.split(" ")[3]))) ms.connect((str(txt.split(" ")[2]), int(txt.split(" ")[3])))
f = open(txt.split(" ")[4], "rb") namefichier = ' '.join(txt.split(" ")[4:])
f = open(namefichier, "rb")
data = f.read() data = f.read()
f.close() f.close()
ms.send(data) ms.send(data)

10
server/Server.py
View File

@ -181,16 +181,16 @@ def handle_request(connection, data):
reject_private_message(connection, array_data[1]) reject_private_message(connection, array_data[1])
return return
if array_data[0] == "/pm": if array_data[0] == "/pm":
private_message(connection, array_data[1], " ".join(array_data[2:])) private_message(connection, array_data[1], " ".join(array_data[2:]).strip())
return return
if array_data[0] == "/pmfile": if array_data[0] == "/pmfile":
ask_file(connection, array_data[1], " ".join(array_data[2:])) ask_file(connection, array_data[1], " ".join(array_data[2:]).strip())
return return
if array_data[0] == "/acceptfile": if array_data[0] == "/acceptfile":
accept_file(connection, array_data[1], " ".join(array_data[3:]), array_data[2]) accept_file(connection, array_data[1], " ".join(array_data[3:]).strip(), array_data[2])
return return
if array_data[0] == "/rejectfile": if array_data[0] == "/rejectfile":
reject_file(connection, array_data[1], " ".join(array_data[2:])) reject_file(connection, array_data[1], " ".join(array_data[2:]).strip())
return return
connection.sendall("{}".format(COMMAND_NOT_FOUND).encode()) connection.sendall("{}".format(COMMAND_NOT_FOUND).encode())
else: else:
@ -310,7 +310,7 @@ def ask_private_message(connection, pseudo):
ERR_ALREADY_ASKED_FOR_PM), Log.lvl.INFO) ERR_ALREADY_ASKED_FOR_PM), Log.lvl.INFO)
else: else:
askPM.append(pm) askPM.append(pm)
log.printL("askPm {}".format(askPM), Log.lvl.DEBUG) #log.printL("askPm {}".format(askPM), Log.lvl.DEBUG)
c.sendall("{} {}".format(ASKING_FOR_PM, usersConnected[connection][1]).encode()) c.sendall("{} {}".format(ASKING_FOR_PM, usersConnected[connection][1]).encode())
log.printL("Send to {} : {} {}".format(usersConnected[c][0], ASKING_FOR_PM, log.printL("Send to {} : {} {}".format(usersConnected[c][0], ASKING_FOR_PM,
usersConnected[connection][1]), Log.lvl.INFO) usersConnected[connection][1]), Log.lvl.INFO)