...
This commit is contained in:
@@ -5,11 +5,12 @@ class ConfigParser(object):
|
||||
def __init__(self, filename):
|
||||
with open(filename, "r") as f:
|
||||
self.jsonContent = json.load(f)
|
||||
|
||||
self.events = dict()
|
||||
self.settings = dict()
|
||||
|
||||
self.__parseSettings()
|
||||
self.__parseEvents()
|
||||
self.addEvents(self.jsonContent["events"])
|
||||
self.__parseModuleSettings()
|
||||
|
||||
def __parseModuleSettings(self):
|
||||
@@ -33,13 +34,16 @@ class ConfigParser(object):
|
||||
return datetime.date(year=self.settings["year"], month=int(d[0]), day=int(d[1]))
|
||||
|
||||
|
||||
def __parseEvents(self):
|
||||
self.events = self.jsonContent["events"]
|
||||
for key, val in self.events.items():
|
||||
def addEvents(self, jsonContent):
|
||||
for key, val in jsonContent.items():
|
||||
dates = val["dates"]
|
||||
for ev in dates:
|
||||
self.__parseDateRange(ev)
|
||||
|
||||
self.events.update(jsonContent)
|
||||
|
||||
|
||||
|
||||
def printEvents(self):
|
||||
for key, val in self.events.items():
|
||||
dates = val["dates"]
|
||||
|
||||
Reference in New Issue
Block a user