removal of QueueList class from ECNQueue.py and replaced with functio…

…ns directly accessible in the ECNQueue module

api/ECNQueue.py

@@ -1207,62 +1207,73 @@ def toJson (self) -> dict:
 	def __len__(self) -> int:
 		return len(self.items)
 
-class QueueList:
-	"""[summary]
-
-	Example:
-		[example]
-	"""
-	def __init__(self) -> None:
-		self.__directory = queueDirectory
-		self.queueList = self.__getQueueList()
-		self.itemCount = self.__getItemCount(self.queueList)
+# class QueueList:
+# 	"""[summary]
+
+# 	Example:
+# 		[example]
+# 	"""
+# 	def __init__(self) -> None:
+# 		self.__directory = queueDirectory
+# 		self.queueList = self.__getQueueList()
+# 		self.itemCount = self.__getItemCount(self.queueList)
 
-		self.jsonData = self.itemCount
+# 		self.jsonData = self.itemCount
 
-	def __getItemCount(self, queueList: list) -> dict:
-		"""[summary]
+def getItemCount() -> dict:
+	"""Returns a list of dictionaries with item counts for all of the queues.
 
-		Example:
-			[example]
+	Example:
+		[
+  			{
+   				name: "me",
+    			number_of_items: 42
+  			},
+
+  			{
+    			name: "ce",
+    			number_of_items: 4
+  			}
+		]
 
-		Returns:
-			int: [description]
-		"""
-		itemCountList = []
+	Returns:
+		dict: [description]
+	"""
+	itemCountList = []
 
-		for queue in queueList:
-			itemCount = 0
-			for item in os.listdir(queueDirectory + "/" + queue):
-				itemPath = queueDirectory + "/" + queue + "/" + item
+	for queue in getQueueList():
+		itemCount = 0
+		for item in os.listdir(queueDirectory + "/" + queue):
+			itemPath = queueDirectory + "/" + queue + "/" + item
 
-				isFile = True if os.path.isfile(itemPath) else False
+			isFile = True if os.path.isfile(itemPath) else False
 
-				itemPattern = re.compile("^[0123456789]{1,3}$")
-				isItem = True if itemPattern.match(item) else False
-
-				if isFile and isItem:
-					itemCount = itemCount + 1
-
-			itemCountList.append(
-				{"name": queue,
-				"number_of_items": itemCount
-				}
-			)
-		return itemCountList
+			itemPattern = re.compile("^[0123456789]{1,3}$")
+			isItem = True if itemPattern.match(item) else False
+
+			if isFile and isItem:
+				itemCount = itemCount + 1
+
+		itemCountList.append(
+			{"name": queue,
+			"number_of_items": itemCount
+			}
+		)
 
-	def __getQueueList(self) -> list:
-		queues = []
+	return itemCountList
+
+def getQueueList() -> list:
+	queues = []
 
-		for file in os.listdir(queueDirectory):
-			currentFile = queueDirectory + "/" + file
-			isDirectory = os.path.isdir(currentFile)
-			isValid = file not in queuesToIgnore
+	for file in os.listdir(queueDirectory):
+		currentFile = queueDirectory + "/" + file
+		isDirectory = os.path.isdir(currentFile)
+		isValid = file not in queuesToIgnore
 
-			if isDirectory and isValid:
-				queues.append(file)
+		if isDirectory and isValid:
+			queues.append(file)
 
-		return queues
+	return queues
 
 
 def getQueues() -> list:
@@ -1281,7 +1292,4 @@ def getQueues() -> list:
 		if isDirectory and isValid:
 			queues.append(Queue(file))
 
-	return queues
-if __name__ == "__main__":
-	thing = QueueList().itemCount
-	print()
+	return queues

api/api.py

@@ -70,7 +70,7 @@ def get(self) -> list:
 		Returns:
 			list: [description]
 		"""
-		return ECNQueue.QueueList().itemCount
+		return ECNQueue.getItemCount()
 
 api.add_resource(QueueList, "/api/getQueues")
 api.add_resource(Item, "/api/<string:queue>/<int:number>")