SF.net SVN: fclient: [373] trunk/sandbox/fcp2/message.py
Status: Pre-Alpha
Brought to you by:
jurner
From: <jU...@us...> - 2008-04-08 10:08:05
|
Revision: 373 http://fclient.svn.sourceforge.net/fclient/?rev=373&view=rev Author: jUrner Date: 2008-04-08 03:08:08 -0700 (Tue, 08 Apr 2008) Log Message: ----------- use pmstruct to handle persistent data Modified Paths: -------------- trunk/sandbox/fcp2/message.py Modified: trunk/sandbox/fcp2/message.py =================================================================== --- trunk/sandbox/fcp2/message.py 2008-04-08 10:07:36 UTC (rev 372) +++ trunk/sandbox/fcp2/message.py 2008-04-08 10:08:08 UTC (rev 373) @@ -16,6 +16,7 @@ from fcp2 import consts from fcp2 import types +from fcp2.fcp_lib import pmstruct from fcp2.fcp_lib import uuid @@ -157,9 +158,9 @@ def _setPersistentParams(self, persistentData): params = persistentData.split(PersistentParamsSep) if len(params) > len(self._persistent_params_): - raise ValueError('Too many parameters in data') + raise ValueError('Too many parameters in persistentData') elif len(params) < len(self._persistent_params_): - raise ValueError('Too few parameters in data') + raise ValueError('Too few parameters in persistentData') for n, (getter, setter) in enumerate(self._persistent_params_): setter(self, params[n]) @@ -388,8 +389,28 @@ ConfigMessageParamTypes = _ConfigMessageParamTypes() #******************************************************************************** -# +# equipment for messages with persustent params and additional params #******************************************************************************** +class PeristentParamsGet(pmstruct.PoorMansStruct): + _fields_ = ( + ('Flags', pmstruct.Int), + ('InitTime', pmstruct.Float), + ('PersistentUserData', pmstruct.Str), + ) + +PeristentParamsPut = PeristentParamsGet + + +class PersistentParams(object): + + def __init__(self, mapping): + self.mapping = mapping + + def fromString(self, string): + pass + + + PeerMessageParamTypes = { 'ark.number': types.FcpTypeInt, 'auth.negTypes': types.FcpTypeInt, @@ -698,7 +719,7 @@ ClientPut.__init__(self, *args, **kwargs) self._dataLength = 0 - + def _restoreParams(self, params): result = ClientPut._restoreParams(self, params) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |