Thread: [Pykafe-commits] SF.net SVN: pykafe: [76] trunk/pykafe

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 76
          http://pykafe.svn.sourceforge.net/pykafe/?rev=76&view=rev
Author:   jnmbk
Date:     2007-06-02 13:01:38 -0700 (Sat, 02 Jun 2007)

Log Message:
-----------
waiting>ready

Modified Paths:
--------------
    trunk/pykafe/client/client.py
    trunk/pykafe/client/session.py
    trunk/pykafe/server/server.py
    trunk/pykafe/server/session.py

Modified: trunk/pykafe/client/client.py
===================================================================

--- trunk/pykafe/client/client.py	2007-06-02 19:23:03 UTC (rev 75)
+++ trunk/pykafe/client/client.py	2007-06-02 20:01:38 UTC (rev 76)
@@ -96,19 +96,19 @@
         data = base64.decodestring(self.tcpSocket.readAll())
         print "received from server:", data
         if data[:3] == "001":
-            if self.client.session.state == ClientSession.working:
+            if self.client.session.state == ClientSession.ready:
                 sendDataToUi(data)
             else:
                 sys.stderr.write(_("Received ack from server, state was: %s") % self.client.session.getCurrentState())
         elif data[:3] == "003":
-            if self.client.session.state == ClientSession.working:
+            if self.client.session.state == ClientSession.ready:
                 sendDataToUi(data)
                 if data[3] == "1":
                     self.client.session.state = ClientSession.loggedIn
             else:
                 sys.stderr.write(_("Received %s from server, state was: %s") % (data, self.client.session.getCurrentState()))
         elif data[:3] == "005":
-            if self.client.session.state == ClientSession.working:
+            if self.client.session.state == ClientSession.ready:
                 self.client.session.user = "guest"
                 self.client.session.state = ClientSession.loggedIn
                 sendDataToUi("005")
@@ -137,18 +137,18 @@
             sendDataToUi("014")
             return
         if data[:3] == "000":
-            if self.client.session.state == ClientSession.working:
+            if self.client.session.state == ClientSession.ready:
                 sendDataToServer("000")
                 self.client.session.setState(ClientSession.requestedOpening)
             else:
                 sys.stderr.write(_("Client tried to send opening request, state was: %s") % self.client.session.getCurrentState())
         elif data[:3] == "002":
-            if self.client.session.state == ClientSession.working:
+            if self.client.session.state == ClientSession.ready:
                 sendDataToServer(data)
         elif data[:3] == "004":
             if self.client.session.state == ClientSession.notReady:
                 sendDataToServer("004")
-                self.client.session.state = ClientSession.working
+                self.client.session.state = ClientSession.ready
             else:
                 sys.stderr.write(_("Client tried to say I'm here, state was: %s") % self.client.session.getCurrentState())
         elif data[:3] == "008":

Modified: trunk/pykafe/client/session.py
===================================================================
--- trunk/pykafe/client/session.py	2007-06-02 19:23:03 UTC (rev 75)
+++ trunk/pykafe/client/session.py	2007-06-02 20:01:38 UTC (rev 76)
@@ -16,7 +16,7 @@
 
 class ClientSession:
     """class for managing client sessions"""
-    notConnected, notReady, working, loggedIn, requestedOpening, waitingMoney = range(6)
+    notConnected, notReady, ready, loggedIn, requestedOpening, waitingMoney = range(6)
     def __init__(self):
         self.state = 0
         self.user = None
@@ -44,7 +44,7 @@
         """returns current state as a string"""
         if self.state == self.notConnected:
             return _("Not Connected")
-        elif self.state == self.working:
+        elif self.state == self.ready:
             return _("Ready")
         elif self.state == self.loggedIn:
             return _("Logged In")

Modified: trunk/pykafe/server/server.py
===================================================================
--- trunk/pykafe/server/server.py	2007-06-02 19:23:03 UTC (rev 75)
+++ trunk/pykafe/server/server.py	2007-06-02 20:01:38 UTC (rev 76)
@@ -67,7 +67,7 @@
         print "data:", data
 
         if data[:3] == "011":
-            if client.session.state == ClientSession.notConnected:
+            if client.session.state in (ClientSession.notConnected, ClientSession.notReady):
                 logger.add(logger.logTypes.information, "client connected", self.config.last_cashier, client.name)
                 if self.config.filter_enable:
                     message = "007"
@@ -78,7 +78,7 @@
                         message += i
                     client.sendMessage(message)
                 message = "016"
-                message += "%s|%s|%s|%s" % (self.config.price_fixedprice,
+                message += "%s|%s|%s|%s".strip() % (self.config.price_fixedprice,
                                             self.config.price_fixedpriceminutes,
                                             self.config.price_onehourprice,
                                             self.config.price_rounding)
@@ -90,15 +90,18 @@
                 #TODO: send current session information after taking 004
                 #message = "013"
                 #client.sendSession()
+        elif data[:3] == "004":
+            if client.session.state == ClientSession.notReady:
+                client.setState(ClientSession.ready)
         elif data[:3] == "000":
             #User wants to open
-            if client.session.state == ClientSession.working:
+            if client.session.state == ClientSession.ready:
                 self.emit(QtCore.SIGNAL("stateChange"), self.clientNumber, ClientSession.requestedOpening)
             else:
                 #TODO: illegal activity
                 pass
         elif data[:3] == "002":
-            if client.session.state == ClientSession.working:
+            if client.session.state == ClientSession.ready:
                 username, password = data[3:].split("|")
                 db = Database()
                 db.cur.execute("select count() from members where username = ? and password = ?", (username, password))
@@ -266,7 +269,7 @@
         state = client.session.state
         if state == ClientSession.notConnected:
             QtGui.QMessageBox.critical(self.parent(), _("Error"), _("Can't connect to client"))
-        if state == ClientSession.working:
+        if state == ClientSession.ready:
             client.sendMessage("005")
             client.setState(ClientSession.loggedIn, user = "guest")
         if state == ClientSession.loggedIn:
@@ -293,7 +296,7 @@
                                       1440, 15)
         if answer[1] == False:
             return
-        if state == ClientSession.working:
+        if state == ClientSession.ready:
             client.sendMessage("006" + str(answer[0]))
             client.setState(ClientSession.loggedIn, user = "guest", endTime = QtCore.QDateTime.currentDateTime().addSecs(answer[0]*60))
 
@@ -305,16 +308,16 @@
         state = client.session.state
         if state == ClientSession.notConnected:
             QtGui.QMessageBox.critical(self.parent(), _("Error"), _("Can't connect to client"))
-        elif state == ClientSession.working:
+        elif state == ClientSession.ready:
             QtGui.QMessageBox.information(self.parent(), _("Information"), _("Client is already stopped"))
         elif state == ClientSession.loggedIn:
             answer = QtGui.QMessageBox.question(self.parent(), _("Are you sure?"), _("Do you really want to stop this client?"), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes).__or__(QtGui.QMessageBox.No), QtGui.QMessageBox.No)
             if answer == QtGui.QMessageBox.Yes:
                 client.sendMessage("009")
-                client.setState(ClientSession.working)
+                client.setState(ClientSession.ready)
         elif state == ClientSession.requestedOpening:
             client.sendMessage("0010")
-            client.setState(ClientSession.working)
+            client.setState(ClientSession.ready)
 
     def changeButton(self):
         pass

Modified: trunk/pykafe/server/session.py
===================================================================
--- trunk/pykafe/server/session.py	2007-06-02 19:23:03 UTC (rev 75)
+++ trunk/pykafe/server/session.py	2007-06-02 20:01:38 UTC (rev 76)
@@ -16,7 +16,7 @@
 
 class ClientSession:
     """class for managing client sessions"""
-    notConnected, notReady, working, loggedIn, requestedOpening, waitingMoney = range(6)
+    notConnected, notReady, ready, loggedIn, requestedOpening, waitingMoney = range(6)
     def __init__(self):
         self.state = 0
         self.user = None
@@ -44,7 +44,7 @@
         """returns current state as a string"""
         if self.state == self.notConnected:
             return _("Not Connected")
-        elif self.state == self.working:
+        elif self.state == self.ready:
             return _("Ready")
         elif self.state == self.loggedIn:
             return _("Logged In")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Pykafe-commits] SF.net SVN: pykafe: [76] trunk/pykafe

pykafe-commits