[Pykafe-commits] SF.net SVN: pykafe: [86] trunk/pykafe/client

[<jn...@us...>]

Revision: 86
          http://pykafe.svn.sourceforge.net/pykafe/?rev=86&view=rev
Author:   jnmbk
Date:     2007-06-03 09:26:55 -0700 (Sun, 03 Jun 2007)

Log Message:
-----------
make client work with new things

Modified Paths:
--------------
    trunk/pykafe/client/client.py
    trunk/pykafe/client/clientmain.py

Modified: trunk/pykafe/client/client.py
===================================================================
--- trunk/pykafe/client/client.py	2007-06-03 16:26:05 UTC (rev 85)
+++ trunk/pykafe/client/client.py	2007-06-03 16:26:55 UTC (rev 86)
@@ -96,22 +96,16 @@
         data = base64.decodestring(self.tcpSocket.readAll())
         print "received from server:", data
         if data[:3] == "001":
-            if self.client.session.state == ClientSession.ready:
-                sendDataToUi(data)
-            else:
-                sys.stderr.write(_("Received ack from server, state was: %s") % self.client.session.toString())
+            sendDataToUi(data)
         elif data[:3] == "003":
-            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.toString()))
+            sendDataToUi(data)
+            if data[3] == "1":
+                self.client.setState(ClientSession.loggedIn)
         elif data[:3] == "005":
-            if self.client.session.state == ClientSession.ready:
-                self.client.session.user = "guest"
-                self.client.session.state = ClientSession.loggedIn
-                sendDataToUi("005")
+            self.client.setState(ClientSession.loggedIn)
+            sendDataToUi("005")
+        elif data[:3] == "006":
+            self.client.setState(ClientSession.loggedIn, endTime = QtCore.QDateTime.fromTime_t(int(data[3:])))
         elif data[:3] == "007":
             iptablesFile = "*filter\n:INPUT ACCEPT [94:7144]\n:FORWARD ACCEPT [0:0]\n:OUTPUT ACCEPT [177:10428]\n"
             for site in data[3:].split('\n'):
@@ -152,31 +146,24 @@
             else:
                 sys.stderr.write(_("Client tried to say I'm here, state was: %s") % self.client.session.toString())
         elif data[:3] == "008":
-            print 8
-            if self.client.session.state == ClientSession.loggedIn:
-                print "gdg"
-                sendDataToServer(data)
-                os.system("service kdebase stop && sleep 3 && service kdebase start")
+            sendDataToServer(data)
+            os.system("restartkde&")
         elif data[:3] == "017":
             currentTime = QtCore.QDateTime.currentDateTime()
             usedTime = self.client.session.startTime.secsTo(currentTime)
-            price = (usedTime/600)*(config.price_onehourprice/6.0)
             remainingTime = QtCore.QDateTime()
-            if self.endTime.isValid():
+            if self.client.session.endTime:
                 remainingTime.setTime_t(currentTime.secsTo(self.client.session.endTime))
             else:
                 remainingTime.setTime_t(0)
             temp = usedTime
             usedTime = QtCore.QDateTime()
             usedTime.setTime_t(temp)
-            text = self.startTime.time().toString("hh.mm") + "\n" +\
+            text = self.client.session.startTime.time().toString("hh.mm") + "\n" +\
                    remainingTime.toUTC().time().toString("hh.mm") + "\n" +\
                    usedTime.toUTC().time().toString("hh.mm") + "|"
-            if float(config.price_fixedprice) < price:
-                text += currency(price)
-            else:
-                text += currency(float(config.price_fixedprice))
-            self.tcpSocket.write(text)
+            text += currency(self.client.session.calculatePrice(config))
+            self.tcpSocket.write(base64.encodestring(text))
             self.tcpSocket.waitForBytesWritten()
         self.exit()
 
@@ -192,11 +179,21 @@
         thread.start()
         self.threads = [thread]
         print "trying to connect to server"
+
     def incomingConnection(self, socketDescriptor):
         thread = ListenerThread(socketDescriptor, self)
         thread.start()
         self.threads.append(thread)
         print "We have " + str(len(self.threads)) + " thread(s)"
+
     def initialConnection(self):
         print "connected to server"
         self.session.setState(ClientSession.notReady)
+
+    def setState(self, state, user = "guest", endTime = ""):
+        if state == ClientSession.loggedIn:
+            self.session.user = user
+            self.session.startTime = QtCore.QDateTime.currentDateTime()
+            if endTime:
+                self.session.endTime = endTime
+        self.session.setState(state)

Modified: trunk/pykafe/client/clientmain.py
===================================================================
--- trunk/pykafe/client/clientmain.py	2007-06-03 16:26:05 UTC (rev 85)
+++ trunk/pykafe/client/clientmain.py	2007-06-03 16:26:55 UTC (rev 86)
@@ -86,11 +86,10 @@
             self.sendMessage("008")
 
 class TimerThread(QtCore.QThread):
-    def __init__(self, parent, startTime, endTime, currencyConfig):
+    def __init__(self, parent, startTime, endTime):
         QtCore.QThread.__init__(self, parent)
         self.startTime = startTime
         self.endTime = endTime
-        self.currencyConfig = currencyConfig
     def run(self):
         while True:
             self.do()
@@ -99,10 +98,12 @@
         tcpSocket = QtNetwork.QTcpSocket()
         tcpSocket.connectToHost(QtNetwork.QHostAddress(QtNetwork.QHostAddress.LocalHost), config.network_port)
         tcpSocket.waitForConnected()
-        tcpSocket.write("017")
+        tcpSocket.write(base64.encodestring("017"))
         tcpSocket.waitForReadyRead()
-        text = tcpSocket.readAll()
+        text = base64.decodestring(tcpSocket.readAll())
         text1, text2 = text.rsplit('|', 1)
+        #there's a big problem here, somehow time returns "1" and money returns ""
+        #TODO: fix it
         self.emit(QtCore.SIGNAL("changeTimeLabel"), text1)
         self.emit(QtCore.SIGNAL("changeMoneyLabel"), text2)
 


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