diff --git a/infoZettelOrg/2019-02-27-Kyupruefung2019.md b/infoZettelOrg/archiv/archiv.2019/2019-02-27-Kyupruefung2019.md similarity index 100% rename from infoZettelOrg/2019-02-27-Kyupruefung2019.md rename to infoZettelOrg/archiv/archiv.2019/2019-02-27-Kyupruefung2019.md diff --git a/infoZettelOrg/2019-08-24_OGL-2019-3.md b/infoZettelOrg/archiv/archiv.2019/2019-08-24_OGL-2019-3.md similarity index 100% rename from infoZettelOrg/2019-08-24_OGL-2019-3.md rename to infoZettelOrg/archiv/archiv.2019/2019-08-24_OGL-2019-3.md diff --git a/infoZettelOrg/2019-11-16-BemU11.md b/infoZettelOrg/archiv/archiv.2019/2019-11-16-BemU11.md similarity index 100% rename from infoZettelOrg/2019-11-16-BemU11.md rename to infoZettelOrg/archiv/archiv.2019/2019-11-16-BemU11.md diff --git a/infoZettelOrg/2019-12-16-Weihnachtsfeier+Dojouebernachtung.md b/infoZettelOrg/archiv/archiv.2019/2019-12-16-Weihnachtsfeier+Dojouebernachtung.md similarity index 100% rename from infoZettelOrg/2019-12-16-Weihnachtsfeier+Dojouebernachtung.md rename to infoZettelOrg/archiv/archiv.2019/2019-12-16-Weihnachtsfeier+Dojouebernachtung.md diff --git a/infoZettelOrg/2020-01-12-Elternabend2020-1.md b/infoZettelOrg/archiv/archiv.2020/2020-01-12-Elternabend2020-1.md similarity index 100% rename from infoZettelOrg/2020-01-12-Elternabend2020-1.md rename to infoZettelOrg/archiv/archiv.2020/2020-01-12-Elternabend2020-1.md diff --git a/infoZettelOrg/2020-01-27-Elternabend.md b/infoZettelOrg/archiv/archiv.2020/2020-01-27-Elternabend.md similarity index 100% rename from infoZettelOrg/2020-01-27-Elternabend.md rename to infoZettelOrg/archiv/archiv.2020/2020-01-27-Elternabend.md diff --git a/infoZettelOrg/2020-02-29-KyuSonderTraining.md b/infoZettelOrg/archiv/archiv.2020/2020-02-29-KyuSonderTraining.md similarity index 100% rename from infoZettelOrg/2020-02-29-KyuSonderTraining.md rename to infoZettelOrg/archiv/archiv.2020/2020-02-29-KyuSonderTraining.md diff --git a/infoZettelOrg/2020-03-06-Fruehjahrskruemelrandori.md b/infoZettelOrg/archiv/archiv.2020/2020-03-06-Fruehjahrskruemelrandori.md similarity index 100% rename from infoZettelOrg/2020-03-06-Fruehjahrskruemelrandori.md rename to infoZettelOrg/archiv/archiv.2020/2020-03-06-Fruehjahrskruemelrandori.md diff --git a/infoZettelOrg/2020-03-15-MaedchenPokalWerdau.md b/infoZettelOrg/archiv/archiv.2020/2020-03-15-MaedchenPokalWerdau.md similarity index 100% rename from infoZettelOrg/2020-03-15-MaedchenPokalWerdau.md rename to infoZettelOrg/archiv/archiv.2020/2020-03-15-MaedchenPokalWerdau.md diff --git a/infoZettelOrg/2020-09-19--20-LemU13U15.md b/infoZettelOrg/archiv/archiv.2020/2020-09-19--20-LemU13U15.md similarity index 100% rename from infoZettelOrg/2020-09-19--20-LemU13U15.md rename to infoZettelOrg/archiv/archiv.2020/2020-09-19--20-LemU13U15.md diff --git a/infoZettelOrg/2020-10-17-Wanderung.md b/infoZettelOrg/archiv/archiv.2020/2020-10-17-Wanderung.md similarity index 100% rename from infoZettelOrg/2020-10-17-Wanderung.md rename to infoZettelOrg/archiv/archiv.2020/2020-10-17-Wanderung.md diff --git a/infoZettelOrg/2020-10-27-keinElternabend.md b/infoZettelOrg/archiv/archiv.2020/2020-10-27-keinElternabend.md similarity index 100% rename from infoZettelOrg/2020-10-27-keinElternabend.md rename to infoZettelOrg/archiv/archiv.2020/2020-10-27-keinElternabend.md diff --git a/infoZettelOrg/2021-09-29-LemU13U15.md b/infoZettelOrg/archiv/archiv.2021/2021-09-29-LemU13U15.md similarity index 100% rename from infoZettelOrg/2021-09-29-LemU13U15.md rename to infoZettelOrg/archiv/archiv.2021/2021-09-29-LemU13U15.md diff --git a/infoZettelOrg/2021-10-05-Stiefelpokal.md b/infoZettelOrg/archiv/archiv.2021/2021-10-05-Stiefelpokal.md similarity index 100% rename from infoZettelOrg/2021-10-05-Stiefelpokal.md rename to infoZettelOrg/archiv/archiv.2021/2021-10-05-Stiefelpokal.md diff --git a/infoZettelOrg/2021-11-13-HKR.md b/infoZettelOrg/archiv/archiv.2021/2021-11-13-HKR.md similarity index 100% rename from infoZettelOrg/2021-11-13-HKR.md rename to infoZettelOrg/archiv/archiv.2021/2021-11-13-HKR.md diff --git a/infoZettelOrg/2021-11-24-kyPruefung.md b/infoZettelOrg/archiv/archiv.2021/2021-11-24-kyPruefung.md similarity index 100% rename from infoZettelOrg/2021-11-24-kyPruefung.md rename to infoZettelOrg/archiv/archiv.2021/2021-11-24-kyPruefung.md diff --git a/infoZettelOrg/2021-12-07-kyPruefung.md b/infoZettelOrg/archiv/archiv.2021/2021-12-07-kyPruefung.md similarity index 100% rename from infoZettelOrg/2021-12-07-kyPruefung.md rename to infoZettelOrg/archiv/archiv.2021/2021-12-07-kyPruefung.md diff --git a/infoZettelOrg/coronaZeit/tools/sendMail.py b/infoZettelOrg/coronaZeit/tools/sendMail.py index 276e3be..5104f5f 100755 --- a/infoZettelOrg/coronaZeit/tools/sendMail.py +++ b/infoZettelOrg/coronaZeit/tools/sendMail.py @@ -5,11 +5,11 @@ from email import utils from email.mime.text import MIMEText from email.mime.multipart import MIMEMultipart import pypandoc -import json -import argparse import yaml +import argparse from datetime import datetime import certifi +import os def get_yaml(f): '''Extracts the yamlHeader from a Markdown file''' @@ -47,17 +47,9 @@ receiverEmails = [ "cwsvjudo@gmail.com", "judo.cwsv@t-online.de", ] -config = { - 'smtp' : - { - 'serverAddress' : "mail.arcor.de", - 'serverPort' : 465, - 'login' : "cwsvjudo", - 'password' : "***REMOVED***" - }, - 'senderEmailAddress': "cwsvjudo@arcor.de" -} - +config = None +with open('./config.yaml', 'r') as file: + config = yaml.safe_load(file) if __name__=="__main__": argv = argParser.parse_args() @@ -76,7 +68,7 @@ if __name__=="__main__": mdHeader =[] mdText = [] with open(argv.mdFilePath) as f: - mdHeader = yaml.load(get_yaml(f)) + mdHeader = yaml.safe_load(get_yaml(f)) # Create the plain-text and HTML version of your message text = pypandoc.convert_file(argv.mdFilePath, "markdown", extra_args=["--self-contained", "--resource-path=../aufgaben"])