Thread: [Pykafe-commits] SF.net SVN: pykafe: [58] trunk/pykafe/client/client.py
Status: Pre-Alpha
Brought to you by:
jnmbk
Menu
▾
▴
pykafe-commits
|
From: <jn...@us...> - 2007-06-01 11:25:35
|
Revision: 58
http://pykafe.svn.sourceforge.net/pykafe/?rev=58&view=rev
Author: jnmbk
Date: 2007-06-01 04:25:36 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
let filtering work
Modified Paths:
--------------
trunk/pykafe/client/client.py
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jn...@us...> - 2007-06-02 17:13:14
|
Revision: 73
http://pykafe.svn.sourceforge.net/pykafe/?rev=73&view=rev
Author: jnmbk
Date: 2007-06-02 10:13:16 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
fix something
Modified Paths:
--------------
trunk/pykafe/client/client.py
Modified: trunk/pykafe/client/client.py
===================================================================
--- trunk/pykafe/client/client.py 2007-06-02 17:09:07 UTC (rev 72)
+++ trunk/pykafe/client/client.py 2007-06-02 17:13:16 UTC (rev 73)
@@ -31,6 +31,7 @@
def run(self):
while not sendDataToServer(self.data):
self.emit(QtCore.SIGNAL("connectionError"))
+ print "connection error retrying"
time.sleep(10)
self.emit(QtCore.SIGNAL("messageSent"))
@@ -84,11 +85,11 @@
print "connection request from:", self.tcpSocket.peerAddress().toString()
if self.tcpSocket.peerAddress() == QtNetwork.QHostAddress(QtNetwork.QHostAddress.LocalHost):
QtCore.QObject.connect(self.tcpSocket, QtCore.SIGNAL("readyRead()"), self.readUi)
- elif self.tcpSocket.peerAddress() == QtNetwork.QHostAddress(self.client.config.network.serverIP):
+ elif self.tcpSocket.peerAddress() == QtNetwork.QHostAddress(config.network_serverIP):
QtCore.QObject.connect(self.tcpSocket, QtCore.SIGNAL("readyRead()"), self.readServer)
else:
sys.stderr.write(_("Unauthorized server tried to connect, aborting connection: %s") % self.tcpSocket.peerAddress())
- self.exit()
+ self.terminate()
self.tcpSocket.waitForDisconnected()
self.exec_()
@@ -122,6 +123,7 @@
file = open("/etc/pyKafe/iptables.conf", "w")
file.write(iptablesFile)
file.close()
+ print iptablesFile
os.system("iptables-restore < /etc/pyKafe/iptables.conf")
elif data[:3] == "010":
os.system("init 0")
@@ -189,6 +191,7 @@
sys.exit()
thread = SenderThread("011")
QtCore.QObject.connect(thread, QtCore.SIGNAL("messageSent"), self.initialConnection)
+ thread.start()
self.threads = [thread]
print "trying to connect to server"
def incomingConnection(self, socketDescriptor):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jn...@us...> - 2007-06-02 19:23:02
|
Revision: 75
http://pykafe.svn.sourceforge.net/pykafe/?rev=75&view=rev
Author: jnmbk
Date: 2007-06-02 12:23:03 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
fixed
Modified Paths:
--------------
trunk/pykafe/client/client.py
Modified: trunk/pykafe/client/client.py
===================================================================
--- trunk/pykafe/client/client.py 2007-06-02 19:22:36 UTC (rev 74)
+++ trunk/pykafe/client/client.py 2007-06-02 19:23:03 UTC (rev 75)
@@ -89,7 +89,6 @@
QtCore.QObject.connect(self.tcpSocket, QtCore.SIGNAL("readyRead()"), self.readServer)
else:
sys.stderr.write(_("Unauthorized server tried to connect, aborting connection: %s") % self.tcpSocket.peerAddress())
- self.terminate()
self.tcpSocket.waitForDisconnected()
self.exec_()
@@ -130,7 +129,6 @@
elif data[:3] == "016":
for c, value in map(lambda x,y:(x,y), ("price_fixedprice", "price_fixedpriceminutes", "price_onehourprice", "price_rounding"), data[3:].split("|")):
config.set(c, value)
- self.terminate()
def readUi(self):
data = base64.decodestring(self.tcpSocket.readAll())
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jn...@us...> - 2007-06-03 09:58:47
|
Revision: 78
http://pykafe.svn.sourceforge.net/pykafe/?rev=78&view=rev
Author: jnmbk
Date: 2007-06-03 02:58:49 -0700 (Sun, 03 Jun 2007)
Log Message:
-----------
getCurrentState->toString
Modified Paths:
--------------
trunk/pykafe/client/client.py
Modified: trunk/pykafe/client/client.py
===================================================================
--- trunk/pykafe/client/client.py 2007-06-03 09:58:00 UTC (rev 77)
+++ trunk/pykafe/client/client.py 2007-06-03 09:58:49 UTC (rev 78)
@@ -99,14 +99,14 @@
if self.client.session.state == ClientSession.ready:
sendDataToUi(data)
else:
- sys.stderr.write(_("Received ack from server, state was: %s") % self.client.session.getCurrentState())
+ sys.stderr.write(_("Received ack from server, state was: %s") % self.client.session.toString())
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.getCurrentState()))
+ sys.stderr.write(_("Received %s from server, state was: %s") % (data, self.client.session.toString()))
elif data[:3] == "005":
if self.client.session.state == ClientSession.ready:
self.client.session.user = "guest"
@@ -141,7 +141,7 @@
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())
+ sys.stderr.write(_("Client tried to send opening request, state was: %s") % self.client.session.toString())
elif data[:3] == "002":
if self.client.session.state == ClientSession.ready:
sendDataToServer(data)
@@ -150,7 +150,7 @@
sendDataToServer("004")
self.client.session.state = ClientSession.ready
else:
- sys.stderr.write(_("Client tried to say I'm here, state was: %s") % self.client.session.getCurrentState())
+ 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:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jn...@us...> - 2007-06-11 00:04:24
|
Revision: 122
http://pykafe.svn.sourceforge.net/pykafe/?rev=122&view=rev
Author: jnmbk
Date: 2007-06-10 17:04:25 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
do it right way
Modified Paths:
--------------
trunk/pykafe/client/client.py
Modified: trunk/pykafe/client/client.py
===================================================================
--- trunk/pykafe/client/client.py 2007-06-10 23:08:21 UTC (rev 121)
+++ trunk/pykafe/client/client.py 2007-06-11 00:04:25 UTC (rev 122)
@@ -171,7 +171,8 @@
currentTime = QtCore.QDateTime.currentDateTime()
usedTime = self.client.session.startTime.secsTo(currentTime)
remainingTime = QtCore.QDateTime()
- if self.client.session.endTime and currentTime.secsTo(self.client.session.endTime)>0:
+ print self.client.session.startTime.toString("hh.mm"), currentTime.toString("hh.mm"), self.client.session.endTime.toString("hh.mm")
+ if self.client.session.endTime:
remainingTime.setTime_t(currentTime.secsTo(self.client.session.endTime))
else:
remainingTime.setTime_t(0)
@@ -226,12 +227,11 @@
self.session.setState(ClientSession.notReady)
sendDataToUi("020")
- def setState(self, state, user = "guest", endTime = ""):
+ def setState(self, state, user = "guest", endTime = None):
if state == ClientSession.loggedIn:
self.session.user = user
self.session.startTime = QtCore.QDateTime.currentDateTime()
- if endTime:
- self.session.endTime = endTime
+ self.session.endTime = endTime
self.session.receivedBytes, self.session.transferredBytes = getNetworkBytes()
print getNetworkBytes()
self.session.setState(state)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jn...@us...> - 2007-06-11 00:37:04
|
Revision: 123
http://pykafe.svn.sourceforge.net/pykafe/?rev=123&view=rev
Author: jnmbk
Date: 2007-06-10 17:37:05 -0700 (Sun, 10 Jun 2007)
Log Message:
-----------
don't print
Modified Paths:
--------------
trunk/pykafe/client/client.py
Modified: trunk/pykafe/client/client.py
===================================================================
--- trunk/pykafe/client/client.py 2007-06-11 00:04:25 UTC (rev 122)
+++ trunk/pykafe/client/client.py 2007-06-11 00:37:05 UTC (rev 123)
@@ -171,7 +171,6 @@
currentTime = QtCore.QDateTime.currentDateTime()
usedTime = self.client.session.startTime.secsTo(currentTime)
remainingTime = QtCore.QDateTime()
- print self.client.session.startTime.toString("hh.mm"), currentTime.toString("hh.mm"), self.client.session.endTime.toString("hh.mm")
if self.client.session.endTime:
remainingTime.setTime_t(currentTime.secsTo(self.client.session.endTime))
else:
@@ -184,7 +183,7 @@
usedTime.toUTC().time().toString("hh.mm") + "|"
text += currency(self.client.session.calculatePrice(config))
sendDataToUi(str(data+text))
- if 120>remainingTime.toTime_t()>0:
+ if 180>remainingTime.toTime_t()>0:
sendDataToUi("024" + str(remainingTime.toTime_t()))
elif data[:3] == "018":
tcpSocket = QtNetwork.QTcpSocket()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X