boby bob

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('<', '&#60;')
+        html = html.replace('>', '&#62;')
+
+        return html
 
 
     def ShowMessageAsText(self, txt):
-        self.message_buffer += '<br><span style="color : red"> ' + self.getTimeStamp() + '</span>' + 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 += '<br><span style="color : red"> ' + self.getTimeStamp() + '</span>' + 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()