SF.net SVN: fclient: [471] trunk/fcp2/src/fcp2/message.py
Status: Pre-Alpha
Brought to you by:
jurner
Menu
▾
▴
SF.net SVN: fclient: [471] trunk/fcp2/src/fcp2/message.py
|
From: <jU...@us...> - 2008-07-01 13:32:03
|
Revision: 471
http://fclient.svn.sourceforge.net/fclient/?rev=471&view=rev
Author: jUrner
Date: 2008-07-01 06:31:48 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
renames
Modified Paths:
--------------
trunk/fcp2/src/fcp2/message.py
Modified: trunk/fcp2/src/fcp2/message.py
===================================================================
--- trunk/fcp2/src/fcp2/message.py 2008-07-01 13:30:41 UTC (rev 470)
+++ trunk/fcp2/src/fcp2/message.py 2008-07-01 13:31:48 UTC (rev 471)
@@ -46,7 +46,7 @@
#********************************************************************************
#
#********************************************************************************
-class _PMessageMeta(type):
+class _MessageMeta(type):
def __new__(klass, name, bases, kws):
newClass = type.__new__(klass, name, bases, kws)
@@ -59,7 +59,7 @@
#********************************************************************************
#
#********************************************************************************
-class _PMessageBase(object):
+class _MessageBase(object):
"""Class wrapping a Fcp message
Sample use::
@@ -77,7 +77,7 @@
@ivar name: (str) message name
@ivar params: (dict) message params
"""
- __metaclass__ = _PMessageMeta
+ __metaclass__ = _MessageMeta
name = ''
_additional_params_ = {}
@@ -222,7 +222,7 @@
# as private so they don't get send to the node
#
#********************************************************************************
-_GetParams = {
+_AdditionalGetParams = {
# persistent params that will go into identifier
_PrivateParam('RequestType'): consts.ConstRequestType.Null, # identifies sub message types
@@ -254,7 +254,7 @@
}
-_PutParams = {
+_AdditionalPutParams = {
# persistent params that will go into identifier
_PrivateParam('RequestType'): consts.ConstRequestType.Null, # identifies sub message types
@@ -356,26 +356,26 @@
'_persistent_params_': () if persistentParams is None else persistentParams,
'_param_types_': {} if paramTypes is None else paramTypes,
}
- return type(name, (_PMessageBase, ), kws)
+ return type(name, (_MessageBase, ), kws)
#********************************************************************************
# some messages defined by the client
#********************************************************************************
-class MsgClientDisconnected(_PMessageBase):
+class MsgClientDisconnected(_MessageBase):
name = consts.ConstMessage.ClientDisconnected
_additional_params_ = {}
_param_types_ = {
'DisconnectReason': types.TypeInt,
}
-class MsgClientSocketDied(_PMessageBase):
+class MsgClientSocketDied(_MessageBase):
name = consts.ConstMessage.ClientSocketDied
_additional_params_ = {}
_param_types_ = {
}
-class MsgClientSocketTimeout(_PMessageBase):
+class MsgClientSocketTimeout(_MessageBase):
name = consts.ConstMessage.ClientSocketTimeout
_additional_params_ = {}
_param_types_ = {
@@ -384,7 +384,7 @@
#********************************************************************************
# fcp messages
#********************************************************************************
-class MsgAddPeer(_PMessageBase):
+class MsgAddPeer(_MessageBase):
name = consts.ConstMessage.AddPeer
_additional_params_ = {}
_param_types_ = {
@@ -432,7 +432,7 @@
'''
-class MsgAllData(_PMessageBase):
+class MsgAllData(_MessageBase):
name = consts.ConstMessage.AllData
_additional_params_ = {}
_param_types_ = {
@@ -444,9 +444,9 @@
return self['DataLength']
-class MsgClientGet(_PMessageBase):
+class MsgClientGet(_MessageBase):
name = consts.ConstMessage.ClientGet
- _additional_params_ = _GetParams
+ _additional_params_ = _AdditionalGetParams
_persistent_params_ = _PersistentParamsGet
_param_types_ = {
'BinaryBlob': types.TypeBool,
@@ -461,19 +461,19 @@
}
def _restoreParams(self, params):
- _PMessageBase._restoreParams(self, params)
+ _MessageBase._restoreParams(self, params)
try:
- _PMessageBase._setPersistentParams(self, self['ClientToken'])
+ _MessageBase._setPersistentParams(self, self['ClientToken'])
except Exception, d:
#print Exception, d
return False
return True
def updatePersistentParams(self):
- self['ClientToken'] = _PMessageBase._getPersistentParams(self)
+ self['ClientToken'] = _MessageBase._getPersistentParams(self)
-class MsgClientHello(_PMessageBase):
+class MsgClientHello(_MessageBase):
name = consts.ConstMessage.ClientHello
_additional_params_ = {}
_param_types_ = {
@@ -481,9 +481,9 @@
}
-class MsgClientPut(_PMessageBase):
+class MsgClientPut(_MessageBase):
name = consts.ConstMessage.ClientPut
- _additional_params_ = _PutParams
+ _additional_params_ = _AdditionalPutParams
_persistent_params_ = _PersistentParamsPut
_param_types_ = {
'BinaryBlob': types.TypeBool,
@@ -501,16 +501,16 @@
return self['DataLength']
def _restoreParams(self, params):
- _PMessageBase._restoreParams(self, params)
+ _MessageBase._restoreParams(self, params)
try:
- _PMessageBase._setPersistentParams(self, self['ClientToken'])
+ _MessageBase._setPersistentParams(self, self['ClientToken'])
except Exception, d:
#print Exception, d
return False
return True
def updatePersistentParams(self):
- self['ClientToken'] = _PMessageBase._getPersistentParams(self)
+ self['ClientToken'] = _MessageBase._getPersistentParams(self)
class MsgClientPutComplexDir(MsgClientPut):
@@ -544,7 +544,7 @@
name = consts.ConstMessage.ClientPutDiskDir
-class MsgCloseConnectionDuplicateClientName(_PMessageBase):
+class MsgCloseConnectionDuplicateClientName(_MessageBase):
name = consts.ConstMessage.CloseConnectionDuplicateClientName
_additional_params_ = {}
_param_types_ = {
@@ -552,13 +552,13 @@
#########################################
#########################################
-class MsgConfigData(_PMessageBase):
+class MsgConfigData(_MessageBase):
name = consts.ConstMessage.ConfigData
_additional_params_ = {}
_param_types_ = config._ConfigMessageParamTypes
-class MsgDataFound(_PMessageBase):
+class MsgDataFound(_MessageBase):
name = consts.ConstMessage.DataFound
_additional_params_ = {}
_param_types_ = {
@@ -567,35 +567,35 @@
}
-class MsgEndListPeerNotes(_PMessageBase):
+class MsgEndListPeerNotes(_MessageBase):
name = consts.ConstMessage.EndListPeerNotes
_additional_params_ = {}
_param_types_ = {
}
-class MsgEndListPeers(_PMessageBase):
+class MsgEndListPeers(_MessageBase):
name = consts.ConstMessage.EndListPeers
_additional_params_ = {}
_param_types_ = {
}
-class MsgEndListPersistentRequests(_PMessageBase):
+class MsgEndListPersistentRequests(_MessageBase):
name = consts.ConstMessage.EndListPersistentRequests
_additional_params_ = {}
_param_types_ = {
}
-class MsgFCPPluginMessage(_PMessageBase):
+class MsgFCPPluginMessage(_MessageBase):
name = consts.ConstMessage.FCPPluginMessage
_additional_params_ = {}
_param_types_ = {
}
-class MsgFCPPluginReply(_PMessageBase):
+class MsgFCPPluginReply(_MessageBase):
name = consts.ConstMessage.FCPPluginReply
_additional_params_ = {}
_param_types_ = {
@@ -603,7 +603,7 @@
}
-class MsgFinishedCompression(_PMessageBase):
+class MsgFinishedCompression(_MessageBase):
name = consts.ConstMessage.FinishedCompression
_additional_params_ = {}
_param_types_ = {
@@ -612,14 +612,14 @@
}
-class MsgGenerateSSK(_PMessageBase):
+class MsgGenerateSSK(_MessageBase):
name = consts.ConstMessage.GenerateSSK
_additional_params_ = _GenerateSSKParams
_param_types_ = {
}
-class MsgGetConfig(_PMessageBase):
+class MsgGetConfig(_MessageBase):
name = consts.ConstMessage.GetConfig
_additional_params_ = {}
_param_types_ = {
@@ -634,7 +634,7 @@
}
-class MsgGetFailed(_PMessageBase):
+class MsgGetFailed(_MessageBase):
name = consts.ConstMessage.GetFailed
_additional_params_ = {}
_param_types_ = {
@@ -647,7 +647,7 @@
}
-class MsgGetNode(_PMessageBase):
+class MsgGetNode(_MessageBase):
name = consts.ConstMessage.GetNode
_additional_params_ = {}
_param_types_ = {
@@ -657,7 +657,7 @@
}
-class MsgGetPluginInfo(_PMessageBase):
+class MsgGetPluginInfo(_MessageBase):
name = consts.ConstMessage.GetPluginInfo
_additional_params_ = _PluginInfoParams
_param_types_ = {
@@ -665,7 +665,7 @@
}
-class MsgGetRequestStatus(_PMessageBase):
+class MsgGetRequestStatus(_MessageBase):
name = consts.ConstMessage.GetRequestStatus
_additional_params_ = {}
_param_types_ = {
@@ -674,7 +674,7 @@
}
-class MsgIdentifierCollision(_PMessageBase):
+class MsgIdentifierCollision(_MessageBase):
name = consts.ConstMessage.IdentifierCollision
_additional_params_ = {}
_param_types_ = {
@@ -682,7 +682,7 @@
}
-class MsgListPeer(_PMessageBase):
+class MsgListPeer(_MessageBase):
name = consts.ConstMessage.ListPeer
_additional_params_ = {}
_param_types_ = {
@@ -691,7 +691,7 @@
}
-class MsgListPeerNotes(_PMessageBase):
+class MsgListPeerNotes(_MessageBase):
name = consts.ConstMessage.ListPeerNotes
_additional_params_ = {}
_param_types_ = {
@@ -699,7 +699,7 @@
-class MsgListPeers(_PMessageBase):
+class MsgListPeers(_MessageBase):
name = consts.ConstMessage.ListPeers
_additional_params_ = {}
_param_types_ = {
@@ -708,7 +708,7 @@
}
-class MsgListPersistentRequests(_PMessageBase):
+class MsgListPersistentRequests(_MessageBase):
name = consts.ConstMessage.ListPersistentRequests
_additional_params_ = {}
_param_types_ = {
@@ -716,21 +716,21 @@
#####################################
#####################################
-class MsgModifyConfig(_PMessageBase):
+class MsgModifyConfig(_MessageBase):
name = consts.ConstMessage.ModifyConfig
_additional_params_ = {}
_param_types_ = config._ConfigMessageParamTypes
#####################################
#####################################
-class MsgModifyPeer(_PMessageBase):
+class MsgModifyPeer(_MessageBase):
name = consts.ConstMessage.ModifyPeer
_additional_params_ = {}
_param_types_ = {
}
-class MsgModifyPeerNote(_PMessageBase):
+class MsgModifyPeerNote(_MessageBase):
name = consts.ConstMessage.ModifyPeerNote
_additional_params_ = {}
_param_types_ = {
@@ -738,7 +738,7 @@
}
-class MsgModifyPersistentRequest(_PMessageBase):
+class MsgModifyPersistentRequest(_MessageBase):
name = consts.ConstMessage.ModifyPersistentRequest
_additional_params_ = {}
_param_types_ = {
@@ -747,7 +747,7 @@
###################################
###################################
-class MsgNodeData(_PMessageBase):
+class MsgNodeData(_MessageBase):
name = consts.ConstMessage.NodeData
_additional_params_ = {}
_param_types_ = {
@@ -860,7 +860,7 @@
'''
-class MsgNodeHello(_PMessageBase):
+class MsgNodeHello(_MessageBase):
name = consts.ConstMessage.NodeHello
_additional_params_ = {}
_param_types_ = {
@@ -873,13 +873,13 @@
#######################################
#######################################
-class MsgPeer(_PMessageBase):
+class MsgPeer(_MessageBase):
name = consts.ConstMessage.Peer
_additional_params_ = {}
_param_types_ = MsgAddPeer._param_types_
-class MsgPeerNote(_PMessageBase):
+class MsgPeerNote(_MessageBase):
name = consts.ConstMessage.PeerNote
_additional_params_ = {}
_param_types_ = {
@@ -887,7 +887,7 @@
}
-class MsgPeerRemoved(_PMessageBase):
+class MsgPeerRemoved(_MessageBase):
name = consts.ConstMessage.PeerRemoved
_additional_params_ = {}
_param_types_ = {
@@ -895,17 +895,17 @@
#######################################
#######################################
-class MsgPersistentGet(_PMessageBase):
+class MsgPersistentGet(_MessageBase):
name = consts.ConstMessage.PersistentGet
- _additional_params_ = _GetParams
+ _additional_params_ = _AdditionalGetParams
_persistent_params_ = _PersistentParamsGet
_param_types_ = MsgClientGet._param_types_.copy()
_param_types_['Started'] = types.TypeBool
def _restoreParams(self, params):
- _PMessageBase._restoreParams(self, params)
+ _MessageBase._restoreParams(self, params)
try:
- _PMessageBase._setPersistentParams(self, self['ClientToken'])
+ _MessageBase._setPersistentParams(self, self['ClientToken'])
except Exception, d:
#print Exception, d
return False
@@ -913,33 +913,33 @@
#######################################
#######################################
-class MsgPersistentPut(_PMessageBase):
+class MsgPersistentPut(_MessageBase):
name = consts.ConstMessage.PersistentPut
- _additional_params_ = _PutParams
+ _additional_params_ = _AdditionalPutParams
_persistent_params_ = _PersistentParamsPut
_param_types_ = MsgClientPut._param_types_.copy()
_param_types_['Started'] = types.TypeBool
def _restoreParams(self, params):
- _PMessageBase._restoreParams(self, params)
+ _MessageBase._restoreParams(self, params)
try:
- _PMessageBase._setPersistentParams(self, self['ClientToken'])
+ _MessageBase._setPersistentParams(self, self['ClientToken'])
except Exception, d:
#print Exception, d
return False
return True
-class MsgPersistentPutDir(_PMessageBase):
+class MsgPersistentPutDir(_MessageBase):
name = consts.ConstMessage.PersistentPutDir
- _additional_params_ = _PutParams
+ _additional_params_ = _AdditionalPutParams
_persistent_params_ = _PersistentParamsPut
_param_types_ = MsgClientPutDiskDir._param_types_.copy()
_param_types_['Started'] = types.TypeBool
def _restoreParams(self, params):
- _PMessageBase._restoreParams(self, params)
+ _MessageBase._restoreParams(self, params)
for paramName, paramValue in self.params.items():
tmp_paramName = paramName.split('.')
@@ -949,14 +949,14 @@
self[paramName] = n
try:
- _PMessageBase._setPersistentParams(self, self['ClientToken'])
+ _MessageBase._setPersistentParams(self, self['ClientToken'])
except Exception, d:
#print Exception, d
return False
return True
-class MsgPersistentRequestModified(_PMessageBase):
+class MsgPersistentRequestModified(_MessageBase):
name = consts.ConstMessage.PersistentRequestModified
_additional_params_ = {}
_param_types_ = {
@@ -964,7 +964,7 @@
}
-class MsgPersistentRequestRemoved(_PMessageBase):
+class MsgPersistentRequestRemoved(_MessageBase):
name = consts.ConstMessage.PersistentRequestRemoved
_additional_params_ = {}
_param_types_ = {
@@ -972,14 +972,14 @@
}
-class MsgPluginInfo(_PMessageBase):
+class MsgPluginInfo(_MessageBase):
name = consts.ConstMessage.PluginInfo
_additional_params_ = {}
_param_types_ = {
}
-class MsgProtocolError(_PMessageBase):
+class MsgProtocolError(_MessageBase):
name = consts.ConstMessage.ProtocolError
_additional_params_ = {}
_param_types_ = {
@@ -989,7 +989,7 @@
-class MsgPutFailed(_PMessageBase):
+class MsgPutFailed(_MessageBase):
name = consts.ConstMessage.PutFailed
_additional_params_ = {}
_param_types_ = {
@@ -999,7 +999,7 @@
}
-class MsgPutFetchable(_PMessageBase):
+class MsgPutFetchable(_MessageBase):
name = consts.ConstMessage.PutFetchable
_additional_params_ = {}
_param_types_ = {
@@ -1011,7 +1011,7 @@
######################################
#!! not implemented
#TODO: has more params
-class MsgPutSuccessful(_PMessageBase):
+class MsgPutSuccessful(_MessageBase):
name = consts.ConstMessage.PutSuccessful
_additional_params_ = {}
_param_types_ = {
@@ -1020,14 +1020,14 @@
}
-class MsgRemovePeer(_PMessageBase):
+class MsgRemovePeer(_MessageBase):
name = consts.ConstMessage.RemovePeer
_additional_params_ = {}
_param_types_ = {
}
-class MsgRemoveRequest(_PMessageBase):
+class MsgRemoveRequest(_MessageBase):
name = consts.ConstMessage.RemoveRequest
_additional_params_ = {}
_param_types_ = {
@@ -1035,7 +1035,7 @@
}
-class MsgSSKKeypair(_PMessageBase):
+class MsgSSKKeypair(_MessageBase):
name = consts.ConstMessage. SSKKeypair
_additional_params_ = {}
_param_types_ = {
@@ -1044,14 +1044,14 @@
}
-class MsgShutdown(_PMessageBase):
+class MsgShutdown(_MessageBase):
name = consts.ConstMessage.Shutdown
_additional_params_ = {}
_param_types_ = {
}
-class MsgSimpleProgress(_PMessageBase):
+class MsgSimpleProgress(_MessageBase):
name = consts.ConstMessage.SimpleProgress
_additional_params_ = {}
_param_types_ = {
@@ -1064,14 +1064,14 @@
}
-class MsgStartedCompression(_PMessageBase):
+class MsgStartedCompression(_MessageBase):
name = consts.ConstMessage.StartedCompression
_additional_params_ = {}
_param_types_ = {
}
-class MsgSubscribeUSK(_PMessageBase):
+class MsgSubscribeUSK(_MessageBase):
name = consts.ConstMessage.SubscribeUSK
_additional_params_ = _SubscribeUSKParams
_param_types_ = {
@@ -1080,7 +1080,7 @@
}
-class MsgSubscribedUSKUpdate(_PMessageBase):
+class MsgSubscribedUSKUpdate(_MessageBase):
name = consts.ConstMessage.SubscribedUSKUpdate
_additional_params_ = {}
_param_types_ = {
@@ -1089,7 +1089,7 @@
}
-class MsgTestDDAComplete(_PMessageBase):
+class MsgTestDDAComplete(_MessageBase):
name = consts.ConstMessage.TestDDAComplete
_additional_params_ = {}
_param_types_ = {
@@ -1098,14 +1098,14 @@
}
-class MsgTestDDAReply(_PMessageBase):
+class MsgTestDDAReply(_MessageBase):
name = consts.ConstMessage.TestDDAReply
_additional_params_ = {}
_param_types_ = {
}
-class MsgTestDDARequest(_PMessageBase):
+class MsgTestDDARequest(_MessageBase):
name = consts.ConstMessage.TestDDARequest
_additional_params_ = {}
_param_types_ = {
@@ -1114,14 +1114,14 @@
}
-class MsgTestDDAResponse(_PMessageBase):
+class MsgTestDDAResponse(_MessageBase):
name = consts.ConstMessage.TestDDAResponse
_additional_params_ = {}
_param_types_ = {
}
-class MsgURIGenerated(_PMessageBase):
+class MsgURIGenerated(_MessageBase):
name = consts.ConstMessage.URIGenerated
_additional_params_ = {}
_param_types_ = {
@@ -1129,21 +1129,21 @@
}
-class MsgUnknownNodeIdentifier(_PMessageBase):
+class MsgUnknownNodeIdentifier(_MessageBase):
name = consts.ConstMessage.UnknownNodeIdentifier
_additional_params_ = {}
_param_types_ = {
}
-class MsgUnknownPeerNoteType(_PMessageBase):
+class MsgUnknownPeerNoteType(_MessageBase):
name = consts.ConstMessage.UnknownPeerNoteType
_additional_params_ = {}
_param_types_ = {
}
-class MsgWatchGlobal(_PMessageBase):
+class MsgWatchGlobal(_MessageBase):
name = consts.ConstMessage.WatchGlobal
_additional_params_ = {}
_param_types_ = {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
