diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..07bf754 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "jogobot"] + path = jogobot + url = ../jogobot diff --git a/jogobot b/jogobot new file mode 160000 index 0000000..dac01a2 --- /dev/null +++ b/jogobot @@ -0,0 +1 @@ +Subproject commit dac01a224b8b190ed8c5bf8c0183dc879e775f81 diff --git a/mysqlred.py b/mysqlred.py index 83dd48c..c7e27ab 100644 --- a/mysqlred.py +++ b/mysqlred.py @@ -49,7 +49,7 @@ class MysqlRed: db_hostname = config.db_hostname db_username = config.db_username db_password = config.db_password - db_name = config.db_username + jogobot.db_namesuffix + db_name = config.db_username + jogobot.config['db_suffix'] # Class variables for storing cached querys _cached_update_data = [] diff --git a/redfam.py b/redfam.py index f056cc4..771d9f5 100644 --- a/redfam.py +++ b/redfam.py @@ -121,13 +121,14 @@ class RedFamParser( RedFam ): """ # Define the timestamp format - __timestamp_format = jogobot.timestamp_format + __timestamp_format = jogobot.config['redundances']['timestamp_format'] # Define section heading re.pattern __sectionhead_pat = re.compile( r"^(=+)(.*\[\[.+\]\].*\[\[.+\]\].*)\1" ) # Define timestamp re.pattern - __timestamp_pat = re.compile( jogobot.timestamp_regex ) + __timestamp_pat = re.compile( jogobot.config['redundances'] + ['timestamp_regex'] ) # Textpattern for recognisation of done-notices __done_notice = ":Archivierung dieses Abschnittes \