From 32e3b3567c18c468acd843c1a54720407994ec34 Mon Sep 17 00:00:00 2001 From: DonRenando Date: Thu, 2 Apr 2015 11:49:43 +0200 Subject: [PATCH] boby bob --- .gitignore | 0 README.md | 0 client/README.md | 0 client/client.py | 29 -------------- client/view/mainWindow.py | 0 client/view/mainWindow.ui | 0 client/view/start.py | 80 ++++++++++++++++++++++++--------------- log/activity.log | 27 +++++++++++++ log/error.log | 0 log/warning.log | 0 serveur/Log.py | 0 serveur/README.md | 0 serveur/__init__.py | 0 13 files changed, 77 insertions(+), 59 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 README.md mode change 100644 => 100755 client/README.md delete mode 100644 client/client.py mode change 100644 => 100755 client/view/mainWindow.py mode change 100644 => 100755 client/view/mainWindow.ui mode change 100644 => 100755 client/view/start.py create mode 100644 log/activity.log create mode 100644 log/error.log create mode 100644 log/warning.log mode change 100644 => 100755 serveur/Log.py mode change 100644 => 100755 serveur/README.md mode change 100644 => 100755 serveur/__init__.py diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/client/README.md b/client/README.md old mode 100644 new mode 100755 diff --git a/client/client.py b/client/client.py deleted file mode 100644 index 99db964..0000000 --- a/client/client.py +++ /dev/null @@ -1,29 +0,0 @@ -from socket import * - -Host = "127.0.0.1" -Port = 2222 -Addr = (Host,Port) - -def Client(): - s = socket(AF_INET,SOCK_STREAM); - s.connect(Addr); - - while True : - cmd = input("Entrez votre commande (help pour la liste des commandes et quit pour quitter) : ") - if cmd.lower() == "quit": - break - try : - s.send(cmd.encode()) - #data , addr = s.recvfrom(4096) - #print(data.decode()) - except timeout : - print("Erreur : Timeout. Le serveur ne repond pas.") - - s.close(); - - -if __name__ == "__main__": - Client() - - - diff --git a/client/view/mainWindow.py b/client/view/mainWindow.py old mode 100644 new mode 100755 diff --git a/client/view/mainWindow.ui b/client/view/mainWindow.ui old mode 100644 new mode 100755 diff --git a/client/view/start.py b/client/view/start.py old mode 100644 new mode 100755 index ea1983b..a011aea --- a/client/view/start.py +++ b/client/view/start.py @@ -1,7 +1,6 @@ from mainWindow import Ui_Dialog from PyQt4 import QtGui, QtCore -import datetime -import time +import time, threading, datetime from socket import * Host = "127.0.0.1" @@ -16,25 +15,23 @@ class start(QtGui.QDialog): def getTimeStamp(self): return ('[%s] ' % str(datetime.datetime.fromtimestamp(int(time.time())).strftime('%H:%M'))) + + def htmlToText( self, html ): + + html = html.replace('<', '<') + html = html.replace('>', '>') + + return html def ShowMessageAsText(self, txt): - self.message_buffer += '
' + self.getTimeStamp() + '' + txt + '' - - - def createWidgets(self): - self.ui = Ui_Dialog() - self.ui.setupUi(self) - - self.ui.lineEdit.setDisabled(True) - self.ui.pushButton.setDisabled(True) - self.ui.pushButton_3.setDisabled(True) - self.message_buffer = "" - self.connectActions() - - - - # self.UpdateMainDisplay() + self.message_buffer += '
' + self.getTimeStamp() + '' + self.htmlToText(txt) + '' + + def UpdateChat(self, messgServeur) : + self.ShowMessageAsText(messgServeur) + self.ui.txtOutput.setText(self.message_buffer) + sb = self.ui.txtOutput.verticalScrollBar() + sb.setValue(sb.maximum()) def connectActions(self): self.ui.pushButton_2.clicked.connect(self.connecter) @@ -48,6 +45,36 @@ class start(QtGui.QDialog): self.ui.pushButton.setDisabled(False) self.ui.pushButton_2.setDisabled(True) self.ui.pushButton_3.setDisabled(False) + + #threading.Thread(target=self.ecoute).start() + #for t in threading.enumerate(): + # if t != threading.main_thread(): t.join() + + def deco(self): + self.s.close() + self.ui.lineEdit.setDisabled(True) + self.ui.pushButton.setDisabled(True) + self.ui.pushButton_2.setDisabled(False) + + def ecoute(self): + while 1 : + data = self.s.recv(4096) + if not data : + break + messgServeur = (data.decode()) + self.UpdateChat(messgServeur) + + + def createWidgets(self): + self.ui = Ui_Dialog() + self.ui.setupUi(self) + + self.ui.lineEdit.setDisabled(True) + self.ui.pushButton.setDisabled(True) + self.ui.pushButton_3.setDisabled(True) + self.message_buffer = "" + self.connectActions() + """ @@ -65,34 +92,27 @@ class start(QtGui.QDialog): """ - def deco(self): - self.s.close() - self.ui.lineEdit.setDisabled(True) - self.ui.pushButton.setDisabled(True) - self.ui.pushButton_2.setDisabled(False) + def client(self): cmd = self.ui.lineEdit.text() if cmd != "": self.ui.lineEdit.setText('') - if cmd.lower() == "quit": - exit(0) + try: self.s.send(cmd.encode()) data = self.s.recv(4096) messgServeur = (data.decode()) - self.ShowMessageAsText(messgServeur) - self.ui.txtOutput.setText(self.message_buffer) - sb = self.ui.txtOutput.verticalScrollBar() - sb.setValue(sb.maximum()) + self.UpdateChat(messgServeur) + + except timeout: print("Erreur : Timeout. Le serveur ne repond pas.") if __name__ == "__main__": import sys - app = QtGui.QApplication(sys.argv) myapp = start() myapp.show() diff --git a/log/activity.log b/log/activity.log new file mode 100644 index 0000000..70d5bf3 --- /dev/null +++ b/log/activity.log @@ -0,0 +1,27 @@ +2015-04-01 08:42:26,046 :: INFO ::  Configuration load Namespace(port=8000, usermax=None)  +2015-04-01 08:42:26,046 :: INFO ::  Server start  +2015-04-01 08:42:26,088 :: INFO ::  Server Listen on port 8000  +2015-04-01 08:43:10,939 :: INFO ::  Wait for threads ending  +2015-04-01 08:43:10,940 :: INFO ::  Server shutdown  +2015-04-01 08:43:21,055 :: INFO ::  Configuration load Namespace(port=2222, usermax=None)  +2015-04-01 08:43:21,055 :: INFO ::  Server start  +2015-04-01 08:43:21,058 :: INFO ::  Server Listen on port 2222  +2015-04-01 08:43:32,103 :: INFO ::  Connection from IP -> ('127.0.0.1', 53851)  +2015-04-01 08:43:39,933 :: INFO ::  Request from IP -> ('127.0.0.1', 53851) bob  +2015-04-01 08:43:45,900 :: INFO ::  Request from IP -> ('127.0.0.1', 53851) super !  +2015-04-01 08:43:52,170 :: INFO ::  Request from IP -> ('127.0.0.1', 53851) /name bob  +2015-04-01 08:44:08,771 :: INFO ::  Connection from IP -> ('127.0.0.1', 53852)  +2015-04-01 08:44:12,601 :: INFO ::  Request from IP -> ('127.0.0.1', 53852) /quit  +2015-04-01 08:44:45,278 :: INFO ::  Wait for threads ending  +2015-04-01 08:44:45,278 :: INFO ::  Disconnection from IP -> ('127.0.0.1', 53851)  +2015-04-01 14:01:21,465 :: INFO ::  Configuration load Namespace(port=8000, usermax=None)  +2015-04-01 14:01:21,476 :: INFO ::  Server start  +2015-04-01 14:01:21,508 :: INFO ::  Server Listen on port 8000  +2015-04-01 14:01:59,767 :: INFO ::  Connection from IP -> ('127.0.0.1', 60151)  +2015-04-01 14:02:04,760 :: INFO ::  Request from IP -> ('127.0.0.1', 60151) coucou  +2015-04-01 14:02:20,518 :: INFO ::  Request from IP -> ('127.0.0.1', 60151) /name bob  +2015-04-01 14:03:35,380 :: INFO ::  Request from IP -> ('127.0.0.1', 60151) /newname bob  +2015-04-01 14:03:38,491 :: INFO ::  Request from IP -> ('127.0.0.1', 60151) coucou  +2015-04-01 14:03:48,807 :: INFO ::  Request from IP -> ('127.0.0.1', 60151) /newname  +2015-04-01 14:03:56,293 :: INFO ::  Request from IP -> ('127.0.0.1', 60151) /newname renan  +2015-04-01 14:04:53,177 :: INFO ::  Connection from IP -> ('127.0.0.1', 60182)  diff --git a/log/error.log b/log/error.log new file mode 100644 index 0000000..e69de29 diff --git a/log/warning.log b/log/warning.log new file mode 100644 index 0000000..e69de29 diff --git a/serveur/Log.py b/serveur/Log.py old mode 100644 new mode 100755 diff --git a/serveur/README.md b/serveur/README.md old mode 100644 new mode 100755 diff --git a/serveur/__init__.py b/serveur/__init__.py old mode 100644 new mode 100755