diff --git a/src/webqueue2api/parser/queue.py b/src/webqueue2api/parser/queue.py index 01bf783..1d65674 100644 --- a/src/webqueue2api/parser/queue.py +++ b/src/webqueue2api/parser/queue.py @@ -1,13 +1,6 @@ import os, re from .item import Item - - - -#------------------------------------------------------------------------------# -# Configuration -#------------------------------------------------------------------------------# -queueDirectory = "/home/pier/e/queue/Mail" -queuesToIgnore = ["archives", "drafts", "inbox", "coral"] +from .config import config @@ -29,7 +22,7 @@ class Queue: def __init__(self, name: str) -> None: self.name = name - self.__directory = queueDirectory + "/" + self.name + "/" + self.__directory = config.queue_directory + "/" + self.name + "/" self.items = self.__getItems() self.jsonData = { @@ -109,10 +102,10 @@ def getValidQueues() -> list: """ queues = [] - for file in os.listdir(queueDirectory): - currentFile = queueDirectory + "/" + file + for file in os.listdir(config.queue_directory): + currentFile = config.queue_directory + "/" + file isDirectory = os.path.isdir(currentFile) - isValid = file not in queuesToIgnore + isValid = file not in config.queues_to_ignore if isDirectory and isValid: queues.append(file) @@ -139,7 +132,7 @@ def getQueueCounts() -> list: """ queueInfo = [] for queue in getValidQueues(): - possibleItems = os.listdir(queueDirectory + "/" + queue) + possibleItems = os.listdir(config.queue_directory + "/" + queue) validItems = [isValidItemName for file in possibleItems] queueInfo.append( {"name": queue, "number_of_items": len(validItems)} )