Thread: SF.net SVN: fclient: [446] trunk/fcp2/src/fcp2/message.py
Status: Pre-Alpha
Brought to you by:
jurner
Menu
▾
▴
fclient-commit
|
From: <jU...@us...> - 2008-07-01 07:20:31
|
Revision: 446
http://fclient.svn.sourceforge.net/fclient/?rev=446&view=rev
Author: jUrner
Date: 2008-07-01 00:20:40 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
newMessageType() is now newMessageClass()
Modified Paths:
--------------
trunk/fcp2/src/fcp2/message.py
Modified: trunk/fcp2/src/fcp2/message.py
===================================================================
--- trunk/fcp2/src/fcp2/message.py 2008-07-01 06:48:53 UTC (rev 445)
+++ trunk/fcp2/src/fcp2/message.py 2008-07-01 07:20:40 UTC (rev 446)
@@ -551,8 +551,8 @@
#********************************************************************************
#
#********************************************************************************
-#TODO: do we need this?
-def newMessageType(name, paramTypes=None, additionalParams=None, persistentParams=None):
+def newMessageClass(name, paramTypes=None, additionalParams=None, persistentParams=None):
+ """creates a new message class"""
kws = {
'name': name,
'_additional_params_': {} if additionalParams is None else additionalParams,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jU...@us...> - 2008-07-01 11:27:32
|
Revision: 461
http://fclient.svn.sourceforge.net/fclient/?rev=461&view=rev
Author: jUrner
Date: 2008-07-01 04:27:41 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
for ease of use, all necessary symbols are now imported to main
Modified Paths:
--------------
trunk/fcp2/src/fcp2/message.py
Modified: trunk/fcp2/src/fcp2/message.py
===================================================================
--- trunk/fcp2/src/fcp2/message.py 2008-07-01 11:27:35 UTC (rev 460)
+++ trunk/fcp2/src/fcp2/message.py 2008-07-01 11:27:41 UTC (rev 461)
@@ -15,13 +15,14 @@
hack = _RelImportHack(2)
from fcp2 import consts
+from fcp2 import config
from fcp2 import types
from fcp2 import key
from fcp2.fcp_lib import node
from fcp2.fcp_lib import uuid
-del hack
+del hack, _RelImportHack
#<-- rel import hack
#********************************************************************************
# consts
@@ -32,20 +33,20 @@
#********************************************************************************
#
#********************************************************************************
-class Node(node.Node):
- """Node tree used along with messages"""
+class _Node(node.Node):
+ """_Node tree used along with messages"""
ComponentSep = '.'
#********************************************************************************
#
#********************************************************************************
-class PrivateParam(str):
- """Helper class to mark a message parameter as PrivateParam to the package"""
+class _PrivateParam(str):
+ """Helper class to mark a message parameter as _PrivateParam to the package"""
#********************************************************************************
#
#********************************************************************************
-class MessageMeta(type):
+class _PMessageMeta(type):
def __new__(klass, name, bases, kws):
newClass = type.__new__(klass, name, bases, kws)
@@ -58,7 +59,7 @@
#********************************************************************************
#
#********************************************************************************
-class MessageBase(object):
+class _PMessageBase(object):
"""Class wrapping a Fcp message
Sample use::
@@ -76,7 +77,7 @@
@ivar name: (str) message name
@ivar params: (dict) message params
"""
- __metaclass__ = MessageMeta
+ __metaclass__ = _PMessageMeta
name = ''
_additional_params_ = {}
@@ -123,7 +124,7 @@
"""Returns the message as nicely formated human readable string"""
out = ['', '>>' + self.name, ]
for param, value in self.params.items():
- if isinstance(param, PrivateParam):
+ if isinstance(param, _PrivateParam):
continue
# convert python to fcp value if necessary
@@ -145,7 +146,7 @@
"""Returns the message as formated string ready to be send"""
out = [self.name, ]
for param, value in self.params.items():
- if isinstance(param, PrivateParam):
+ if isinstance(param, _PrivateParam):
continue
# convert python to fcp value if necessary
@@ -165,12 +166,12 @@
def toTree(self):
"""Converts message params to a tree of nodes
- @return: (L{Node}) root node
+ @return: (L{_Node}) root node
@note: some messages have hirarchicaly organized (dotted) parameters. Use this
method to convert the parameters to a tree of nodes
"""
- node_ = Node()
+ node_ = _Node()
for name, value in self.params.iteritems():
node_[name] = value
@@ -213,211 +214,7 @@
def _getDataLength(self):
return 0
-
-#***************************************************************************************
-#
-# param types for config message
-#
-# ..bit more efford here, cos we need types for user input checking
-# ...a sloppy implementation of a dict should be enough
-#
-#***************************************************************************************
-class _ConfigMessageParamTypes(object):
- """Parameter --> FcpType mapping for config related messages
-
- @note: we use this instead of _param_types_ dict to handle param classes
- in L{ConfigData} and L{ModifyConfig}
- """
-
-
-
- # all known config keys (param class stripped)
- Params = {
-
- 'console.allowedHosts': types.FcpTypeIPList, # host names, single IPs CIDR-maskip IPs likee 192.168.0.0/24
- 'console.bindTo': types.FcpTypeIPList,
- 'console.directEnabled': types.FcpTypeBool,
- 'console.enabled': types.FcpTypeBool,
- 'console.port': types.FcpTypeIPort,
- 'console.ssl': types.FcpTypeBool,
-
- 'fcp.allowedHosts': types.FcpTypeIPList,
- 'fcp.allowedHostsFullAccess': types.FcpTypeIPList,
- 'fcp.assumeDownloadDDAIsAllowed': types.FcpTypeBool,
- 'fcp.assumeUploadDDAIsAllowed': types.FcpTypeBool,
- 'fcp.bindTo': types.FcpTypeIP,
- 'fcp.enabled': types.FcpTypeBool,
- 'fcp.persistentDownloadsEnabled': types.FcpTypeBool,
- 'fcp.persistentDownloadsFile': types.FcpTypeFilename,
- 'fcp.persistentDownloadsInterval': types.FcpTypeTimeDelta,
- 'fcp.port': types.FcpTypeIPort,
- 'fcp.ssl': types.FcpTypeBool,
-
- 'fproxy.CSSOverride': types.FcpTypeBool,
- 'fproxy.advancedModeEnabled': types.FcpTypeBool,
- 'fproxy.allowedHosts': types.FcpTypeIPList,
- 'fproxy.allowedHostsFullAccess': types.FcpTypeIPList,
- 'fproxy.bindTo': types.FcpTypeIPList,
- 'fproxy.css': types.FcpTypeChoiceFProxyCss,
- 'fproxy.doRobots': types.FcpTypeBool,
- 'fproxy.enabled': types.FcpTypeBool,
- 'fproxy.javascriptEnabled': types.FcpTypeBool,
- 'fproxy.port': types.FcpTypeIPort,
- 'fproxy.showPanicButton': types.FcpTypeBool,
- 'fproxy.ssl': types.FcpTypeBool,
-
- 'logger.dirname': types.FcpTypeDirname,
- 'logger.enabled': types.FcpTypeBool,
- 'logger.interval': types.FcpTypeTimeDelta,
- 'logger.maxCachedBytes': types.FcpTypeByteAmount,
- 'logger.maxCachedLines': types.FcpTypeByteAmount, # ???
- 'logger.maxZippedLogsSize': types.FcpTypeByteAmount, # ???
- 'logger.priority': types.FcpTypeChoiceLoggerPriority,
- 'logger.priorityDetail': types.FcpType, # ???? is it Detailed priority thresholds ???
-
- 'node.alwaysAllowLocalAddresses': types.FcpTypeBool,
- 'node.assumeNATed': types.FcpTypeBool,
- 'node.bindTo': types.FcpTypeIP,
- 'node.clientThrottleFile': types.FcpTypeFilename,
- 'node.databaseMaxMemory': types.FcpTypeByteAmount,
- 'node.disableHangCheckers': types.FcpTypeBool,
- 'node.disableProbabilisticHTLs': types.FcpTypeBool,
- 'node.downloadAllowedDirs': types.FcpTypeChoiceNodeDownloadAllowedDirs,
- 'node.downloadsDir': types.FcpTypeDirname,
- 'node.enableARKs': types.FcpTypeBool,
- 'node.enablePacketCoalescing': types.FcpTypeBool,
- 'node.enablePerNodeFailureTables': types.FcpTypeBool,
- 'node.enableSwapping': types.FcpTypeBool,
- 'node.enableSwapQueueing': types.FcpTypeBool,
- 'node.enableULPRDataPropagation': types.FcpTypeBool,
- 'node.extraPeerDataDir': types.FcpTypeDirname,
- 'node.includeLocalAddressesInNoderefs': types.FcpTypeBool,
- 'node.inputBandwidthLimit': types.FcpTypeByteAmount, # -1 is possible as value aswell
- 'node.ipAddressOverride': types.FcpTypeIP,
- 'node.l10n': types.FcpType, # ???
- 'node.lazyResume': types.FcpTypeBool,
- 'node.listenPort': types.FcpTypeIPort,
- 'node.maxBackgroundUSKFetchers': types.FcpTypeIntWithBounds(0, None),
- 'node.maxHTL': types.FcpTypeIntWithBounds(0, None),
- 'node.name': types.FcpTypeString,
- 'node.nodeDir': types.FcpTypeDirname,
- 'node.oneConnectionPerIP': types.FcpTypeBool,
- 'node.outputBandwidthLimit': types.FcpTypeByteAmount,
- 'node.passOpennetPeersThroughDarknet': types.FcpTypeBool,
- 'node.persistentTempDir': types.FcpTypeDirname,
- 'node.storeDir': types.FcpTypeDirname,
- 'node.storeForceBigShrinks': types.FcpTypeBool,
- 'node.storeSize': types.FcpTypeByteAmount,
- 'node.storeType': types.FcpTypeString,
- 'node.tempDir': types.FcpTypeDirname,
- 'node.tempIPAddressHint': types.FcpTypeIP, # ???
- 'node.testingDropPacketsEvery': types.FcpTypeIntWithBounds(0, None),
- 'node.uploadAllowedDirs': types.FcpTypeChoiceNodeDownloadAllowedDirs,
-
- 'node.testnet.enabled': types.FcpTypeBool,
-
- 'node.load.aggressiveGC': types.FcpType, # ???
- 'node.load.freeHeapBytesThreshold': types.FcpTypeByteAmount,
- 'node.load.freeHeapPercentThreshold': types.FcpTypePercent,
- 'node.load.memoryChecker': types.FcpTypeBool,
- 'node.load.nodeThrottleFile': types.FcpTypeFilename,
- 'node.load.threadLimit': types.FcpTypeIntWithBounds(0, None),
-
- 'node.opennet.acceptSeedConnections': types.FcpTypeBool,
- 'node.opennet.alwaysAllowLocalAddresses': types.FcpTypeBool,
- 'node.opennet.assumeNATed': types.FcpTypeBool,
- 'node.opennet.bindTo': types.FcpTypeIP,
- 'node.opennet.enabled': types.FcpTypeBool,
- 'node.opennet.listenPort': types.FcpTypeIPort,
- 'node.opennet.maxOpennetPeers': types.FcpTypeIntWithBounds(0, None),
- 'node.opennet.oneConnectionPerIP': types.FcpTypeBool,
- 'node.opennet.testingDropPacketsEvery': types.FcpTypeIntWithBounds(0, None),
-
- 'node.scheduler.CHKinserter_priority_policy': types.FcpTypeChoicePriorityPolicy,
- 'node.scheduler.CHKrequester_priority_policy': types.FcpTypeChoicePriorityPolicy,
- 'node.scheduler.SSKinserter_priority_policy': types.FcpTypeChoicePriorityPolicy,
- 'node.scheduler.SSKrequester_priority_policy': types.FcpTypeChoicePriorityPolicy,
-
- 'node.updater.URI': key.FcpTypeKey,
- 'node.updater.autoupdate': types.FcpTypeBool,
- 'node.updater.enabled': types.FcpTypeBool,
- 'node.updater.extURI': key.FcpTypeKey,
- 'node.updater.revocationURI': key.FcpTypeKey,
-
- 'pluginmanager.loadplugin': types.FcpTypeStringList,
- 'pluginmanager2.loadedPlugins': types.FcpTypeStringList,
-
- 'ssl.sslEnable': types.FcpTypeBool,
- 'ssl.sslKeyPass': types.FcpTypeString,
- 'ssl.sslKeyStore': types.FcpTypeFilename,
- 'ssl.sslKeyStorePass': types.FcpTypeString,
- 'ssl.sslVersion': types.FcpTypeChoiceSSLVersion,
-
- 'toadletsymlinker.symlinks': types.FcpTypeStringList,
- }
-
- def __init__(self):
- pass
-
- def splitAll(self, paramName):
- """Splits a parameter name into its components
- @param paramName: (str) parameter name to split
- @return: (list) components
- """
- return paramName.split(consts.ConfigKeySep)
-
-
- def splitParamClass(self, paramName):
- """Splits the parameter class from a parameter name
- @param paramName: (str) parameter name to split
- @return: (tuple) paramClass, tail
- """
- result = paramName.split(consts.ConfigKeySep, 1)
- if len(result) == 2:
- if result[0] in consts.ConfigValueClass.ClassesAll:
- return result
- return '', paramName
-
-
- def get(self, paramName, default=None):
- """Returns the type of a parameter or default
- @param paramName: (str) name of the parameter to retuen the type for
- @return: (FcpType)
- """
- try:
- return self[paramName]
- except KeyError:
- return default
-
-
- def __getitem__(self, paramName):
- """Returns the type of a parameter
- @param paramName: (str) name of the parameter to retuen the type for
- @return: (FcpType)
- """
- paramClass, paramKey = self.splitParamClass(paramName)
- if paramClass == consts.ConfigValueClass.Current or paramClass == '':
- return self.Params[paramKey]
- elif paramClass == consts.ConfigValueClass.Default:
- return self.Params[paramKey]
- elif paramClass == consts.ConfigValueClass.ExpertFlag:
- return types.FcpTypeBool
- elif paramClass == consts.ConfigValueClass.ForceWriteFlag:
- return types.FcpTypeBool
- elif paramClass == consts.ConfigValueClass.ShortDescription:
- return types.FcpTypeString
- elif paramClass == consts.ConfigValueClass.LongDescription:
- return types.FcpTypeString
- elif paramClass == consts.ConfigValueClass.SortOrder:
- return types.FcpTypeInt
- elif paramClass == consts.ConfigValueClass.DataType:
- return types.FcpTypeString
- else:
- raise ValueError('Unknown param class in: %r' % paramName)
-
-ConfigMessageParamTypes = _ConfigMessageParamTypes()
-
#********************************************************************************
# at runtime we store a few additional params in msg.params
#
@@ -425,88 +222,88 @@
# as private so they don't get send to the node
#
#********************************************************************************
-AdditionalGetParams = {
+_GetParams = {
# persistent params that will go into identifier
- PrivateParam('RequestType'): consts.RequestType.Null, # identifies sub message types
- PrivateParam('InitTime'): 0, # when was the request started?
- PrivateParam('FilenameCollision'): consts.FilenameCollision.HandleNever, # handle fielanem collisions?
- PrivateParam('PersistentUserData'): '', # any user defined persistent data
+ _PrivateParam('RequestType'): consts.ConstRequestType.Null, # identifies sub message types
+ _PrivateParam('InitTime'): 0, # when was the request started?
+ _PrivateParam('FilenameCollision'): consts.ConstFilenameCollision.HandleNever, # handle fielanem collisions?
+ _PrivateParam('PersistentUserData'): '', # any user defined persistent data
# non persistent params
- PrivateParam('RequestStatus'): consts.RequestStatus.Null,
- PrivateParam('ErrorMessage'): None, # error message in case an error occured
- PrivateParam('UserData'): None, # any user defined runtime data here
+ _PrivateParam('RequestStatus'): consts.ConstRequestStatus.Null,
+ _PrivateParam('ErrorMessage'): None, # error message in case an error occured
+ _PrivateParam('UserData'): None, # any user defined runtime data here
# params from DataFound
- PrivateParam('MetadataContentType'): '', # content type
- PrivateParam('MetadataSize'): 0, # content size
+ _PrivateParam('MetadataContentType'): '', # content type
+ _PrivateParam('MetadataSize'): 0, # content size
# params from PersistentRequestModified
- PrivateParam('Modified'): {},
+ _PrivateParam('Modified'): {},
# params for DDA test
- PrivateParam('TestDDA'): {},
+ _PrivateParam('TestDDA'): {},
# params for SimpleProgress
- PrivateParam('ProgressTotal'): 0,
- PrivateParam('ProgressRequired'): 0,
- PrivateParam('ProgressFailed'): 0,
- PrivateParam('ProgressFatalyFailed'): 0,
- PrivateParam('ProgressSucceeeded'): 0,
+ _PrivateParam('ProgressTotal'): 0,
+ _PrivateParam('ProgressRequired'): 0,
+ _PrivateParam('ProgressFailed'): 0,
+ _PrivateParam('ProgressFatalyFailed'): 0,
+ _PrivateParam('ProgressSucceeeded'): 0,
}
-AdditionalPutParams = {
+_PutParams = {
# persistent params that will go into identifier
- PrivateParam('RequestType'): consts.RequestType.Null, # identifies sub message types
- PrivateParam('InitTime'): 0, # when was the request started?
+ _PrivateParam('RequestType'): consts.ConstRequestType.Null, # identifies sub message types
+ _PrivateParam('InitTime'): 0, # when was the request started?
#TODO: not really necessary, but we need it for persistent params
- PrivateParam('PersistentUserData'): '', # any user defined persistent data
+ _PrivateParam('PersistentUserData'): '', # any user defined persistent data
# non persistent params
- PrivateParam('RequestStatus'): consts.RequestStatus.Null,
- PrivateParam('ErrorMessage'): None, # error message in case an error occured
- PrivateParam('UserData'): None, # any user defined runtime data here
+ _PrivateParam('RequestStatus'): consts.ConstRequestStatus.Null,
+ _PrivateParam('ErrorMessage'): None, # error message in case an error occured
+ _PrivateParam('UserData'): None, # any user defined runtime data here
# params from DataFound
- PrivateParam('MetadataContentType'): '', # contecnt type
- PrivateParam('MetadataSize'): 0, # content size
+ _PrivateParam('MetadataContentType'): '', # contecnt type
+ _PrivateParam('MetadataSize'): 0, # content size
# params from PersistentRequestModified
- PrivateParam('Modified'): {},
+ _PrivateParam('Modified'): {},
# params for DDA test
- PrivateParam('TestDDA'): {},
+ _PrivateParam('TestDDA'): {},
# params for SimpleProgress
- PrivateParam('ProgressTotal'): 0,
- PrivateParam('ProgressRequired'): 0,
- PrivateParam('ProgressFailed'): 0,
- PrivateParam('ProgressFatalyFailed'): 0,
- PrivateParam('ProgressSucceeeded'): 0,
+ _PrivateParam('ProgressTotal'): 0,
+ _PrivateParam('ProgressRequired'): 0,
+ _PrivateParam('ProgressFailed'): 0,
+ _PrivateParam('ProgressFatalyFailed'): 0,
+ _PrivateParam('ProgressSucceeeded'): 0,
}
-AdditionalGenerateSSKParams = {
- PrivateParam('RequestType'): consts.RequestType.Null, # identifies sub message types
- PrivateParam('RequestStatus'): consts.RequestStatus.Null,
- PrivateParam('InitTime'): 0, # when was the request started?
+_GenerateSSKParams = {
+ _PrivateParam('RequestType'): consts.ConstRequestType.Null, # identifies sub message types
+ _PrivateParam('RequestStatus'): consts.ConstRequestStatus.Null,
+ _PrivateParam('InitTime'): 0, # when was the request started?
}
-AdditionalSubscribeUSKParams = {
- PrivateParam('RequestType'): consts.RequestType.Null, # identifies sub message types
- PrivateParam('RequestStatus'): consts.RequestStatus.Null,
- PrivateParam('InitTime'): 0, # when was the request started?
- PrivateParam('UserData'): None,
- PrivateParam('Edition'): -1,
+_SubscribeUSKParams = {
+ _PrivateParam('RequestType'): consts.ConstRequestType.Null, # identifies sub message types
+ _PrivateParam('RequestStatus'): consts.ConstRequestStatus.Null,
+ _PrivateParam('InitTime'): 0, # when was the request started?
+ _PrivateParam('UserData'): None,
+ _PrivateParam('Edition'): -1,
}
-AdditionalPluginInfoParams = {
- PrivateParam('RequestType'): consts.RequestType.Null, # identifies sub message types
- PrivateParam('RequestStatus'): consts.RequestStatus.Null,
- PrivateParam('InitTime'): 0, # when was the request started?
+_PluginInfoParams = {
+ _PrivateParam('RequestType'): consts.ConstRequestType.Null, # identifies sub message types
+ _PrivateParam('RequestStatus'): consts.ConstRequestStatus.Null,
+ _PrivateParam('InitTime'): 0, # when was the request started?
}
#********************************************************************************
@@ -515,7 +312,7 @@
# these params are stored in ClientToken
#
#********************************************************************************
-PersistentParamsGet = (
+_PersistentParamsGet = (
(
lambda msg: str(msg.__getitem__('RequestType')),
lambda msg, value: msg.__setitem__('RequestType', int(value)),
@@ -534,7 +331,7 @@
),
)
-PersistentParamsPut = (
+_PersistentParamsPut = (
(
lambda msg: str(msg.__getitem__('RequestType')),
lambda msg, value: msg.__setitem__('RequestType', int(value)),
@@ -559,27 +356,27 @@
'_persistent_params_': () if persistentParams is None else persistentParams,
'_param_types_': {} if paramTypes is None else paramTypes,
}
- return type(name, (MessageBase, ), kws)
+ return type(name, (_PMessageBase, ), kws)
#********************************************************************************
# some messages defined by the client
#********************************************************************************
-class ClientDisconnected(MessageBase):
- name = consts.Message.ClientDisconnected
+class MsgClientDisconnected(_PMessageBase):
+ name = consts.ConstMessage.ClientDisconnected
_additional_params_ = {}
_param_types_ = {
- 'DisconnectReason': types.FcpTypeInt,
+ 'DisconnectReason': types.TypeInt,
}
-class ClientSocketDied(MessageBase):
- name = consts.Message.ClientSocketDied
+class MsgClientSocketDied(_PMessageBase):
+ name = consts.ConstMessage.ClientSocketDied
_additional_params_ = {}
_param_types_ = {
}
-class ClientSocketTimeout(MessageBase):
- name = consts.Message.ClientSocketTimeout
+class MsgClientSocketTimeout(_PMessageBase):
+ name = consts.ConstMessage.ClientSocketTimeout
_additional_params_ = {}
_param_types_ = {
}
@@ -587,33 +384,33 @@
#********************************************************************************
# fcp messages
#********************************************************************************
-class AddPeer(MessageBase):
- name = consts.Message.AddPeer
+class MsgAddPeer(_PMessageBase):
+ name = consts.ConstMessage.AddPeer
_additional_params_ = {}
_param_types_ = {
- 'ark.number': types.FcpTypeInt,
- 'auth.negTypes': types.FcpTypeInt,
- 'ark.pubURI': key.FcpTypeKey,
+ 'ark.number': types.TypeInt,
+ 'auth.negTypes': types.TypeInt,
+ 'ark.pubURI': key.TypeKey,
- 'location': types.FcpTypeFloat,
- 'opennet': types.FcpTypeBool,
- 'testnet': types.FcpTypeBool,
+ 'location': types.TypeFloat,
+ 'opennet': types.TypeBool,
+ 'testnet': types.TypeBool,
# passed in Peer message
- 'metadata.timeLastConnected': types.FcpTypeTime,
- 'metadata.timeLastReceivedPacket': types.FcpTypeTime,
- 'metadata.timeLastRoutable': types.FcpTypeTime,
- 'metadata.timeLastSuccess': types.FcpTypeTime,
- 'metadata.routableConnectionCheckCount': types.FcpTypeInt,
- 'metadata.hadRoutableConnectionCount': types.FcpTypeInt,
+ 'metadata.timeLastConnected': types.TypeTime,
+ 'metadata.timeLastReceivedPacket': types.TypeTime,
+ 'metadata.timeLastRoutable': types.TypeTime,
+ 'metadata.timeLastSuccess': types.TypeTime,
+ 'metadata.routableConnectionCheckCount': types.TypeInt,
+ 'metadata.hadRoutableConnectionCount': types.TypeInt,
- 'volatile.averagePingTime': types.FcpTypeFloat,
- 'volatile.overloadProbability': types.FcpTypePercent,
- 'volatile.routingBackoff': types.FcpTypeInt,
- 'volatile.routingBackoffPercent': types.FcpTypePercent,
- 'volatile.totalBytesIn': types.FcpTypeInt,
- 'volatile.totalBytesOut': types.FcpTypeInt,
- 'volatile.routingBackoffLength': types.FcpTypeInt,
+ 'volatile.averagePingTime': types.TypeFloat,
+ 'volatile.overloadProbability': types.TypePercent,
+ 'volatile.routingBackoff': types.TypeInt,
+ 'volatile.routingBackoffPercent': types.TypePercent,
+ 'volatile.totalBytesIn': types.TypeInt,
+ 'volatile.totalBytesOut': types.TypeInt,
+ 'volatile.routingBackoffLength': types.TypeInt,
}
'''all other Peer message params here....
@@ -635,104 +432,104 @@
'''
-class AllData(MessageBase):
- name = consts.Message.AllData
+class MsgAllData(_PMessageBase):
+ name = consts.ConstMessage.AllData
_additional_params_ = {}
_param_types_ = {
- 'DataLength': types.FcpTypeInt,
- 'Global': types.FcpTypeBool,
+ 'DataLength': types.TypeInt,
+ 'Global': types.TypeBool,
}
def _getDataLength(self):
return self['DataLength']
-class ClientGet(MessageBase):
- name = consts.Message.ClientGet
- _additional_params_ = AdditionalGetParams
- _persistent_params_ = PersistentParamsGet
+class MsgClientGet(_PMessageBase):
+ name = consts.ConstMessage.ClientGet
+ _additional_params_ = _GetParams
+ _persistent_params_ = _PersistentParamsGet
_param_types_ = {
- 'BinaryBlob': types.FcpTypeBool,
- 'DSOnly': types.FcpTypeBool,
- 'Global': types.FcpTypeBool,
- 'IgnoreDS': types.FcpTypeBool,
- 'MaxRetries': types.FcpTypeInt,
- 'MaxSize': types.FcpTypeInt,
- 'MaxTempSize': types.FcpTypeInt,
- 'URI': key.FcpTypeKey,
- 'Verbosity': types.FcpTypeInt,
+ 'BinaryBlob': types.TypeBool,
+ 'DSOnly': types.TypeBool,
+ 'Global': types.TypeBool,
+ 'IgnoreDS': types.TypeBool,
+ 'MaxRetries': types.TypeInt,
+ 'MaxSize': types.TypeInt,
+ 'MaxTempSize': types.TypeInt,
+ 'URI': key.TypeKey,
+ 'Verbosity': types.TypeInt,
}
def _restoreParams(self, params):
- MessageBase._restoreParams(self, params)
+ _PMessageBase._restoreParams(self, params)
try:
- MessageBase._setPersistentParams(self, self['ClientToken'])
+ _PMessageBase._setPersistentParams(self, self['ClientToken'])
except Exception, d:
#print Exception, d
return False
return True
def updatePersistentParams(self):
- self['ClientToken'] = MessageBase._getPersistentParams(self)
+ self['ClientToken'] = _PMessageBase._getPersistentParams(self)
-class ClientHello(MessageBase):
- name = consts.Message.ClientHello
+class MsgClientHello(_PMessageBase):
+ name = consts.ConstMessage.ClientHello
_additional_params_ = {}
_param_types_ = {
- 'ExpectedVersion': types.FcpTypeFloat,
+ 'ExpectedVersion': types.TypeFloat,
}
-class ClientPut(MessageBase):
- name = consts.Message.ClientPut
- _additional_params_ = AdditionalPutParams
- _persistent_params_ = PersistentParamsPut
+class MsgClientPut(_PMessageBase):
+ name = consts.ConstMessage.ClientPut
+ _additional_params_ = _PutParams
+ _persistent_params_ = _PersistentParamsPut
_param_types_ = {
- 'BinaryBlob': types.FcpTypeBool,
- 'DataLength': types.FcpTypeInt,
- 'DontCompress': types.FcpTypeBool,
- 'EarlyEncode': types.FcpTypeBool,
- 'GetCHKOnly': types.FcpTypeBool,
- 'Global': types.FcpTypeBool,
- 'MaxRetries': types.FcpTypeInt,
- 'URI': key.FcpTypeKey,
- 'Verbosity': types.FcpTypeInt,
+ 'BinaryBlob': types.TypeBool,
+ 'DataLength': types.TypeInt,
+ 'DontCompress': types.TypeBool,
+ 'EarlyEncode': types.TypeBool,
+ 'GetCHKOnly': types.TypeBool,
+ 'Global': types.TypeBool,
+ 'MaxRetries': types.TypeInt,
+ 'URI': key.TypeKey,
+ 'Verbosity': types.TypeInt,
}
def _getDataLength(self):
return self['DataLength']
def _restoreParams(self, params):
- MessageBase._restoreParams(self, params)
+ _PMessageBase._restoreParams(self, params)
try:
- MessageBase._setPersistentParams(self, self['ClientToken'])
+ _PMessageBase._setPersistentParams(self, self['ClientToken'])
except Exception, d:
#print Exception, d
return False
return True
def updatePersistentParams(self):
- self['ClientToken'] = MessageBase._getPersistentParams(self)
+ self['ClientToken'] = _PMessageBase._getPersistentParams(self)
-class ClientPutComplexDir(ClientPut):
- name = consts.Message.ClientPutComplexDir
+class MsgClientPutComplexDir(MsgClientPut):
+ name = consts.ConstMessage.ClientPutComplexDir
def __init__(self, *args, **kwargs):
- ClientPut.__init__(self, *args, **kwargs)
+ MsgClientPut.__init__(self, *args, **kwargs)
self._dataLength = 0
def _restoreParams(self, params):
- result = ClientPut._restoreParams(self, params)
+ result = MsgClientPut._restoreParams(self, params)
for paramName, paramValue in self.params.items():
tmp_paramName = paramName.split('.')
if len(tmp_paramName) == 3:
if tmp_paramName[-1] == 'DataLength':
- n = types.FcpTypeInt.fcpToPython(paramValue)
+ n = types.TypeInt.fcpToPython(paramValue)
self._dataLength += n
self[paramName] = n
return result
@@ -743,302 +540,302 @@
-class ClientPutDiskDir(ClientPut):
- name = consts.Message.ClientPutDiskDir
+class MsgClientPutDiskDir(MsgClientPut):
+ name = consts.ConstMessage.ClientPutDiskDir
-class CloseConnectionDuplicateClientName(MessageBase):
- name = consts.Message.CloseConnectionDuplicateClientName
+class MsgCloseConnectionDuplicateClientName(_PMessageBase):
+ name = consts.ConstMessage.CloseConnectionDuplicateClientName
_additional_params_ = {}
_param_types_ = {
}
#########################################
#########################################
-class ConfigData(MessageBase):
- name = consts.Message.ConfigData
+class MsgConfigData(_PMessageBase):
+ name = consts.ConstMessage.ConfigData
_additional_params_ = {}
- _param_types_ = ConfigMessageParamTypes
+ _param_types_ = config._ConfigMessageParamTypes
-class DataFound(MessageBase):
- name = consts.Message.DataFound
+class MsgDataFound(_PMessageBase):
+ name = consts.ConstMessage.DataFound
_additional_params_ = {}
_param_types_ = {
- 'DataLength': types.FcpTypeInt,
- 'Global': types.FcpTypeBool,
+ 'DataLength': types.TypeInt,
+ 'Global': types.TypeBool,
}
-class EndListPeerNotes(MessageBase):
- name = consts.Message.EndListPeerNotes
+class MsgEndListPeerNotes(_PMessageBase):
+ name = consts.ConstMessage.EndListPeerNotes
_additional_params_ = {}
_param_types_ = {
}
-class EndListPeers(MessageBase):
- name = consts.Message.EndListPeers
+class MsgEndListPeers(_PMessageBase):
+ name = consts.ConstMessage.EndListPeers
_additional_params_ = {}
_param_types_ = {
}
-class EndListPersistentRequests(MessageBase):
- name = consts.Message.EndListPersistentRequests
+class MsgEndListPersistentRequests(_PMessageBase):
+ name = consts.ConstMessage.EndListPersistentRequests
_additional_params_ = {}
_param_types_ = {
}
-class FCPPluginMessage(MessageBase):
- name = consts.Message.FCPPluginMessage
+class MsgFCPPluginMessage(_PMessageBase):
+ name = consts.ConstMessage.FCPPluginMessage
_additional_params_ = {}
_param_types_ = {
}
-class FCPPluginReply(MessageBase):
- name = consts.Message.FCPPluginReply
+class MsgFCPPluginReply(_PMessageBase):
+ name = consts.ConstMessage.FCPPluginReply
_additional_params_ = {}
_param_types_ = {
- 'DataLength': types.FcpTypeInt,
+ 'DataLength': types.TypeInt,
}
-class FinishedCompression(MessageBase):
- name = consts.Message.FinishedCompression
+class MsgFinishedCompression(_PMessageBase):
+ name = consts.ConstMessage.FinishedCompression
_additional_params_ = {}
_param_types_ = {
- 'CompressedSize': types.FcpTypeInt,
- 'OriginalSize': types.FcpTypeInt,
+ 'CompressedSize': types.TypeInt,
+ 'OriginalSize': types.TypeInt,
}
-class GenerateSSK(MessageBase):
- name = consts.Message.GenerateSSK
- _additional_params_ = AdditionalGenerateSSKParams
+class MsgGenerateSSK(_PMessageBase):
+ name = consts.ConstMessage.GenerateSSK
+ _additional_params_ = _GenerateSSKParams
_param_types_ = {
}
-class GetConfig(MessageBase):
- name = consts.Message.GetConfig
+class MsgGetConfig(_PMessageBase):
+ name = consts.ConstMessage.GetConfig
_additional_params_ = {}
_param_types_ =...
[truncated message content] |
|
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.
|
|
From: <jU...@us...> - 2008-07-01 18:42:21
|
Revision: 475
http://fclient.svn.sourceforge.net/fclient/?rev=475&view=rev
Author: jUrner
Date: 2008-07-01 11:41:38 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
superfluous import
Modified Paths:
--------------
trunk/fcp2/src/fcp2/message.py
Modified: trunk/fcp2/src/fcp2/message.py
===================================================================
--- trunk/fcp2/src/fcp2/message.py 2008-07-01 18:39:17 UTC (rev 474)
+++ trunk/fcp2/src/fcp2/message.py 2008-07-01 18:41:38 UTC (rev 475)
@@ -19,7 +19,6 @@
from fcp2 import types
from fcp2 import key
from fcp2.fcp_lib import node
-from fcp2.fcp_lib import uuid
del hack, _RelImportHack
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jU...@us...> - 2008-07-04 08:27:26
|
Revision: 491
http://fclient.svn.sourceforge.net/fclient/?rev=491&view=rev
Author: jUrner
Date: 2008-07-04 01:27:35 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
new message
Modified Paths:
--------------
trunk/fcp2/src/fcp2/message.py
Modified: trunk/fcp2/src/fcp2/message.py
===================================================================
--- trunk/fcp2/src/fcp2/message.py 2008-07-04 08:27:01 UTC (rev 490)
+++ trunk/fcp2/src/fcp2/message.py 2008-07-04 08:27:35 UTC (rev 491)
@@ -1079,6 +1079,15 @@
}
+class MsgSubscribedUSK(_MessageBase):
+ name = consts.ConstMessage.SubscribedUSK
+ _additional_params_ = _SubscribeUSKParams
+ _param_types_ = {
+ 'DontPoll': types.TypeBool,
+ 'URI': key.TypeKey,
+ }
+
+
class MsgSubscribedUSKUpdate(_MessageBase):
name = consts.ConstMessage.SubscribedUSKUpdate
_additional_params_ = {}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jU...@us...> - 2008-07-05 12:42:10
|
Revision: 503
http://fclient.svn.sourceforge.net/fclient/?rev=503&view=rev
Author: jUrner
Date: 2008-07-05 05:42:19 -0700 (Sat, 05 Jul 2008)
Log Message:
-----------
some more docs
beautification
some more message params
Modified Paths:
--------------
trunk/fcp2/src/fcp2/message.py
Modified: trunk/fcp2/src/fcp2/message.py
===================================================================
--- trunk/fcp2/src/fcp2/message.py 2008-07-05 12:03:40 UTC (rev 502)
+++ trunk/fcp2/src/fcp2/message.py 2008-07-05 12:42:19 UTC (rev 503)
@@ -179,12 +179,10 @@
pass
- #TODO:
- # 1. if one setter / getter fails no setter / getter result should assumed to be valid
- # 2. log errors
- #
- #
def _setPersistentParams(self, persistentData):
+ """updates message with persisten params
+ @param persistentData: (str)
+ """
params = persistentData.split(PersistentParamsSep)
if len(params) > len(self._persistent_params_):
raise ValueError('Too many parameters in persistentData')
@@ -195,6 +193,9 @@
def _getPersistentParams(self):
+ """retrieves persisten params from the message
+ @return: (str) persistent params
+ """
out = []
for n, (getter, setter) in enumerate(self._persistent_params_):
#TODO: check if PersistentParamsSep is in data returned
@@ -203,6 +204,10 @@
def _restoreParams(self, params):
+ """updates the message with mesasage params
+ @param params: (dict) containing message params
+ @note: the parameter values will be converted to python types in the call
+ """
for paramName, paramValue in params.items():
paramType = self._param_types_.get(paramName, None)
if paramType is not None:
@@ -212,6 +217,8 @@
def _getDataLength(self):
+ """returns the length of the data section attatched to the message
+ @return: (int) length"""
return 0
#********************************************************************************
@@ -549,8 +556,7 @@
_param_types_ = {
}
-#########################################
-#########################################
+
class MsgConfigData(_MessageBase):
name = consts.ConstMessage.ConfigData
_additional_params_ = {}
@@ -713,15 +719,13 @@
_param_types_ = {
}
-#####################################
-#####################################
+
class MsgModifyConfig(_MessageBase):
name = consts.ConstMessage.ModifyConfig
_additional_params_ = {}
_param_types_ = config._ConfigMessageParamTypes
-#####################################
-#####################################
+
class MsgModifyPeer(_MessageBase):
name = consts.ConstMessage.ModifyPeer
_additional_params_ = {}
@@ -744,8 +748,7 @@
'Global': types.TypeBool,
}
-###################################
-###################################
+
class MsgNodeData(_MessageBase):
name = consts.ConstMessage.NodeData
_additional_params_ = {}
@@ -870,8 +873,7 @@
'Testnet': types.TypeBool,
}
-#######################################
-#######################################
+
class MsgPeer(_MessageBase):
name = consts.ConstMessage.Peer
_additional_params_ = {}
@@ -892,8 +894,7 @@
_param_types_ = {
}
-#######################################
-#######################################
+
class MsgPersistentGet(_MessageBase):
name = consts.ConstMessage.PersistentGet
_additional_params_ = _AdditionalGetParams
@@ -910,8 +911,7 @@
return False
return True
-#######################################
-#######################################
+
class MsgPersistentPut(_MessageBase):
name = consts.ConstMessage.PersistentPut
_additional_params_ = _AdditionalPutParams
@@ -1006,15 +1006,14 @@
'URI': key.TypeKey,
}
-#####################################
-######################################
-#!! not implemented
-#TODO: has more params
+
class MsgPutSuccessful(_MessageBase):
name = consts.ConstMessage.PutSuccessful
_additional_params_ = {}
_param_types_ = {
+ 'CompletionTime': types.TypeTime,
'Global': types.TypeBool,
+ 'StartupTime': types.TypeTime,
'URI': key.TypeKey,
}
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