From b6c9d025a8499cd7cdfa7b2f8df23f6736409d49 Mon Sep 17 00:00:00 2001 From: Dennis Date: Sun, 13 Jan 2019 12:51:57 +0100 Subject: [PATCH] Refactored the directory variables minimally --- plugins/admidio_events/admidio_events.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/plugins/admidio_events/admidio_events.py b/plugins/admidio_events/admidio_events.py index 1221eb9..64b7092 100644 --- a/plugins/admidio_events/admidio_events.py +++ b/plugins/admidio_events/admidio_events.py @@ -16,14 +16,13 @@ import MySQLdb as mysql from matrix_bot_api.mregex_handler import MRegexHandler -EVENTS_DATA_DIR = os.path.join(os.path.dirname(__file__), - '../../data/events') -DATA_LOCATION = os.path.join(os.path.dirname(__file__), - '../../data/events/data.db') +MESSAGE_DIR = os.path.join(os.path.dirname(__file__), 'messages') +DATA_DIR = os.path.join(os.path.dirname(__file__),'../../data/events') CONFIG_LOCATION = os.path.join(os.path.dirname(__file__), 'config.json') -HELP_LOCATION = os.path.join(os.path.dirname(__file__), 'messages/help') -MESSAGES_LOCATION = os.path.join(os.path.dirname(__file__), - 'messages/messages.dutch.json') + +DATA_LOCATION = DATA_DIR + '/data.db' +HELP_LOCATION = MESSAGE_DIR + '/help' +MESSAGES_LOCATION = MESSAGE_DIR + '/messages.dutch.json' class Plugin: """ This plugin grabs events from Admidio (https://admidio.org) @@ -248,7 +247,7 @@ def setup(): SQLite tables.""" # Try to make a new directory - os.mkdir(EVENTS_DATA_DIR) + os.mkdir(DATA_DIR) # Define query to INSERT event table to SQLite DB sql = """CREATE TABLE 'events' (