More custom format fixes for samples and deviceCli

durera · durera · commit 4f97e62a1b08 · 2015-06-30T16:00:34.000+01:00
diff --git a/samples/psutil/iotpsutil.py b/samples/psutil/iotpsutil.py
@@ -59,7 +59,7 @@ def usage():
 
 def commandProcessor(cmd):
 	global interval
-	print("Command received: %s" % cmd.payload)
+	print("Command received: %s" % cmd.data)
 	if cmd.command == "setInterval":
 		if 'interval' not in cmd.data:
 			print("Error - command is missing required information: 'interval'")
diff --git a/samples/psutil/psutilApp.py b/samples/psutil/psutilApp.py
@@ -109,7 +109,7 @@ def sendMessage():
 	global client, deviceType, deviceId
 	message = input("Enter message to be displayed >")
 	print("")
-	client.publishCommand(deviceType, deviceId, "print", {'message': message})
+	client.publishCommand(deviceType, deviceId, "print", "json", {'message': message})
 
 
 if __name__ == "__main__":
diff --git a/src/ibmiotf/__init__.py b/src/ibmiotf/__init__.py
@@ -29,7 +29,7 @@
 __version__ = "0.1.2"
 
 class Message:
-	def __init__(self, data, timestamp):
+	def __init__(self, data, timestamp=None):
 		self.data = data
 		self.timestamp = timestamp
 	
@@ -46,25 +46,25 @@ def __init__(self, organization, clientId, username, password, logDir=None):
 		
 		self.messages = 0
 		self.recv = 0
-
+		
 		self.clientId = clientId
 		
 		# Configure logging
 		self.logDir = logDir
 		
 		self.logger = logging.getLogger(self.__module__+"."+self.__class__.__name__)
 		self.logger.setLevel(logging.INFO)
-
+		
 		logFileName = '%s.log' % (clientId.replace(":", "_"))
 		self.logFile = os.path.join(self.logDir, logFileName) if (self.logDir is not None) else logFileName 
-
+		
 		# create file handler, set level to debug & set format
 		fhFormatter = logging.Formatter('%(asctime)-25s %(name)-25s ' + ' %(levelname)-7s %(message)s')
 		rfh = RotatingFileHandler(self.logFile, mode='a', maxBytes=1024000 , backupCount=0, encoding=None, delay=True)
 		rfh.setFormatter(fhFormatter)
 		
 		self.logger.addHandler(rfh)
-
+		
 		self.client = paho.Client(self.clientId, clean_session=True)
 		
 		try:
@@ -88,21 +88,22 @@ def __init__(self, organization, clientId, username, password, logDir=None):
 			else:
 				self.logger.warning("Unable to encrypt messages because TLSv1.2 is unavailable (MQTT over SSL requires at least Python v2.7.9 or 3.4 and openssl v1.0.1)")
 			self.client.username_pw_set(self.username, self.password)
-			
-		#attach MQTT callbacks
+		
+		# Attach MQTT callbacks
 		self.client.on_log = self.on_log
 		self.client.on_connect = self.on_connect
 		self.client.on_disconnect = self.on_disconnect
 		self.client.on_publish = self.on_publish
-
+		
 		# Initialize default message encoders and decoders.
 		self.messageEncoderModules = {}
 		
 		self.start = time.time()
 	
+	
 	def setMessageEncoderModule(self, messageFormat, module):
 		self.messageEncoderModules[messageFormat] = module
-		
+	
 	def logAndRaiseException(self, e):
 		self.logger.critical(str(e))
 		raise e
@@ -128,7 +129,7 @@ def disconnect(self):
 		self.client.loop_stop()
 		#self.stats()
 		self.logger.info("Closed connection to the IBM Internet of Things Foundation")
-			
+	
 	def stats(self):
 		elapsed = ((time.time()) - self.start)
 		
diff --git a/src/ibmiotf/device.py b/src/ibmiotf/device.py
@@ -28,16 +28,21 @@
 COMMAND_RE = re.compile("iot-2/cmd/(.+)/fmt/(.+)")
 
 
-class Command(Message):
-	def	__init__(self, message):
-		result = COMMAND_RE.match(message.topic)
+class Command:
+	def __init__(self, pahoMessage, messageEncoderModules):
+		result = COMMAND_RE.match(pahoMessage.topic)
 		if result:
-			Message.__init__(self, message)
-			
 			self.command = result.group(1)
 			self.format = result.group(2)
+
+			if self.format in messageEncoderModules:
+				message = messageEncoderModules[self.format].decode(pahoMessage)
+				self.timestamp = message.timestamp
+				self.data = message.data
+			else:
+				raise MissingMessageDecoderException(self.format)
 		else:
-			raise InvalidEventException("Received command on invalid topic: %s" % (message.topic))
+			raise InvalidEventException("Received command on invalid topic: %s" % (pahoMessage.topic))
 
 
 class Client(AbstractClient):
@@ -140,11 +145,10 @@ def __subscribeToCommands(self):
 	Internal callback for device command messages, parses source device from topic string and 
 	passes the information on to the registerd device command callback
 	'''
-	def __onCommand(self, client, userdata, message):
+	def __onCommand(self, client, userdata, pahoMessage):
 		self.recv = self.recv + 1
-
 		try:
-			command = Command(message)
+			command = Command(pahoMessage, self.messageEncoderModules)
 			self.logger.debug("Received command '%s'" % (command.command))
 			if self.commandCallback: self.commandCallback(command)
 		except InvalidEventException as e:
