SF.net SVN: fclient: [421] trunk/sandbox/fcp2/client.py

[<jU...@us...>]

Revision: 421
          http://fclient.svn.sourceforge.net/fclient/?rev=421&view=rev
Author:   jUrner
Date:     2008-06-29 05:37:43 -0700 (Sun, 29 Jun 2008)

Log Message:
-----------
SSKKeypair was broken. fixed
++ some other changes

Modified Paths:
--------------
    trunk/sandbox/fcp2/client.py

Modified: trunk/sandbox/fcp2/client.py
===================================================================
--- trunk/sandbox/fcp2/client.py	2008-06-29 12:36:50 UTC (rev 420)
+++ trunk/sandbox/fcp2/client.py	2008-06-29 12:37:43 UTC (rev 421)
@@ -22,10 +22,11 @@
         # everything went well ..we are connected now
 
 Request data associated to a freenet key::
-    myRequestIdentifier = client.getData('CHK@ABCDE.......')
-    myRequest = c.getRequest(myIdentifier)
-    client.run()
-    print myRequest.data
+	myKey = client.key.key('CHK@ABCDE.......')
+	myRequestIdentifier = client.getData(myKey)
+	myRequest = c.getRequest(myIdentifier)
+	client.run()
+	print myRequest.data
 
 Usually you would connect handlers to client events to do processing or handle errors::
     def handleSuccess(event, request):
@@ -34,17 +35,18 @@
     def handleFailure(event, request):
         print 'Too bad, something went wrong'
 
-    client.events.RequestCompleted += handleSuccess
-    client.events.RequestFailed += handleFailure
+	client.events.RequestCompleted += handleSuccess
+	client.events.RequestFailed += handleFailure
+	myKey = client.key.key('CHK@ABCDE.......')
+	client.getData(myKey)
+	c.run()
 
-    client.getData('CHK@ABCDE.......')
-    c.run()
 
-
 Instead of calling run() you may run the client step by step::
-    client.getData('CHK@ABCDE.......')
-    for i in xrange(50):
-        client.next()
+    myKey = client.key.key('CHK@ABCDE.......')
+	client.getData(myKey)
+	for i in xrange(50):
+		client.next()
 
 	
 You may disconnect event handlers aswell::
@@ -936,7 +938,7 @@
 				# So no way.
 				
 				#TODO: ??? try ...except 
-				initialRequest.restorePersistentParams()
+				initialRequest._restoreParams(msg.params)
 					
 			# check if PriorityClass has changed
 			priorityClass = msg.get('PriorityClass', None)
@@ -950,6 +952,7 @@
 			
 		
 		# don't handle PersistentRequestRemoved. instead we handle it in Get/PutFailed
+		# ??? why ???
 		#
 		#elif msg == message.PersistentRequestRemoved:
 		#	if initialRequest is None:
@@ -1099,12 +1102,12 @@
 				return False
 				
 			#TODO:no idea if the node may pass uris with prefixes like 'freenet:'... strip it anyways
-			insertURI = key.stripKey(msg['InsertURI'])
-			requestURI = key.stripKey(msg['RequestURI'])
+			insertURI = msg['InsertURI']
+			requestURI = msg['RequestURI']
 						
 			if initialRequest['RequestType'] == consts.RequestType.GenerateUSKKeypair:
-				insertURI = insertURI.replace(consts.KeyType.SSK, consts.KeyType.USK, 1)
-				requestURI = requestURI.replace(consts.KeyType.SSK, consts.KeyType.USK, 1)
+				insertURI = key.USK(insertURI.keyData, filename=insertURI.filename)
+				requestURI = key.USK(requestURI.keyData, filename=requestURI.filename)
 				
 			initialRequest['PrivateKey'] = insertURI
 			initialRequest['PublicKey'] = requestURI


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