SF.net SVN: fclient:[843] trunk/fclient/fclient/impl/lib/fcp2/message.py
Status: Pre-Alpha
Brought to you by:
jurner
Menu
▾
▴
SF.net SVN: fclient:[843] trunk/fclient/fclient/impl/lib/fcp2/message.py
|
From: <jU...@us...> - 2008-08-01 23:48:44
|
Revision: 843
http://fclient.svn.sourceforge.net/fclient/?rev=843&view=rev
Author: jUrner
Date: 2008-08-01 23:48:53 +0000 (Fri, 01 Aug 2008)
Log Message:
-----------
equip all messages with custon params
Modified Paths:
--------------
trunk/fclient/fclient/impl/lib/fcp2/message.py
Modified: trunk/fclient/fclient/impl/lib/fcp2/message.py
===================================================================
--- trunk/fclient/fclient/impl/lib/fcp2/message.py 2008-07-31 18:45:36 UTC (rev 842)
+++ trunk/fclient/fclient/impl/lib/fcp2/message.py 2008-08-01 23:48:53 UTC (rev 843)
@@ -70,7 +70,7 @@
__metaclass__ = _MessageMeta
name = ''
- _additional_params_ = {}
+ _additional_params_ = {}
_param_types_ = {}
_persistent_params_ = ()
@@ -198,10 +198,14 @@
# as private so they don't get send to the node
#
#********************************************************************************
-_AdditionalGetParams = {
+_AdditionalParamsCommon = {
+ _PrivateParam('InitTime'): 0, # when was the request started?
+ _PrivateParam('RequestStatus'): consts.ConstRequestStatus.Null,
+ }
+
+_AdditionalParamsGet = {
# persistent params
- _PrivateParam('InitTime'): 0, # when was the request started?
_PrivateParam('PersistentUserData'): '', # any user defined persistent data
_PrivateParam('HandleFilenameCollision'): False,
_PrivateParam('FilenameCollisionHandled'): False,
@@ -210,7 +214,6 @@
_PrivateParam('IsGetKeyInfo'): False,
# non persistent params
- _PrivateParam('RequestStatus'): consts.ConstRequestStatus.Null,
_PrivateParam('ErrorMessage'): None, # error message in case an error occured
_PrivateParam('UserData'): None, # any user defined runtime data here
@@ -231,16 +234,14 @@
_PrivateParam('ProgressFatalyFailed'): 0,
_PrivateParam('ProgressSucceeeded'): 0,
}
+_AdditionalParamsGet.update(_AdditionalParamsCommon)
-
-_AdditionalPutParams = {
+_AdditionalParamsPut = {
# persistent params
- _PrivateParam('InitTime'): 0, # when was the request started?
_PrivateParam('PersistentUserData'): '', # any user defined persistent data
# non persistent params
- _PrivateParam('RequestStatus'): consts.ConstRequestStatus.Null,
_PrivateParam('ErrorMessage'): None, # error message in case an error occured
_PrivateParam('UserData'): None, # any user defined runtime data here
@@ -261,25 +262,19 @@
_PrivateParam('ProgressFatalyFailed'): 0,
_PrivateParam('ProgressSucceeeded'): 0,
}
+_AdditionalParamsPut.update(_AdditionalParamsCommon)
-_GenerateSSKParams = {
- _PrivateParam('RequestStatus'): consts.ConstRequestStatus.Null,
- _PrivateParam('InitTime'): 0, # when was the request started?
+_AdditionalParamsGenerateSSK = {
_PrivateParam('KeyPairType'): consts.ConstKeyType.SSK,
}
+_AdditionalParamsGenerateSSK.update(_AdditionalParamsCommon)
-_SubscribeUSKParams = {
- _PrivateParam('RequestStatus'): consts.ConstRequestStatus.Null,
- _PrivateParam('InitTime'): 0, # when was the request started?
+_AdditionalParamsSubscribeUSK = {
_PrivateParam('UserData'): None,
_PrivateParam('Edition'): -1,
}
+_AdditionalParamsSubscribeUSK.update(_AdditionalParamsCommon)
-_PluginInfoParams = {
- _PrivateParam('RequestStatus'): consts.ConstRequestStatus.Null,
- _PrivateParam('InitTime'): 0, # when was the request started?
- }
-
#********************************************************************************
# equip Get / Put messages with some persistent params
#
@@ -323,21 +318,21 @@
#********************************************************************************
class MsgClientDisconnected(_MessageBase):
name = consts.ConstMessage.ClientDisconnected
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'DisconnectReason': types.TypeInt,
}
class MsgClientSocketDied(_MessageBase):
name = consts.ConstMessage.ClientSocketDied
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
class MsgClientSocketTimeout(_MessageBase):
name = consts.ConstMessage.ClientSocketTimeout
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
@@ -346,7 +341,7 @@
#********************************************************************************
class MsgAddPeer(_MessageBase):
name = consts.ConstMessage.AddPeer
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'ark.number': types.TypeInt,
'auth.negTypes': types.TypeInt,
@@ -394,7 +389,7 @@
class MsgAllData(_MessageBase):
name = consts.ConstMessage.AllData
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'DataLength': types.TypeInt,
'Global': types.TypeBool,
@@ -406,7 +401,7 @@
class MsgClientGet(_MessageBase):
name = consts.ConstMessage.ClientGet
- _additional_params_ = _AdditionalGetParams
+ _additional_params_ = _AdditionalParamsGet
_param_types_ = {
'BinaryBlob': types.TypeBool,
'DSOnly': types.TypeBool,
@@ -444,7 +439,7 @@
class MsgClientHello(_MessageBase):
name = consts.ConstMessage.ClientHello
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'ExpectedVersion': types.TypeFloat,
}
@@ -452,7 +447,7 @@
class MsgClientPut(_MessageBase):
name = consts.ConstMessage.ClientPut
- _additional_params_ = _AdditionalPutParams
+ _additional_params_ = _AdditionalParamsPut
_param_types_ = {
'BinaryBlob': types.TypeBool,
'DataLength': types.TypeInt,
@@ -520,20 +515,20 @@
class MsgCloseConnectionDuplicateClientName(_MessageBase):
name = consts.ConstMessage.CloseConnectionDuplicateClientName
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
class MsgConfigData(_MessageBase):
name = consts.ConstMessage.ConfigData
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = config._ConfigMessageParamTypes
class MsgDataFound(_MessageBase):
name = consts.ConstMessage.DataFound
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'DataLength': types.TypeInt,
'Global': types.TypeBool,
@@ -542,35 +537,35 @@
class MsgEndListPeerNotes(_MessageBase):
name = consts.ConstMessage.EndListPeerNotes
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
class MsgEndListPeers(_MessageBase):
name = consts.ConstMessage.EndListPeers
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
class MsgEndListPersistentRequests(_MessageBase):
name = consts.ConstMessage.EndListPersistentRequests
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
class MsgFCPPluginMessage(_MessageBase):
name = consts.ConstMessage.FCPPluginMessage
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
class MsgFCPPluginReply(_MessageBase):
name = consts.ConstMessage.FCPPluginReply
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'DataLength': types.TypeInt,
}
@@ -578,7 +573,7 @@
class MsgFinishedCompression(_MessageBase):
name = consts.ConstMessage.FinishedCompression
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'CompressedSize': types.TypeInt,
'OriginalSize': types.TypeInt,
@@ -587,14 +582,14 @@
class MsgGenerateSSK(_MessageBase):
name = consts.ConstMessage.GenerateSSK
- _additional_params_ = _GenerateSSKParams
+ _additional_params_ = _AdditionalParamsGenerateSSK
_param_types_ = {
}
class MsgGetConfig(_MessageBase):
name = consts.ConstMessage.GetConfig
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'WithCurrent': types.TypeBool,
'WithDefaults': types.TypeBool,
@@ -609,7 +604,7 @@
class MsgGetFailed(_MessageBase):
name = consts.ConstMessage.GetFailed
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'Code': types.TypeInt,
'ExpectedDataLength': types.TypeInt_GetFailed_ExpectedDataLenght,
@@ -622,7 +617,7 @@
class MsgGetNode(_MessageBase):
name = consts.ConstMessage.GetNode
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'GiveOpennetRef': types.TypeBool,
'WithPrivate': types.TypeBool,
@@ -632,7 +627,7 @@
class MsgGetPluginInfo(_MessageBase):
name = consts.ConstMessage.GetPluginInfo
- _additional_params_ = _PluginInfoParams
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'Started': types.TypeBool,
}
@@ -640,7 +635,7 @@
class MsgGetRequestStatus(_MessageBase):
name = consts.ConstMessage.GetRequestStatus
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'Global': types.TypeBool,
'OnlyData': types.TypeBool,
@@ -649,7 +644,7 @@
class MsgIdentifierCollision(_MessageBase):
name = consts.ConstMessage.IdentifierCollision
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'Global': types.TypeBool,
}
@@ -657,7 +652,7 @@
class MsgListPeer(_MessageBase):
name = consts.ConstMessage.ListPeer
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'WithMetadata': types.TypeBool,
'WithVolantile': types.TypeBool,
@@ -666,7 +661,7 @@
class MsgListPeerNotes(_MessageBase):
name = consts.ConstMessage.ListPeerNotes
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
@@ -674,7 +669,7 @@
class MsgListPeers(_MessageBase):
name = consts.ConstMessage.ListPeers
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'WithMetadata': types.TypeBool,
'WithVolantile': types.TypeBool,
@@ -683,27 +678,27 @@
class MsgListPersistentRequests(_MessageBase):
name = consts.ConstMessage.ListPersistentRequests
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
class MsgModifyConfig(_MessageBase):
name = consts.ConstMessage.ModifyConfig
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = config._ConfigMessageParamTypes
class MsgModifyPeer(_MessageBase):
name = consts.ConstMessage.ModifyPeer
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
class MsgModifyPeerNote(_MessageBase):
name = consts.ConstMessage.ModifyPeerNote
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
#'Peernotetype': types.TypeInt, #????
}
@@ -711,7 +706,7 @@
class MsgModifyPersistentRequest(_MessageBase):
name = consts.ConstMessage.ModifyPersistentRequest
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'Global': types.TypeBool,
}
@@ -719,7 +714,7 @@
class MsgNodeData(_MessageBase):
name = consts.ConstMessage.NodeData
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'ark.number': types.TypeInt,
'ark.privURI': key.TypeKey,
@@ -832,7 +827,7 @@
class MsgNodeHello(_MessageBase):
name = consts.ConstMessage.NodeHello
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'Build': types.TypeInt,
'CompressionCodecs': types.TypeInt,
@@ -844,13 +839,13 @@
class MsgPeer(_MessageBase):
name = consts.ConstMessage.Peer
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = MsgAddPeer._param_types_
class MsgPeerNote(_MessageBase):
name = consts.ConstMessage.PeerNote
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'NoteText': types.TypeBase64EncodedString,
}
@@ -858,28 +853,28 @@
class MsgPeerRemoved(_MessageBase):
name = consts.ConstMessage.PeerRemoved
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
class MsgPersistentGet(MsgClientGet):
name = consts.ConstMessage.PersistentGet
- _additional_params_ = _AdditionalGetParams
+ _additional_params_ = _AdditionalParamsGet
_param_types_ = MsgClientGet._param_types_.copy()
_param_types_['Started'] = types.TypeBool
class MsgPersistentPut(MsgClientPut):
name = consts.ConstMessage.PersistentPut
- _additional_params_ = _AdditionalPutParams
+ _additional_params_ = _AdditionalParamsPut
_param_types_ = MsgClientPut._param_types_.copy()
_param_types_['Started'] = types.TypeBool
class MsgPersistentPutDir(MsgClientPut):
name = consts.ConstMessage.PersistentPutDir
- _additional_params_ = _AdditionalPutParams
+ _additional_params_ = _AdditionalParamsPut
_param_types_ = MsgClientPutDiskDir._param_types_.copy()
_param_types_['Started'] = types.TypeBool
@@ -897,7 +892,7 @@
class MsgPersistentRequestModified(_MessageBase):
name = consts.ConstMessage.PersistentRequestModified
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'Global': types.TypeBool,
}
@@ -905,7 +900,7 @@
class MsgPersistentRequestRemoved(_MessageBase):
name = consts.ConstMessage.PersistentRequestRemoved
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'Global': types.TypeBool,
}
@@ -913,14 +908,14 @@
class MsgPluginInfo(_MessageBase):
name = consts.ConstMessage.PluginInfo
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
class MsgProtocolError(_MessageBase):
name = consts.ConstMessage.ProtocolError
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'Code': types.TypeInt,
'Global': types.TypeBool,
@@ -930,7 +925,7 @@
class MsgPutFailed(_MessageBase):
name = consts.ConstMessage.PutFailed
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'Code': types.TypeInt,
'ExpectedURI': key.TypeKey,
@@ -940,7 +935,7 @@
class MsgPutFetchable(_MessageBase):
name = consts.ConstMessage.PutFetchable
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'Global': types.TypeBool,
'URI': key.TypeKey,
@@ -949,7 +944,7 @@
class MsgPutSuccessful(_MessageBase):
name = consts.ConstMessage.PutSuccessful
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'CompletionTime': types.TypeTime,
'Global': types.TypeBool,
@@ -960,14 +955,14 @@
class MsgRemovePeer(_MessageBase):
name = consts.ConstMessage.RemovePeer
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
class MsgRemoveRequest(_MessageBase):
name = consts.ConstMessage.RemoveRequest
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'Global': types.TypeBool,
}
@@ -975,7 +970,7 @@
class MsgSSKKeypair(_MessageBase):
name = consts.ConstMessage. SSKKeypair
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'InsertURI': key.TypeKey,
'RequestURI': key.TypeKey,
@@ -984,14 +979,14 @@
class MsgShutdown(_MessageBase):
name = consts.ConstMessage.Shutdown
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
class MsgSimpleProgress(_MessageBase):
name = consts.ConstMessage.SimpleProgress
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'Failed': types.TypeInt,
'FatalyFailed': types.TypeInt,
@@ -1004,14 +999,14 @@
class MsgStartedCompression(_MessageBase):
name = consts.ConstMessage.StartedCompression
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
class MsgSubscribeUSK(_MessageBase):
name = consts.ConstMessage.SubscribeUSK
- _additional_params_ = _SubscribeUSKParams
+ _additional_params_ = _AdditionalParamsSubscribeUSK
_param_types_ = {
'DontPoll': types.TypeBool,
'URI': key.TypeKey,
@@ -1020,7 +1015,7 @@
class MsgSubscribedUSK(_MessageBase):
name = consts.ConstMessage.SubscribedUSK
- _additional_params_ = _SubscribeUSKParams
+ _additional_params_ = _AdditionalParamsSubscribeUSK
_param_types_ = {
'DontPoll': types.TypeBool,
'URI': key.TypeKey,
@@ -1029,7 +1024,7 @@
class MsgSubscribedUSKUpdate(_MessageBase):
name = consts.ConstMessage.SubscribedUSKUpdate
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'Edition': types.TypeInt,
'URI': key.TypeKey,
@@ -1038,7 +1033,7 @@
class MsgTestDDAComplete(_MessageBase):
name = consts.ConstMessage.TestDDAComplete
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'ReadDirectoryAllowed': types.TypeBool,
'WriteDirectoryAllowed': types.TypeBool,
@@ -1047,14 +1042,14 @@
class MsgTestDDAReply(_MessageBase):
name = consts.ConstMessage.TestDDAReply
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
class MsgTestDDARequest(_MessageBase):
name = consts.ConstMessage.TestDDARequest
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'WantReadDirectory': types.TypeBool,
'WantWriteDirectory': types.TypeBool,
@@ -1063,14 +1058,14 @@
class MsgTestDDAResponse(_MessageBase):
name = consts.ConstMessage.TestDDAResponse
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
class MsgURIGenerated(_MessageBase):
name = consts.ConstMessage.URIGenerated
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'URI': key.TypeKey,
}
@@ -1078,21 +1073,21 @@
class MsgUnknownNodeIdentifier(_MessageBase):
name = consts.ConstMessage.UnknownNodeIdentifier
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
class MsgUnknownPeerNoteType(_MessageBase):
name = consts.ConstMessage.UnknownPeerNoteType
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
}
class MsgWatchGlobal(_MessageBase):
name = consts.ConstMessage.WatchGlobal
- _additional_params_ = {}
+ _additional_params_ = _AdditionalParamsCommon
_param_types_ = {
'Enabled': types.TypeBool,
'VerbosityMask': types.TypeInt,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
