Skip to content

Commit

Permalink
Replace hardcoded config in Queue with package config value
Browse files Browse the repository at this point in the history
  • Loading branch information
campb303 committed Jun 10, 2021
1 parent b834d86 commit 4685c30
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions src/webqueue2api/parser/queue.py
Original file line number Diff line number Diff line change
@@ -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



Expand All @@ -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 = {
Expand Down Expand Up @@ -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)
Expand All @@ -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)} )

Expand Down

0 comments on commit 4685c30

Please sign in to comment.