rabin 7 years ago
parent
commit
8995bb8ea7
3 changed files with 11 additions and 8 deletions
  1. 4 4
      core.py
  2. 4 3
      model.py
  3. 3 1
      mqtt.py

+ 4 - 4
core.py

@@ -144,18 +144,18 @@ class Demeter(object):
 		return salt
 
 	@staticmethod
-	def mktime(value, str='%Y-%m-%d %H:%M:%S'):
+	def mktime(value, string='%Y-%m-%d %H:%M:%S'):
 		module = __import__('time')
 		strptime = getattr(module, 'strptime')
 		mktime = getattr(module, 'mktime')
-		return int(mktime(strptime(value,str)))
+		return int(mktime(strptime(value,string)))
 
 	@staticmethod
-	def date(value, str='%Y-%m-%d %H:%M:%S'):
+	def date(value, string='%Y-%m-%d %H:%M:%S'):
 		module = __import__('datetime')
 		datetime = getattr(module, 'datetime')
 		fromtimestamp = getattr(datetime, 'fromtimestamp')
-		return str(fromtimestamp(value).strftime(str))
+		return str(fromtimestamp(value).strftime(string))
 
 	@staticmethod
 	def error(string):

+ 4 - 3
model.py

@@ -187,9 +187,10 @@ class Model(object):
 		return Demeter.md5(value, salt=True)
 
 	def createState(self):
-		create = Demeter.bool(self._config['create'])
-		if create:
-			return Demeter.runtime(self._type, self.__table__, json.dumps(self._key))
+		if 'create' in self._config:
+			create = Demeter.bool(self._config['create'])
+			if create:
+				return Demeter.runtime(self._type, self.__table__, json.dumps(self._key))
 		return False
 
 	def drop(self):

+ 3 - 1
mqtt.py

@@ -32,7 +32,9 @@ class Connect(object):
 	def connect(self, client, userdata, flags, rc):
 		#print("Connected with result code "+str(rc))
 		#client.subscribe("sensor/#")
-		client.subscribe("pic/#")
+		sub = Demeter.config['mqtt']['sub'].split(',')
+		for value in sub:
+			client.subscribe(value + "/#")
 		"""
 		gevent.joinall([
 			gevent.spawn(self.subscribe, client, 'sensor/#'),